update

usrc/service/front_end_controler.cpp

@@ -121,14 +121,14 @@ void FrontEndControler::startSchedule() {
           m_isInPopWin = false;  // Çå¿ÕFromPopWin±êÖ¾
         } else if (tjc::kpt_on_promopt_page_load == packetType) {
           event_cache.eventId = packetType;
-          event_cache.pid     = packet.data[0];
+          event_cache.pid     = packet.data[1];
           event_cache.bid     = 0;
           callUsrEventCb(&event_cache);
           m_isInPopWin = true;  //
 
         } else if (tjc::kpt_on_keyboard_page_load == packetType) {
           event_cache.eventId = packetType;
-          event_cache.pid     = packet.data[0];
+          event_cache.pid     = packet.data[1];
           event_cache.bid     = 0;
           callUsrEventCb(&event_cache);
           m_isInPopWin = true;

usrc/service/page/Page_login.cpp

@@ -46,10 +46,9 @@ void Page_login::OnPageLoad(OnPageLoadContext* cxt) {
   EN_USR(4, enusrNum >= 5);
   EN_USR(5, enusrNum >= 6);
 
-  UIS->setTxt(PAGE, OBJ(chooseUsr), (int32_t)0);
-  UIS->setTxt(PAGE, OBJ(cUsrName), getCfgStr((config_index_t)(kusr_name0)));
-
   if (!cxt->isFromPopWin) {
+    UIS->setVal(PAGE, OBJ(chooseUsr), (int32_t)0);
+    UIS->setTxt(PAGE, OBJ(cUsrName), getCfgStr((config_index_t)(kusr_name0)));
     UIS->setTxt(PAGE, OBJ(txtPasswd), "");
   }
 }

usrc/service/page/keyboard/Page_keybAcidCh.cpp

@@ -1,6 +1,7 @@
 #include "Page_keybAcidCh.hpp"
 using namespace iflytop;
 
+#define TAG "Page_keybAcidCh"
 #define PAGE      pg_keybAcidCh
 #define OBJ(name) ob_keybAcidCh_##name
 static CfgItermCache cfgcache;
@@ -9,6 +10,7 @@ bool Page_keybAcidCh::isBelongThisPage(int page) { return page == PAGE; }
 
 
 void Page_keybAcidCh::OnKeyboardPageLoad() {
+  ZLOGI(TAG,"Page_keybAcidCh::OnKeyboardPageLoad");
   UIS->setTxt(PAGE, OBJ(b0), getCfgStr(kcfg_acidName1));
   UIS->setTxt(PAGE, OBJ(b1), getCfgStr(kcfg_acidName2));
   UIS->setTxt(PAGE, OBJ(b2), getCfgStr(kcfg_acidName3));

usrc/service/page/page_processer.hpp

@@ -36,6 +36,8 @@ class IPageProcesser {
         OnLoginButtonClick(event->bid, event->d.login_request.usrName, event->d.login_request.passwd);
       } else if (event->eventId == tjc::kpt_unlogin_request) {
         OnUnLoginButtonClick(event->bid);
+      } else if(event->eventId == tjc::kpt_on_keyboard_page_load){
+        OnKeyboardPageLoad();
       }
     });