部分提交更新

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
index 9e3af5b..0f072b2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -254,7 +254,7 @@ extern "C"
                 }\r
             }\r
             // 进入睡眠模式\r
-            if ((curTime.tm_hour == (sleep_time >> 16)) && (curTime.tm_min == (sleep_time & 0X00FF)) && (curTime.tm_sec == 0))\r
+            if (curTime.tm_hour == ((sleep_time & 0XFFFF0000) >> 16) && curTime.tm_min == (sleep_time & 0X0000FFFF) && curTime.tm_sec == 0)\r
             {\r
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE, NULL);\r
                 // 睡眠弹窗\r
@@ -264,7 +264,7 @@ extern "C"
                 OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEPP);\r
             }\r
             // 退出睡眠模式\r
-            if ((curTime.tm_hour == (wake_up_time >> 16)) && (curTime.tm_min == (wake_up_time & 0X00FF)) && (curTime.tm_sec == 0))\r
+            if (curTime.tm_hour == ((wake_up_time & 0XFFFF0000) >> 16) && curTime.tm_min == (wake_up_time & 0X0000FFFF) && curTime.tm_sec == 0)\r
             {\r
                 printf("起床啦!\r\n");\r
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE, NULL);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
index 4b09d1c..47137fd 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
@@ -236,7 +236,7 @@ namespace OHOS
         }
 
         // 判断文件是否存在 不存在即创建 并打开以输出模式
-        std::ofstream outFile(BLOOD_JSON_PATH, std::ios::app);
+        std::ofstream outFile(BLOOD_JSON_PATH, std::ios::trunc);
         if (!outFile.is_open())
         {
             // 文件创建失败
@@ -299,7 +299,7 @@ namespace OHOS
         }
 
         // 判断文件是否存在 不存在即创建 并打开以输出模式
-        std::ofstream outFile(HEART_JSON_PATH, std::ios::app);
+        std::ofstream outFile(HEART_JSON_PATH, std::ios::trunc);
         if (!outFile.is_open())
         {
             // 文件创建失败

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h b/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h
index 15bf221..ea6abd2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h
@@ -1,3 +1,9 @@
+/***
+ * @Date: 2024-06-17 11:38:34
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-07-02 20:41:18
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h
+ */
 /***
  * @Date: 2024-06-17 11:38:34
  * @LastEditors: Caisking 3449750381@qq.com
@@ -61,7 +67,7 @@ namespace OHOS
         virtual ~SetDialModel();
         int32_t ParseDialHeader(int type, const std::string &dialFileName, SetDialInfo &dialInfo);
         std::vector<SetDialInfo> dialInfoList;
-        uint16_t currentDialID;
+        uint16_t currentDialID = 1028; // 设置表盘默认值
     };
 }