睡眠：优化睡眠更新

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 fa223de..586048e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -528,6 +528,9 @@ extern "C"
                     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "要睡觉啦!");\r
                     AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4);\r
                     OHOS::SleepModel::GetInstance().DeleteSleepData(); // 清空前一天睡眠数据\r
+                    // 通知UI更新\r
+                    GraphicService::GetInstance()->PostGraphicEvent(\r
+                        std::bind(&OHOS::SleepModel::UpdateSleepView, &OHOS::SleepModel::GetInstance()));\r
                 }\r
 \r
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE, NULL); // 算法底层切换睡眠监测模式\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 802fe5f..8edb47e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -450,6 +450,7 @@ namespace OHOS
         }
         if (SleepModel::GetInstance().CheckSleepTime()) {
             //通知睡眠更新
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "睡眠数据更新");
             GraphicService::GetInstance()->PostGraphicEvent(
             std::bind(&OHOS::SleepModel::UpdateSleepView, &OHOS::SleepModel::GetInstance()));
           }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
index 9bc5229..556a23f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
@@ -260,7 +260,7 @@ namespace OHOS
     int cmd = 0;
     do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA,
                                &cmd); // 获取睡眠数据 但不中止睡眠
-    LOS_Msleep(200);
+    // LOS_Msleep(200);
     // do_custom_fileoperate_service_check_msg(
     //     CUSTOM_FILEOPERATE_MSG_TYPE_SLEEPDATA_READ, nullptr, 0);
     // LOS_Msleep(200);
@@ -472,8 +472,8 @@ namespace OHOS
     return sleep_time_str;
   }
   //校验时间更新
-  bool SleepModel::CheckSleepTime()
-  {
+  bool SleepModel::CheckSleepTime() {
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CheckSleepTime %d",sleep_update_time);
     // 获取睡眠最新时间
     if (sleep_update_time != 0) {
       return true;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
index b45690e..689eed9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepView.cpp
@@ -32,7 +32,7 @@ namespace OHOS
         // 获取睡眠数据
         SleepModel &sleepModel = SleepModel::GetInstance();
         // 读取一次文件
-        sleepModel.Msg_ReInitData();
+        sleepModel.ReInitData();
 
         int sleep_hour = sleepModel.get_sleep_hour();
         int sleep_min = sleepModel.get_sleep_min();