Merge #1175 into sdk602patch0911 from refs/changes/1175/head

Code review from 袁清梦

* refs/changes/1175/head: (10 commits squashed)

  - 优化训练文件存储。增加错误存储提醒

  - #986 手表在点击拍照界面，APP端退出相机界面时手表端不会同步退出

  - #799长按表盘，进入表盘预览界面，手表息屏后不管多久亮屏，手表还是表盘预览界面。

  - #942 心率出值后，过一会又会显示--

  - #840 卡片界面心率也需要有活体检测弹窗提醒

  - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - 表盘：取消开机对电量获取的注册

  - 心率：优化心率数据的存储以及更新

  - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - 睡眠：屏蔽AlarmScan里面的消息更新睡眠UI

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1175

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 bc2a293..9b582e7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -419,27 +419,12 @@ extern "C"
             // 退出睡眠检测模式并进入小睡检测模式\r
             if (!is_time_range(curTime, sleep_time_hour, sleep_time_min, wake_time_hour, wake_time_min) && (uapi_dev_runtime_get_nap_monitoring_status() == 0))\r
             {\r
-                // uapi_dev_runtime_set_sleep_status(0);\r
-                //  do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);\r
-\r
-                // bool ret = OHOS::sleep_mutex_init();去掉睡眠锁的初始化\r
-                // if(!ret)\r
-                // {\r
-                //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sleep_mutex_init failed !!! ");\r
-                // }\r
-\r
-                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "起床啦! curTime.tm_hour:%d  curTime.tm_min:%d curTime.tm_sec:%d ", curTime.tm_hour, curTime.tm_min, curTime.tm_sec);\r
-\r
                 if (curTime.tm_hour == wake_time_hour && curTime.tm_min == wake_time_min && curTime.tm_sec == 0)\r
                 {\r
                     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "闹铃!");\r
                     //退出睡眠模式\r
                     OHOS::SleepModeModel::GetInstance().SetSleepModeDisabled();\r
                     OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE);\r
-                    // 早安提醒（关闭）\r
-                    // AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4);\r
-                    // OHOS::SleepModel::GetInstance().ReInitData(); // 更新睡眠数据\r
-                    SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0);\r
                 }\r
 \r
                 // 判断是否还在睡眠\r
@@ -448,28 +433,17 @@ extern "C"
                     // 设置状态为小睡\r
                     uapi_dev_runtime_set_nap_status(0);             // 清零小睡状态\r
                     uapi_dev_runtime_set_absolute_static_status(0); // 清零绝对静止状态\r
-                    // uapi_dev_runtime_set_nap_monitoring_status(1);\r
-                    // uapi_dev_runtime_set_sleep_monitoring_status(0);\r
-                    // OHOS::SleepModel::GetInstance().ReInitData(); // 更新睡眠数据\r
                     set_keep_in_wear_det_mode(1);                 // 开启小睡佩戴监测\r
-                    SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0);\r
                     do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE, NULL); // 算法底层切换小睡监测模式\r
                 }\r
             }\r
             // 进入睡眠检测模式并退出小睡检测模式\r
             else if (is_time_range(curTime, sleep_time_hour, sleep_time_min, wake_time_hour, wake_time_min) && (uapi_dev_runtime_get_sleep_monitoring_status() == 0))\r
             {\r
-                // bool ret = OHOS::sleep_mutex_init(); //去掉睡眠锁的初始化\r
-                // if(!ret)\r
-                // {\r
-                //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sleep_mutex_init failed !!! ");\r
-                // }\r
                 int cmd = 1;\r
                 uapi_dev_runtime_set_sleep_status(0);           // 清零睡眠状态\r
                 uapi_dev_runtime_set_absolute_static_status(0); // 清零绝对静止状态\r
                 OHOS::clean_sleep_data();                       // 清零睡眠文件存储数据\r
-                // uapi_dev_runtime_set_sleep_monitoring_status(1);\r
-                // uapi_dev_runtime_set_nap_monitoring_status(0);\r
                 if(uapi_dev_runtime_get_nap_monitoring_status() == 1)\r
                     uapi_clean_sleep_flag();                        // 清除睡眠标志文件\r
                 OHOS::create_sleep_folder();                     // 创建睡眠文件夹              \r
@@ -490,7 +464,6 @@ extern "C"
                     OHOS::SleepModel::GetInstance().DeleteSleepData(); // 清空前一天睡眠数据\r
                 }\r
 \r
-                // LOS_Msleep(1000);\r
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE, NULL); // 算法底层切换睡眠监测模式\r
             }\r
         }\r