zhaohe 8 months ago
parent
commit
9d560e8588
  1. 3
      README.md
  2. 10
      usrc/uicontroler/page/popwin_page.cpp
  3. 12
      usrc/uicontroler/ui_controler.cpp
  4. 7
      usrc/uicontroler/ui_controler.hpp

3
README.md

@ -56,4 +56,7 @@ UI
量产时注意事项:
1. 量产时,需要注意注意掉显示密码的相关日志
2. 如果从屏幕读取状态失败,则自动重启设备
```

10
usrc/uicontroler/page/popwin_page.cpp

@ -147,7 +147,7 @@ class PopWinPage : public IPageProcesser {
UIControler::ins()->setTxt(thisPage, ob_popwin_info, info->info);
UIControler::ins()->sendcmd("p[%d].b[%d].pco=%d", thisPage, ob_popwin_info, 0 /*黑色*/);
UIControler::ins()->vis(ob_popwin_canclekey, 0);
visEx(ob_popwin_canclekey, 0);
} else if (info->type == UI_POP_WIN_TYPE_WARNING_INFO) {
// 警告消息
@ -157,7 +157,7 @@ class PopWinPage : public IPageProcesser {
UIControler::ins()->setTxt(thisPage, ob_popwin_info, info->info);
UIControler::ins()->sendcmd("p[%d].b[%d].pco=%d", thisPage, ob_popwin_info, 63488 /*红色*/);
UIControler::ins()->vis(ob_popwin_canclekey, 0);
visEx(ob_popwin_canclekey, 0);
} else if (info->type == UI_POP_WIN_TYPE_CONFIRM) {
// 确认(可被取消)
@ -167,7 +167,7 @@ class PopWinPage : public IPageProcesser {
UIControler::ins()->setTxt(thisPage, ob_popwin_info, info->info);
UIControler::ins()->sendcmd("p[%d].b[%d].pco=%d", thisPage, ob_popwin_info, 0 /*黑色*/);
UIControler::ins()->vis(ob_popwin_canclekey, 1);
visEx(ob_popwin_canclekey, 1);
} else if (info->type == UI_POP_WIN_TYPE_FATAL_ERROR) {
// 警告消息
updateTitle(info->type, displayNum);
@ -176,8 +176,8 @@ class PopWinPage : public IPageProcesser {
UIControler::ins()->setTxt(thisPage, ob_popwin_info, info->info);
UIControler::ins()->sendcmd("p[%d].b[%d].pco=%d", thisPage, ob_popwin_info, 63488 /*红色*/);
UIControler::ins()->vis(ob_popwin_canclekey, 0);
UIControler::ins()->vis(ob_popwin_confirmkey, 0);
visEx(ob_popwin_canclekey, 0);
visEx(ob_popwin_confirmkey, 0);
}
}

12
usrc/uicontroler/ui_controler.cpp

@ -12,7 +12,7 @@
using namespace iflytop;
#define TAG "UIScheduler"
#define MODULE_DEBUG 0
#define MODULE_DEBUG 1
#define UART_RX_OVERTIME 5
#define CMD_OVERTIME 50
@ -104,7 +104,7 @@ void UIControler::startSchedule() {
tjc_packet_type_t packetType = (tjc_packet_type_t)packet.data[0];
auto* processer = TJCEventProcesserMgr::findProcesser((tjc_packet_type_t)packetType);
ZLOGI(TAG, "[eventprocess-thread]: rx_event:%s(%d)", tjc::pt2str(packetType), packetType);
// ZLOGI(TAG, "[eventprocess-thread]: rx_event:%s(%d)", tjc::pt2str(packetType), packetType);
if (processer != nullptr) {
processer->process(packet.data, packet.datalen, &event_cache);
@ -382,9 +382,13 @@ bool UIControler::visEx(uint8_t pid, uint8_t bid, bool val) {
do {
if (!component->isPosInited) {
suc = readFiledAsInt(pid, bid, "x", &component->oldPosX);
if (!suc) break;
if (!suc) {
ZLOGE(TAG, "fatal error, reboot");
}
suc = readFiledAsInt(pid, bid, "y", &component->oldPosY);
if (!suc) break;
if (!suc) {
ZLOGE(TAG, "fatal error, reboot");
}
}
if (val) {

7
usrc/uicontroler/ui_controler.hpp

@ -147,9 +147,6 @@ class UIControler {
* UTILS *
***********************************************************************************************************************/
bool vis(uint16_t bid, int32_t val); // 不支持跨页面隐藏
void setTouchEnableState(uint8_t bid, uint8_t enable); // 不支持跨页面隐藏
bool visEx(uint8_t pid, uint8_t bid, bool val); // 通过搬移组件实现跨页面隐藏
bool movePicToXY(uint8_t pid, uint8_t bid, int32_t x, int32_t y);
bool movePicTo(uint8_t pid, uint8_t bid, uint8_t toBid);
@ -162,6 +159,10 @@ class UIControler {
void callUsrEventCb(UIEvent* event);
bool _readFiledAsInt(uint8_t pid, uint8_t bid, const char* valName, int32_t* val);
private:
bool vis(uint16_t bid, int32_t val); // 不支持跨页面隐藏
void setTouchEnableState(uint8_t bid, uint8_t enable); // 不支持跨页面隐藏
};
class UILoadingCxt {

Loading…
Cancel
Save