修复650的表盘状态更新不及时的问题

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp
index 5673c08..1416f14 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp
@@ -319,7 +319,7 @@ namespace OHOS
         //离线表盘
         if (setting.dialFlag) {
           if (mainClockView != nullptr) {
-                // dynamic_cast<DialViewGroup *>(mainClockView)->UpdateStateShow();
+                dynamic_cast<DialViewGroup *>(mainClockView)->UpdateStateShow();
             }
         }
         //在线表盘

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp
index 5673c08..1416f14 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/main/src/MainViewSample.cpp
@@ -319,7 +319,7 @@ namespace OHOS
         //离线表盘
         if (setting.dialFlag) {
           if (mainClockView != nullptr) {
-                // dynamic_cast<DialViewGroup *>(mainClockView)->UpdateStateShow();
+                dynamic_cast<DialViewGroup *>(mainClockView)->UpdateStateShow();
             }
         }
         //在线表盘

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp
index da11e4a..ba708a2 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp
@@ -290,13 +290,6 @@ namespace OHOS
         }
         
          if (keyState == InputDevice::STATE_PRESS && screenState == 0) {
-        //     // 检查绑定状态
-        //     if (ThunderBirdModel::GetInstance()->getbind_status() != true) {
-        //         if (currentSubView != ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3) {
-        //             ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_GUIDEVIEW, ThunderBirdGuideView::THUNDERBIRD_GUIDEVIEW_3);
-        //         }
-        //         return true;
-        //     }
 
             // 音量调节功能
             if (IsVolumeAdjustmentAvailable(currentView, currentSubView)) {

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/clock/src/MainClockView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/clock/src/MainClockView.cpp
index da20658..7734021 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/clock/src/MainClockView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/clock/src/MainClockView.cpp
@@ -502,7 +502,10 @@
      void MainClockView::UpdateStateShow()
      {
          if (messageicon_ == nullptr || dialstateicon_ == nullptr)
-             return;
+         {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageicon_ or dialstateicon_ is nullptr");
+            return;
+         }
  
          /*配置未读状态*/
          messageicon_->SetVisible(MainModel::GetInstance().getMessageActiveState());

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/MainModel.cpp
index 3d79a04..0feb186 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/MainModel.cpp
@@ -713,7 +713,12 @@ namespace OHOS
     {\r
         /*进行主界面UI更新通知 如果在主界面*/\r
         if (MainViewSample::GetInstance() != nullptr)\r
+        {\r
             MainViewSample::GetInstance()->UpdateStateShow();\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdateDialState is ok");\r
+            return;\r
+        }\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdateDialState is error");\r
     }\r
     //主界面获取视频频率\r
     bool MainModel::getVideostate() {\r

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/MainViewSample.cpp
index 5673c08..1416f14 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/main/src/MainViewSample.cpp
@@ -319,7 +319,7 @@ namespace OHOS
         //离线表盘
         if (setting.dialFlag) {
           if (mainClockView != nullptr) {
-                // dynamic_cast<DialViewGroup *>(mainClockView)->UpdateStateShow();
+                dynamic_cast<DialViewGroup *>(mainClockView)->UpdateStateShow();
             }
         }
         //在线表盘