手表-安装表盘之后按键会失效

diff --git a/code/sdk/application/wearable/fd272/nativeabilityfwk/src/AbilitySlice.cpp b/code/sdk/application/wearable/fd272/nativeabilityfwk/src/AbilitySlice.cpp
index 13bdd52..25d0c12 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeabilityfwk/src/AbilitySlice.cpp
+++ b/code/sdk/application/wearable/fd272/nativeabilityfwk/src/AbilitySlice.cpp
@@ -43,6 +43,11 @@ void AbilitySlice::OnStart()
 
 void AbilitySlice::OnResume()
 {
+    if(NativeAbility::GetInstance().GetCurSliceId() == VIEW_MAIN || NativeAbility::GetInstance().GetCurSliceId() == VIEW_APPLIST)
+    {
+        RootView::GetInstance()->SetOnKeyActListener(KeyInputListener::GetInstance());
+    }
+
     if ((state_ != SliceState::START) && (state_ != SliceState::PAUSE)) { // avoid repeated resume
         return;
     }

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
index 9e81b0d..4c88d82 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/set_dial/src/SetDialModel.cpp
@@ -385,7 +385,7 @@ void SetDialModel::UpdateDialSetting(uint16_t ID) {
                                                 currentDialID); // 更新表盘设置
         //运动状态下不进行页面切换
         if (uapi_dev_runtime_get_train_status() != 1) {
-          // NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);// 目前切换到主界面，按键监听有问题
+          NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);// 目前切换到主界面，按键监听有问题
         }
 #ifdef SUPPORT_BLE_SERVICE
         svr_ble_read_data_value_updata_noyify(); // app切换表盘增加id更新

diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp
index a924e9d..b77fc2d 100644 (file)
--- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp
+++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/transmitting.cpp
@@ -297,7 +297,6 @@ namespace OHOS
         if (transmitting_img == nullptr)
         {
             transmitting_img = new UIImageView();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!");
 
         }
         transmitting_img->SetPosition(117, 87, 230, 160);
@@ -404,7 +403,6 @@ namespace OHOS
         if (transmitting_img == nullptr)
         {
             transmitting_img = new UIImageView();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!");
         }
         transmitting_img->SetPosition(193, 150,80, 80);
         const char *imagesPath = TRANSMITTING_FAIL_PATH;
@@ -456,7 +454,10 @@ namespace OHOS
         if (transmitting_img == nullptr)
         {
             transmitting_img = new UIImageView();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!");
+            if(transmitting_img == nullptr)
+            {
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "transmitting_img is nullptr");
+            }
         }
         transmitting_img->SetPosition(193, 150,80, 80);
         const char *imagesPath = TRANSMITTING_FAIL_PATH;
@@ -514,7 +515,6 @@ namespace OHOS
         if (transmitting_img == nullptr)
         {
             transmitting_img = new UIImageView();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!");
         }
         transmitting_img->SetPosition(117, 87, 230, 160);
         const char *imagesPath = TRANSMITTING_OTA_DOWN;
@@ -570,7 +570,6 @@ namespace OHOS
         if (transmitting_img == nullptr)
         {
             transmitting_img = new UIImageView();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!");
 
         }
         transmitting_img->SetPosition(117, 87, 230, 160);
@@ -781,7 +780,6 @@ namespace OHOS
         if (transmitting_img == nullptr)
         {
             transmitting_img = new UIImageView();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!");
         }
         transmitting_img->SetPosition(193, 150,80, 80);
         const char *imagesPath = TRANSMITTING_SUCC_PATH;
@@ -857,7 +855,6 @@ namespace OHOS
         if (transmitting_img == nullptr)
         {
             transmitting_img = new UIImageView();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!");
         }
         transmitting_img->SetPosition(193, 150,80, 80);
         const char *imagesPath = TRANSMITTING_SUCC_PATH;
@@ -934,7 +931,6 @@ namespace OHOS
         if (transmitting_img == nullptr)
         {
             transmitting_img = new UIImageView();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!");
         }
         transmitting_img->SetPosition(193, 150,80, 80);
         const char *imagesPath = TRANSMITTING_SUCC_PATH;
@@ -949,7 +945,7 @@ namespace OHOS
             osTimerDelete(transmitting_timer);
             transmitting_timer = NULL;
         }
-        transmitting_timer = osTimerNew((osTimerFunc_t)dialtimerCallBack, osTimerPeriodic, NULL, NULL);
+        transmitting_timer = osTimerNew((osTimerFunc_t)dialtimerCallBack, osTimerOnce, NULL, NULL);
         tick =2000;// osMs2Tick(1000);
         retTimer = osTimerStart(transmitting_timer, tick);
         if (retTimer != osOK && transmitting_timer != NULL) {
@@ -1011,7 +1007,6 @@ namespace OHOS
         if (transmitting_img == nullptr)
         {
             transmitting_img = new UIImageView();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!");
         }
         transmitting_img->SetPosition(193, 150,80, 80);
         const char *imagesPath = TRANSMITTING_FAIL_PATH;
@@ -1083,7 +1078,6 @@ namespace OHOS
         if (transmitting_img == nullptr)
         {
             transmitting_img = new UIImageView();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!");
         }
         transmitting_img->SetPosition(193, 150,80, 80);
         const char *imagesPath = TRANSMITTING_FAIL_PATH;
@@ -1146,7 +1140,6 @@ namespace OHOS
         if (transmitting_img == nullptr)
         {
             transmitting_img = new UIImageView();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!");
         }
         transmitting_img->SetPosition(193, 150,80, 80);
         const char *imagesPath = TRANSMITTING_FAIL_PATH;
@@ -1206,7 +1199,6 @@ namespace OHOS
         if (transmitting_img == nullptr)
         {
             transmitting_img = new UIImageView();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!");
         }
         transmitting_img->SetPosition(193, 150,80, 80);
         const char *imagesPath = TRANSMITTING_FAIL_PATH;
@@ -1266,7 +1258,6 @@ namespace OHOS
         if (transmitting_img == nullptr)
         {
             transmitting_img = new UIImageView();
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::FOOINGLOGOImage new fail!");
         }
         transmitting_img->SetPosition(193, 150,80, 80);
         const char *imagesPath = TRANSMITTING_FAIL_PATH;