优化表盘状态管理接口

diff --git a/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbModel.cpp
index 38e8a38..dcbe943 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbModel.cpp
@@ -49,7 +49,6 @@ namespace OHOS
             PullUpDownView::GetInstance()->UpdateDnotDisturbStatus(GetDoNotDisturbModeEnabled());
             /*更新主界面配置*/
             MainModel::GetInstance().setDialState(DialState::DO_NOT_DISTURB, GetDoNotDisturbModeEnabled());
-            MainViewSample::GetInstance()->UpdateStateShow();
         }
         return;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
index 3824894..6f880b0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
@@ -13,6 +13,7 @@
 #include "ConfigModel.h"\r
 #include <array>\r
 #include <stdexcept>\r
+#include "MainViewSample.h"\r
 namespace OHOS\r
 {\r
     static const int CARD_SETTING_VALUE_LEN = 32;\r
@@ -190,7 +191,7 @@ namespace OHOS
 \r
             /*设置卡片[不被卡片管理，必须设置] */\r
             cardSettings[index++] = SETCARD;\r
-            \r
+\r
             cardSettingCount = index;\r
         }\r
 \r
@@ -500,6 +501,10 @@ namespace OHOS
         {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "state %d is error", stateIndex);\r
         }\r
+        \r
+        /*进行主界面UI更新通知 如果在主界面*/\r
+        if (MainViewSample::GetInstance() != nullptr)\r
+            MainViewSample::GetInstance()->UpdateStateShow();\r
     }\r
 \r
     // 接口 2: 获取最高优先级为 true 的状态\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
index d6290dd..b889361 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -186,7 +186,6 @@ namespace OHOS
             DnotDisturbModel::GetInstance().SetDoNotDisturbModeEnabled(false);
             /*更新主界面配置*/
             MainModel::GetInstance().setDialState(DialState::DO_NOT_DISTURB,false);
-            MainViewSample::GetInstance()->UpdateStateShow();
             return true;
         }
         if (g_jumpView.count(curViewId) != 0)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
index 5375ceb..d207636 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
@@ -191,6 +191,7 @@ namespace OHOS
     {
         if (messageicon_ == nullptr || dialstateicon_ == nullptr)
             return;
+            
         /*配置未读状态*/
         messageicon_->SetVisible(MainModel::GetInstance().getMessageActiveState());
         /*配置表盘状态*/