p_chinagoldgroup_hand_acid
/
hand_acid_mainboard_bak
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

v2
zhaohe 9 months ago
parent
2caa877305
commit
64b35ed6a6
7 changed files with 108 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      ui/hand_acid_mainboard_ui.HMI
  2. 172
      ui/ui.h
  3. 6
      usrc/db/dao/user_dao.cpp
  4. 3
      usrc/service/app_core.cpp
  5. 2
      usrc/uicontroler/base/page_processer.hpp
  6. 3
      usrc/uicontroler/front_end_controler.cpp
  7. 4
      usrc/uicontroler/page/login/page_login.cpp

BIN
ui/hand_acid_mainboard_ui.HMI
View File

172
ui/ui.h
View File

@ -3,29 +3,25 @@
#define pg_pStart 1
#define pg_login 2
#define pg_main 3
#define pg_menuAdmin 4
#define pg_menuAdmin2 5
#define pg_menuUsr 6
#define pg_muInterval 7
#define pg_muUsrMgr 8
#define pg_muTmrMgr 9
#define pg_muAcidType 10
#define pg_changePasswd 11
#define pg_muSettings 12
#define pg_muDeviceInfo 13
#define pg_muAudit 14
#define pg_muPumpTest 15
#define pg_alert 16
#define pg_confirm 17
#define pg_keybAcidCh 18
#define pg_keybdB 19
#define pg_keybdAP 20
#define pg_keybdA 21
#define pg_keyPasswd 22
#define pg_navi 4
#define pg_muInterval 5
#define pg_muUsrMgr 6
#define pg_muTmrMgr 7
#define pg_muAcidType 8
#define pg_changePasswd 9
#define pg_muSettings 10
#define pg_muDeviceInfo 11
#define pg_muAudit 12
#define pg_muPumpTest 13
#define pg_alert 14
#define pg_confirm 15
#define pg_keybAcidCh 16
#define pg_keybdB 17
#define pg_keybdAP 18
#define pg_keybdA 19
#define pg_keyPasswd 20
//gvar.objs
#define ob_gvar_gvar 0
#define ob_gvar_menupageid 1
#define ob_gvar_bt0 2
//pStart.objs
#define ob_pStart_pStart 0
#define ob_pStart_j0 1
@ -39,59 +35,83 @@
#define ob_login_pwdEMsg 5
//main.objs
#define ob_main_main 0
#define ob_main_acidch0 1
#define ob_main_MenuButton 2
#define ob_main_acidname0 3
#define ob_main_acideval0 4
#define ob_main_sysInfo 5
#define ob_main_clock 6
#define ob_main_acidname0id 7
#define ob_main_acidname1id 8
#define ob_main_acidname2id 9
#define ob_main_acidname3id 10
#define ob_main_RemoterS 11
#define ob_main_AcidState 12
#define ob_main_RunMode 13
#define ob_main_RunModeVal 14
#define ob_main_acidch1 15
#define ob_main_acidname1 16
#define ob_main_acideval1 17
#define ob_main_acidch2 18
#define ob_main_acidname2 19
#define ob_main_acideval2 20
#define ob_main_acidch3 21
#define ob_main_acidname3 22
#define ob_main_acideval3 23
#define ob_main_RunModeValUint 24
//menuAdmin.objs
#define ob_menuAdmin_menuAdmin 0
#define ob_menuAdmin_home 1
#define ob_menuAdmin_muInterval 2
#define ob_menuAdmin_changePasswd 3
#define ob_menuAdmin_muTmrMgr 4
#define ob_menuAdmin_muAcidType 5
#define ob_menuAdmin_muUsrMgr 6
#define ob_menuAdmin_muSettings 7
#define ob_menuAdmin_muAudit 8
#define ob_menuAdmin_muDeviceInfo 9
#define ob_menuAdmin_unlogin 10
//menuAdmin2.objs
#define ob_menuAdmin2_menuAdmin2 0
#define ob_menuAdmin2_home 1
#define ob_menuAdmin2_muInterval 2
#define ob_menuAdmin2_changePasswd 3
#define ob_menuAdmin2_muAcidType 4
#define ob_menuAdmin2_muUsrMgr 5
#define ob_menuAdmin2_muSettings 6
#define ob_menuAdmin2_muDeviceInfo 7
#define ob_menuAdmin2_unlogin 8
//menuUsr.objs
#define ob_menuUsr_menuUsr 0
#define ob_menuUsr_home 1
#define ob_menuUsr_muInterval 2
#define ob_menuUsr_changePasswd 3
#define ob_menuUsr_muDeviceInfo 4
#define ob_menuUsr_unlogin 5
#define ob_main_AcidCH0S 1
#define ob_main_AcidCH1S 2
#define ob_main_AcidCH2S 3
#define ob_main_AcidCH3S 4
#define ob_main_sysInfoPic 5
#define ob_main_MenuButton 6
#define ob_main_acidname0 7
#define ob_main_acideval0 8
#define ob_main_sysInfo 9
#define ob_main_clock 10
#define ob_main_acidname1 11
#define ob_main_acideval1 12
#define ob_main_acidname2 13
#define ob_main_acideval2 14
#define ob_main_acidname3 15
#define ob_main_acideval3 16
#define ob_main_p0 17
#define ob_main_RemoterS 18
#define ob_main_AcidState 19
#define ob_main_RemoterS0 20
#define ob_main_RemoterS1 21
#define ob_main_AcidState0 22
#define ob_main_AcidState1 23
#define ob_main_AcidState2 24
#define ob_main_RunMode 25
#define ob_main_RunMode0 26
#define ob_main_RunMode1 27
#define ob_main_RunModeVal 28
#define ob_main_StatUsedCH0 29
#define ob_main_StatUsedCH1 30
#define ob_main_StatUsedCH2 31
#define ob_main_StatUsedCH3 32
#define ob_main_StatRmidCH0 33
#define ob_main_StatRmidCH1 34
#define ob_main_StatRmidCH2 35
#define ob_main_StatRmidCH3 36
#define ob_main_SelCH0 37
#define ob_main_SelCH1 38
#define ob_main_SelCH2 39
#define ob_main_SelCH3 40
#define ob_main_CHState0 41
#define ob_main_CHState1 42
#define ob_main_tm0 43
#define ob_main_str 44
#define ob_main_weekArr 45
#define ob_main_m0 46
//navi.objs
#define ob_navi_navi 0
#define ob_navi_bak 1
#define ob_navi_muInterval 2
#define ob_navi_changePasswd 3
#define ob_navi_muTmrMgr 4
#define ob_navi_muAcidType 5
#define ob_navi_muUsrMgr 6
#define ob_navi_muSettings 7
#define ob_navi_muAudit 8
#define ob_navi_muDeviceInfo 9
#define ob_navi_b0 10
#define ob_navi_b1 11
#define ob_navi_b2 12
#define ob_navi_b3 13
#define ob_navi_b4 14
#define ob_navi_b5 15
#define ob_navi_b6 16
#define ob_navi_b7 17
#define ob_navi_muLoginOut 18
#define ob_navi_acidTakeMgr 19
#define ob_navi_acidTakeRecd 20
#define ob_navi_acidUseRecd 21
#define ob_navi_pumpTest 22
#define ob_navi_pumpCali 23
#define ob_navi_reCtrlerBind 24
#define ob_navi_muWifiCfg 25
#define ob_navi_nexPage 26
#define ob_navi_lastPage 27
#define ob_navi_pageIndex 28
#define ob_navi_t2 29
//muInterval.objs
#define ob_muInterval_muInterval 0
#define ob_muInterval_t0 1
@ -136,8 +156,8 @@
#define ob_muTmrMgr_select4 6
#define ob_muTmrMgr_select5 7
#define ob_muTmrMgr_b0 8
#define ob_muTmrMgr_t0 9
#define ob_muTmrMgr_t2 10
#define ob_muTmrMgr_t2 9
#define ob_muTmrMgr_t0 10
//muAcidType.objs
#define ob_muAcidType_muAcidType 0
#define ob_muAcidType_bak 1

