From e65b6f69960ae2ba86897bbff665f5294525a9b0 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Tue, 20 Aug 2024 17:44:36 +0800
Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E7=9B=98=E7=8A=B6?=
 =?utf8?q?=E6=80=81=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/dnotdisturb/src/DnotDisturbModel.cpp | 1 -
 .../wearable/fd230app/nativeui/main/src/MainModel.cpp      | 7 ++++++-
 .../fd230app/nativeui/main/src/MainPresenterSample.cpp     | 1 -
 .../wearable/fd230app/nativeui/main/src/MainViewSample.cpp | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

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 38e8a3820..dcbe94340 100644
--- 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 3824894b9..6f880b023 100644
--- 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"
 #include <array>
 #include <stdexcept>
+#include "MainViewSample.h"
 namespace OHOS
 {
     static const int CARD_SETTING_VALUE_LEN = 32;
@@ -190,7 +191,7 @@ namespace OHOS
 
             /*设置卡片[不被卡片管理，必须设置] */
             cardSettings[index++] = SETCARD;
-            
+
             cardSettingCount = index;
         }
 
@@ -500,6 +501,10 @@ namespace OHOS
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "state %d is error", stateIndex);
         }
+        
+        /*进行主界面UI更新通知 如果在主界面*/
+        if (MainViewSample::GetInstance() != nullptr)
+            MainViewSample::GetInstance()->UpdateStateShow();
     }
 
     // 接口 2: 获取最高优先级为 true 的状态
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 d6290dded..b88936179 100644
--- 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 5375cebd2..d2076360f 100644
--- 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());
         /*配置表盘状态*/
-- 
2.17.1