From f666a234e8bc44fac623cdedb56d49dfbcad83d6 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Tue, 20 Aug 2024 18:51:55 +0800
Subject: [PATCH] =?utf8?q?=E9=80=9A=E8=BF=87=E6=B6=88=E6=81=AF=E8=BF=9B?=
 =?utf8?q?=E8=A1=8CUI=E6=9B=B4=E6=96=B0=E4=B8=BB=E7=95=8C=E9=9D=A2?=
 =?utf8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/main/include/MainModel.h     |  1 +
 .../fd230app/nativeui/main/src/MainModel.cpp       | 14 ++++++++++----
 .../nativeui/uiservice/include/ui_service.h        |  3 ++-
 .../fd230app/nativeui/uiservice/src/ui_service.cpp | 11 +++++++++++
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h
index 9a96317e0..cc26587e9 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h
@@ -81,6 +81,7 @@ namespace OHOS
         DialState getHighestPriorityActiveState();
         bool getMessageActiveState();
         void printDialStates();
+        void UpdateDialState();
 
     private:
         void InitDialSettingDefault(int Id);
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 6f880b023..e15160595 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
@@ -14,6 +14,7 @@
 #include <array>
 #include <stdexcept>
 #include "MainViewSample.h"
+#include "ui_service.h"
 namespace OHOS
 {
     static const int CARD_SETTING_VALUE_LEN = 32;
@@ -501,10 +502,8 @@ namespace OHOS
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "state %d is error", stateIndex);
         }
-        
-        /*进行主界面UI更新通知 如果在主界面*/
-        if (MainViewSample::GetInstance() != nullptr)
-            MainViewSample::GetInstance()->UpdateStateShow();
+
+        SendMsgToUIService(UI_UPDATE_DIALSTATE_DATA, 0, nullptr, 0);
     }
 
     // 接口 2: 获取最高优先级为 true 的状态
@@ -538,6 +537,13 @@ namespace OHOS
         return unread_state;
     }
 
+    void MainModel::UpdateDialState()
+    {
+        /*进行主界面UI更新通知 如果在主界面*/
+        if (MainViewSample::GetInstance() != nullptr)
+            MainViewSample::GetInstance()->UpdateStateShow();
+    }
+
 }
 #if 0
     void MainModel::DeleteCardSetting(uint8_t index)
diff --git a/code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h b/code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h
index 1caba98bc..853eab006 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h
@@ -1,7 +1,7 @@
 /*** 
  * @Date: 2024-07-12 19:25:33
  * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-08-15 14:39:51
+ * @LastEditTime: 2024-08-20 18:34:42
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h
  */
 /*
@@ -77,6 +77,7 @@ typedef enum {
     UI_UPDATE_SLEEP_DATA,       //更新睡眠数据
     UI_UPDATE_MESSAGE_DATA,     //更新消息数据
     UI_UPDATE_HEARTRATE_DATA,   //更新心率曲线
+    UI_UPDATE_DIALSTATE_DATA,   //更新主界面状态
 
     UI_AI_JUMP_TO_RESULT_VIEW,  //跳转到返回结果视图
     UI_AI_JUMP_TO_LISTENING_VIEW,//跳转到AI聆听界面     
diff --git a/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp b/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp
index daaf2fe02..1e0da34b9 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp
@@ -39,6 +39,7 @@
 #include "bundle_install_msg.h"
 #include "graphic_service.h"
 #include "ApplistModel.h"
+#include "MainModel.h"
 #if defined(SUPPORT_POWER_MANAGER)
 #include "power_display_service.h"
 #endif
@@ -118,6 +119,7 @@ extern "C"
     static void HandleUpdateSleep(Request *request);
     static void HandleUpdateMessage(Request *request);
     static void HandleUpdateHeartRate(Request *request);
+    static void HandleUpdateDialState(Request *request);
 
     // 消息处理程序项数组(每个消息类型对应一个处理函数，函数名以 Handle 开头)
     MsgHandlerEntry msgHandlers[] = {
@@ -151,6 +153,7 @@ extern "C"
         {UI_UPDATE_SLEEP_DATA, HandleUpdateSleep},
         {UI_UPDATE_MESSAGE_DATA, HandleUpdateMessage},
         {UI_UPDATE_HEARTRATE_DATA, HandleUpdateHeartRate},
+        {UI_UPDATE_DIALSTATE_DATA, HandleUpdateDialState},
 
     };
     /* -------------------------------------------------------------------------- */
@@ -616,12 +619,20 @@ extern "C"
         GraphicService::GetInstance()->PostGraphicEvent(
             std::bind(&OHOS::MessageModel::UpdateMessageView, &OHOS::MessageModel::GetInstance()));
     }
+    // 更新心率数据
     void HandleUpdateHeartRate(Request *request)
     {
         WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleUpdateMessage");
         GraphicService::GetInstance()->PostGraphicEvent(
             std::bind(&OHOS::HeartModel::Heart_Update_View, OHOS::HeartModel::GetInstance()));
     }
+    // 更新主界面状态数据
+    void HandleUpdateDialState(Request *request)
+    {
+        WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleUpdateMessage");
+        GraphicService::GetInstance()->PostGraphicEvent(
+            std::bind(&OHOS::MainModel::UpdateDialState, &OHOS::MainModel::GetInstance()));
+    }
 /* -------------------------------------------------------------------------- */
 #ifdef __cplusplus
 }
-- 
2.17.1