From: hcj <1224667075@qq.com>
Date: Fri, 13 Sep 2024 06:54:08 +0000 (+0800)
Subject: 修复每日目标数据刷新 #53 #54
X-Git-Tag: release_V1.2.70_20241020_135402~490
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F961%2F2;p=mirrors%2FFD230.git

修复每日目标数据刷新 #53 #54
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/goal/include/goalmodel.h b/code/sdk/application/wearable/fd230app/nativeui/goal/include/goalmodel.h
index 13268a417..4e6422fb4 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/goal/include/goalmodel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/goal/include/goalmodel.h
@@ -36,6 +36,7 @@ namespace OHOS
 
         char* getstandgoal();
         char* getstandnew();
+        void updata();
 
     private:
         GoalModel();
diff --git a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalmodel.cpp b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalmodel.cpp
index 1067a9cd0..0e9878a94 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalmodel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalmodel.cpp
@@ -138,4 +138,16 @@ namespace OHOS
       return instance;
    }
 
+   void GoalModel::updata(void)
+   {
+      if(OHOS::GoalView::GetInstance())
+      {
+         OHOS::GoalView::GetInstance()->GoalViewrefresh();
+      }
+      if(OHOS::GoalotherView::GetInstance())
+      {
+         OHOS::GoalotherView::GetInstance()->GoalViewrefresh();
+      }
+   }
+
 }
\ No newline at end of file
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 119c2bc23..266e0eae9 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
@@ -86,7 +86,8 @@ typedef enum {
     UI_UPDATE_AI_ANSWER_STR,    //更新AI答案的字符串
     UI_HAND_WATCH_FIRST_PAIRED, //手表已配对：给第一次手表启动用配对成功调用
     UI_UPDATE_RECORDPROCESS,    //更新录音进度条
-    UI_UPDATE_PLAYERPROCESS,   //处理更新音乐进度条   
+    UI_UPDATE_PLAYERPROCESS,   //处理更新音乐进度条
+    UI_UPDATE_GOAL,   //更新每日目标     
     UI_UPDATE_ALARM_INFO, // set alarm by app
     UI_UPDATE_OBU_MESSAGE,       
     MAX_NUM_HANDLER, 
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 949be7cd5..25c158cc9 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
@@ -51,6 +51,8 @@
 #include "errcode.h"
 #include "pm_definition.h"
 #include "producttest/include/testModel.h"
+#include "goal/include/goalmodel.h"
+
 #include "ui_serviceC.h"
 
 extern "C" errcode_t uapi_pm_add_sleep_veto(pm_id_t veto_id);
@@ -129,6 +131,7 @@ extern "C"
     static void HandleUpdateHeartRate(Request *request);
     static void HandleUpdateDialState(Request *request);
     static void HandleUpdateAlarmInfo(Request *request);
+    static void HandleUpdateGoalInfo(Request *request);
 
     // 消息处理程序项数组(每个消息类型对应一个处理函数，函数名以 Handle 开头)
     MsgHandlerEntry msgHandlers[] = {
@@ -161,7 +164,7 @@ extern "C"
         {UI_AI_JUMP_TO_RESPONDERR_VIEW, HandleAiJumpToRespondErrMessage},
         {UI_UPDATE_RECORDPROCESS, HandleUpdateRecordProcess},
         {UI_UPDATE_PLAYERPROCESS, HandleUpdatePlayerProcess},
-
+        {UI_UPDATE_GOAL, HandleUpdateGoalInfo},
         {UI_UPDATE_SLEEP_DATA, HandleUpdateSleep},
         {UI_UPDATE_MESSAGE_DATA, HandleUpdateMessage},
         {UI_UPDATE_HEARTRATE_DATA, HandleUpdateHeartRate},
@@ -683,6 +686,12 @@ extern "C"
             std::bind(&OHOS::AlarmClockModel::UpdateAlarmInfoByAppSet, OHOS::AlarmClockModel::GetInstance()));
     }
 
+    static void HandleUpdateGoalInfo(Request *request)
+    {
+        GraphicService::GetInstance()->PostGraphicEvent(
+            std::bind(&OHOS::GoalModel::updata, &OHOS::GoalModel::GetInstance()));
+    }
+
 /* -------------------------------------------------------------------------- */
 #ifdef __cplusplus
 }
diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
index c35eebef6..7cacf2fa4 100644
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
@@ -1745,10 +1745,13 @@ void set_user_data(msg_user_info_t *data)
     p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_DURATION,data->fat_time);
 
     do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SET_USER_INFO, NULL);
-    /*
-    时制
-    p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_CUSTOM_DATA_AGE,data.timeformat);
-    */
+    if(data->timeformat==0)
+    p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_24HOUR,24);
+    else
+    p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_24HOUR,12);
+
+     SendMsgToUIService(UI_UPDATE_GOAL, 0, nullptr, 0);
+    
 }
 
 int get_goal_stepcount(void)
@@ -1793,6 +1796,7 @@ void set_goal_stepcount(uint32_t step)
     OHOS::ConfigModel *p_ConfigModel  =   OHOS::ConfigModel::GetInstance();
     
     p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_STEPCOUNT,step);
+     SendMsgToUIService(UI_UPDATE_GOAL, 0, nullptr, 0);
     return ;
 }
 void set_goal_caloriescount(uint32_t kcal)
@@ -1800,6 +1804,8 @@ void set_goal_caloriescount(uint32_t kcal)
     OHOS::ConfigModel *p_ConfigModel  =   OHOS::ConfigModel::GetInstance();
     
     p_ConfigModel->set_condigData_Int(OHOS::ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_CALORIES,kcal);
+
+    SendMsgToUIService(UI_UPDATE_GOAL, 0, nullptr, 0);
     return ;
 }
 void set_notify_switch(bool on)