6
usrc/db/dao/user_dao.cpp
View File

@ -9,7 +9,7 @@ using namespace iflytop;
/***********************************************************************************************************************
* MARCO *
***********************************************************************************************************************/
#define TABLE_VERSION TABLE_BASE_VERSION
#define TABLE_VERSION (TABLE_BASE_VERSION+1)
#define MAX_USR_NUM 10
#define TABLE_NAME "user_table"
@ -65,7 +65,7 @@ void UserDao::init() { //
// User0 默认管理员
tabledata->user[0].id = tabledata->maxid++;
tabledata->user[0].effective = true;
strcpy(tabledata->user[0].name, "管理员");
strcpy(tabledata->user[0].name, "admin");
strcpy(tabledata->user[0].passwd, "888888");
tabledata->user[0].role = kadmin;
tabledata->user[0].builtIn = true;
@ -73,7 +73,7 @@ void UserDao::init() { //
// User1 默认仓库管理员
tabledata->user[1].id = tabledata->maxid++;
tabledata->user[1].effective = true;
strcpy(tabledata->user[1].name, "仓库管理员");
strcpy(tabledata->user[1].name, "manager");
strcpy(tabledata->user[1].passwd, "888888");
tabledata->user[1].role = kstorekeeper;
tabledata->user[1].builtIn = true;

3
usrc/service/app_core.cpp
View File

@ -89,6 +89,8 @@ void AppCore::initialize() {
GStateMgr::ins()->initialize();
AppEventBus::ins()->initialize();
debuglegInit();
// 硬件初始化
AppHardware::ins()->initialize(); // 基础硬件初始化
@ -101,6 +103,7 @@ void AppCore::initialize() {
ZLOGI(TAG, "load zhdb end");
FrontEndControler::ins()->initialize();
FrontEndControler::ins()->startSchedule();
PageInit();
FrontEndControler::ins()->chpage(pg_login);

2
usrc/uicontroler/base/page_processer.hpp
View File

@ -25,7 +25,7 @@ class IPageProcesser {
virtual void initialize() {
UIS->regOnUsrEventCb([this](tjc::tjc_usr_event_t* event) {
if (pageId == event->pid) {
if (pageId != event->pid) {
return;
}
if (event->eventId == tjc::kpt_sys_event_page_id) {

3
usrc/uicontroler/front_end_controler.cpp
View File

@ -273,6 +273,9 @@ void FrontEndControler::processInputfieldContentChangeEvent1(uint8_t* data, size
event_cache.bid = data[2];
const char* strbegin = (const char*)&data[3];
strbegin = zcpystr(event_cache.d.inputfield_content.text, strbegin, sizeof(event_cache.d.inputfield_content.text));
ZLOGD(TAG, "on InputfieldContentChange pid:%d bid:%d content:%s", event_cache.pid, event_cache.bid, event_cache.d.inputfield_content.text);
callUsrEventCb(&event_cache);
}

4
usrc/uicontroler/page/login/page_login.cpp
View File

@ -1,4 +1,4 @@
#pragma once
#include "db/dao/user_dao.hpp"
#include "ui/ui.h"
#include "uicontroler/base/page_processer.hpp"
@ -72,4 +72,4 @@ void PageLoginInit() { PageLogin::ins()->initialize(); }
} // namespace iflytop
// kpt_sys_event_page_id
// kpt_sys_event_page_id
Write Preview
Loading…
Cancel
Save