#561手表，未绑定时，放置在不平整的面上，心率测量灯也会定期测量，

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 f6dd3e7..07aa047 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -313,10 +313,10 @@ extern "C"
     {\r
         AlarmClockEventData unuse;\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmCallBackProcB");\r
-         GraphicService::GetInstance()->PostGraphicEvent(\r
+        GraphicService::GetInstance()->PostGraphicEvent(\r
             std::bind(AlarmTimerEventPublish, TOPIC_EVENT_NEXTDAY_UPDATE, unuse));\r
 \r
-       // AlarmTimerEventPublish(TOPIC_EVENT_NEXTDAY_UPDATE, unuse);\r
+        // AlarmTimerEventPublish(TOPIC_EVENT_NEXTDAY_UPDATE, unuse);\r
         SetZeroAlarm();\r
     }\r
 \r
@@ -343,7 +343,7 @@ extern "C"
                 (g_alarmCtrA.info.hour == curTime.tm_hour) &&\r
                 (g_alarmCtrA.info.minute == curTime.tm_min))\r
             {\r
-                g_alarmCtrA.callback(); \r
+                g_alarmCtrA.callback();\r
                 g_alarmCtrA.state = ALARM_STATUS_CREATED;\r
             }\r
         }\r
@@ -357,9 +357,12 @@ extern "C"
                 (g_alarmCtrB.info.second == curTime.tm_sec))\r
             {\r
                 g_alarmCtrB.state = ALARM_STATUS_CREATED;\r
-                g_alarmCtrB.callback();//由于只有callback中SetZeroAlarm会设置state为ALARM_STATUS_RUNNING , 所以必须把state=ALARM_STATUS_CREATED提前，或者干脆删除。\r
+                g_alarmCtrB.callback(); // 由于只有callback中SetZeroAlarm会设置state为ALARM_STATUS_RUNNING , 所以必须把state=ALARM_STATUS_CREATED提前，或者干脆删除。\r
             }\r
         }\r
+        // 未绑定状态下，以下操作不进行\r
+        if (OHOS::ConfigModel::GetInstance()->get_configData_bool(OHOS::ConfigModel::CONFIGMODEL_ITEM_FIRSTTIMESTART))\r
+            return;\r
         // 整点回调\r
         if (curTime.tm_min == 0 && curTime.tm_sec == 0)\r
         {\r
@@ -398,26 +401,26 @@ extern "C"
                     OHOS::SleepModel::GetInstance().ReInitData(); // 更新睡眠数据\r
                     SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0);\r
                 }\r
-                                \r
-                //判断是否还在睡眠\r
+\r
+                // 判断是否还在睡眠\r
                 if (uapi_dev_runtime_get_sleep_status() == 0)\r
                 {\r
                     // 设置状态为小睡\r
-                    uapi_dev_runtime_set_nap_status(0);//清零小睡状态\r
+                    uapi_dev_runtime_set_nap_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
                     SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0);\r
-                    do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE, NULL);//算法底层切换小睡监测模式\r
+                    do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE, NULL); // 算法底层切换小睡监测模式\r
                 }\r
             }\r
             // 进入睡眠检测模式并退出小睡检测模式\r
             else if ((!WAKE_TIME_RANGE) && (uapi_dev_runtime_get_sleep_monitoring_status() == 0))\r
             {\r
-                uapi_dev_runtime_set_sleep_status(0);//清零睡眠状态\r
+                uapi_dev_runtime_set_sleep_status(0); // 清零睡眠状态\r
                 uapi_dev_runtime_set_sleep_monitoring_status(1);\r
                 uapi_dev_runtime_set_nap_monitoring_status(0);\r
-                do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);//强制获取小睡数据，结束小睡\r
+                do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL); // 强制获取小睡数据，结束小睡\r
                 // 睡眠弹窗\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "要睡觉啦!");\r
                 // 设置状态为睡眠\r
@@ -429,8 +432,8 @@ 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
+                // LOS_Msleep(1000);\r
+                do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE, NULL); // 算法底层切换睡眠监测模式\r
             }\r
         }\r
         // 久坐提醒\r
@@ -522,18 +525,18 @@ extern "C"
             }\r
         }\r
         int16_t curviewid = OHOS::NativeAbility::GetInstance().GetCurSliceId();\r
-        if(curviewid != VIEW_MAIN && OHOS::PlayersView::GetInstance()) //如果当前不在主界面且音乐界面不为空\r
+        if (curviewid != VIEW_MAIN && OHOS::PlayersView::GetInstance()) // 如果当前不在主界面且音乐界面不为空\r
         {\r
             OHOS::UICheckBox::UICheckBoxState state = OHOS::PlayersView::GetInstance()->GetPlayerButtonState();\r
-            if(state == OHOS::UICheckBox::UICheckBoxState::SELECTED)\r
+            if (state == OHOS::UICheckBox::UICheckBoxState::SELECTED)\r
             {\r
                 SendMsgToUIService(UI_UPDATE_PLAYERPROCESS, 0, nullptr, 0);\r
             }\r
         }\r
-        else if(OHOS::RecordingPlayerView::GetInstance())\r
+        else if (OHOS::RecordingPlayerView::GetInstance())\r
         {\r
             OHOS::UICheckBox::UICheckBoxState state = OHOS::RecordingPlayerView::GetInstance()->GetPlayerButtonState();\r
-            if(state == OHOS::UICheckBox::UICheckBoxState::SELECTED)\r
+            if (state == OHOS::UICheckBox::UICheckBoxState::SELECTED)\r
             {\r
                 SendMsgToUIService(UI_UPDATE_RECORDPROCESS, 0, nullptr, 0);\r
             }\r