From 6d6d511c025e649de5e9ba54089df080b171d534 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Mon, 2 Sep 2024 20:15:01 +0800
Subject: [PATCH] =?utf8?q?#561=E6=89=8B=E8=A1=A8=EF=BC=8C=E6=9C=AA?=
 =?utf8?q?=E7=BB=91=E5=AE=9A=E6=97=B6=EF=BC=8C=E6=94=BE=E7=BD=AE=E5=9C=A8?=
 =?utf8?q?=E4=B8=8D=E5=B9=B3=E6=95=B4=E7=9A=84=E9=9D=A2=E4=B8=8A=EF=BC=8C?=
 =?utf8?q?=E5=BF=83=E7=8E=87=E6=B5=8B=E9=87=8F=E7=81=AF=E4=B9=9F=E4=BC=9A?=
 =?utf8?q?=E5=AE=9A=E6=9C=9F=E6=B5=8B=E9=87=8F=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../src/AlarmClockTimerConfig.cpp             | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

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