zhaohe 8 months ago
parent
commit
7603edfbbd
  1. 5
      usrc/uicontroler/page/mupage/MuAcidDistMgrPage.cpp
  2. 2
      usrc/uicontroler/page/mupage/muCHSetting_page.cpp
  3. 4
      usrc/uicontroler/page/mupage/muUsrMgr_page.cpp
  4. 6
      usrc/uicontroler/ui_controler.cpp

5
usrc/uicontroler/page/mupage/MuAcidDistMgrPage.cpp

@ -47,6 +47,11 @@ class MuAcidDistMgrPage : public IPageProcesser {
virtual void initialize() override { virtual void initialize() override {
IPageProcesser::initialize(); IPageProcesser::initialize();
setText(ob_muAcidDistMgr_distPerso, "");
setText(ob_muAcidDistMgr_takePers, "");
setText(ob_muAcidDistMgr_chId, "");
setText(ob_muAcidDistMgr_volumeVal, "");
setText(cfgbid_table[0].val[0], "时间"); setText(cfgbid_table[0].val[0], "时间");
setText(cfgbid_table[0].val[1], "发放人"); setText(cfgbid_table[0].val[1], "发放人");
setText(cfgbid_table[0].val[2], "领酸人"); setText(cfgbid_table[0].val[2], "领酸人");

2
usrc/uicontroler/page/mupage/muCHSetting_page.cpp

@ -192,7 +192,7 @@ class MuChSetting : public IPageProcesser {
*/ */
if (AcidDistrubtRecordDao::getRecordNum() > 0 || AcidUseRecordDao::getRecordNum() > 1) { if (AcidDistrubtRecordDao::getRecordNum() > 0 || AcidUseRecordDao::getRecordNum() > 1) {
UIControler::ins()->popWarningWin("无法修改通道名,<领酸记录><用酸记录>不为空");
UIControler::ins()->popWarningWin("无法修改通道名,领酸记录或用酸记录不为空");
return; return;
} }

4
usrc/uicontroler/page/mupage/muUsrMgr_page.cpp

@ -152,7 +152,7 @@ class MuUsrMgr : public IPageProcesser {
saveUsr(); saveUsr();
} else if (bid == ob_muUsrMgr_del) { } else if (bid == ob_muUsrMgr_del) {
if (AcidDistrubtRecordDao::getRecordNum() > 0 || AcidUseRecordDao::getRecordNum() > 1) { if (AcidDistrubtRecordDao::getRecordNum() > 0 || AcidUseRecordDao::getRecordNum() > 1) {
UIControler::ins()->popWarningWin("无法删除用户名,<领酸记录><用酸记录>不为空");
UIControler::ins()->popWarningWin("无法删除用户名,领酸记录或用酸记录不为空");
return; return;
} }
delUsr(); delUsr();
@ -259,7 +259,7 @@ class MuUsrMgr : public IPageProcesser {
if (strcmp(m_editContext.name, user->name) != 0) { if (strcmp(m_editContext.name, user->name) != 0) {
if (AcidDistrubtRecordDao::getRecordNum() > 0 || AcidUseRecordDao::getRecordNum() > 1) { if (AcidDistrubtRecordDao::getRecordNum() > 0 || AcidUseRecordDao::getRecordNum() > 1) {
UIControler::ins()->popWarningWin("无法修改用户名,<领酸记录><用酸记录>不为空.");
UIControler::ins()->popWarningWin("无法修改用户名,领酸记录或用酸记录不为空.");
return; return;
} }
} }

6
usrc/uicontroler/ui_controler.cpp

@ -327,7 +327,11 @@ void UIControler::popWin(UIPopWinType_t type, const char* info, function<void(bo
void UIControler::chpage(uint8_t page, bool triggerEvent) { void UIControler::chpage(uint8_t page, bool triggerEvent) {
zlock_guard lg(m_cmdlock); zlock_guard lg(m_cmdlock);
UIStateMgr::ins()->changePage(page); UIStateMgr::ins()->changePage(page);
if (triggerEvent) AppEventBus::ins()->pushPageChangeEvent(page);
if (triggerEvent) {
AppEventBus::ins()->pushPageChangeEvent(page);
osDelay(10);
}
sendcmd("page %d", page); sendcmd("page %d", page);
} }
void UIControler::sendcmd(const char* format, ...) { void UIControler::sendcmd(const char* format, ...) {

Loading…
Cancel
Save