diff --git a/usrc/uicontroler/page/mupage/MuAcidDistMgrPage.cpp b/usrc/uicontroler/page/mupage/MuAcidDistMgrPage.cpp index db8d868..45878a9 100644 --- a/usrc/uicontroler/page/mupage/MuAcidDistMgrPage.cpp +++ b/usrc/uicontroler/page/mupage/MuAcidDistMgrPage.cpp @@ -47,6 +47,11 @@ class MuAcidDistMgrPage : public IPageProcesser { virtual void initialize() override { 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[1], "发放人"); setText(cfgbid_table[0].val[2], "领酸人"); diff --git a/usrc/uicontroler/page/mupage/muCHSetting_page.cpp b/usrc/uicontroler/page/mupage/muCHSetting_page.cpp index c600743..da4b160 100644 --- a/usrc/uicontroler/page/mupage/muCHSetting_page.cpp +++ b/usrc/uicontroler/page/mupage/muCHSetting_page.cpp @@ -192,7 +192,7 @@ class MuChSetting : public IPageProcesser { */ if (AcidDistrubtRecordDao::getRecordNum() > 0 || AcidUseRecordDao::getRecordNum() > 1) { - UIControler::ins()->popWarningWin("无法修改通道名,<领酸记录>或<用酸记录>不为空"); + UIControler::ins()->popWarningWin("无法修改通道名,领酸记录或用酸记录不为空"); return; } diff --git a/usrc/uicontroler/page/mupage/muUsrMgr_page.cpp b/usrc/uicontroler/page/mupage/muUsrMgr_page.cpp index c4f85a7..ac8b6ca 100644 --- a/usrc/uicontroler/page/mupage/muUsrMgr_page.cpp +++ b/usrc/uicontroler/page/mupage/muUsrMgr_page.cpp @@ -152,7 +152,7 @@ class MuUsrMgr : public IPageProcesser { saveUsr(); } else if (bid == ob_muUsrMgr_del) { if (AcidDistrubtRecordDao::getRecordNum() > 0 || AcidUseRecordDao::getRecordNum() > 1) { - UIControler::ins()->popWarningWin("无法删除用户名,<领酸记录>或<用酸记录>不为空"); + UIControler::ins()->popWarningWin("无法删除用户名,领酸记录或用酸记录不为空"); return; } delUsr(); @@ -259,7 +259,7 @@ class MuUsrMgr : public IPageProcesser { if (strcmp(m_editContext.name, user->name) != 0) { if (AcidDistrubtRecordDao::getRecordNum() > 0 || AcidUseRecordDao::getRecordNum() > 1) { - UIControler::ins()->popWarningWin("无法修改用户名,<领酸记录>或<用酸记录>不为空."); + UIControler::ins()->popWarningWin("无法修改用户名,领酸记录或用酸记录不为空."); return; } } diff --git a/usrc/uicontroler/ui_controler.cpp b/usrc/uicontroler/ui_controler.cpp index 3d9328f..361b2c6 100644 --- a/usrc/uicontroler/ui_controler.cpp +++ b/usrc/uicontroler/ui_controler.cpp @@ -327,7 +327,11 @@ void UIControler::popWin(UIPopWinType_t type, const char* info, functionchangePage(page); - if (triggerEvent) AppEventBus::ins()->pushPageChangeEvent(page); + if (triggerEvent) { + AppEventBus::ins()->pushPageChangeEvent(page); + osDelay(10); + } + sendcmd("page %d", page); } void UIControler::sendcmd(const char* format, ...) {