From: Caisking <3449750381@qq.com>
Date: Mon, 15 Jul 2024 11:52:44 +0000 (+0800)
Subject: 取消早安闹钟一直响铃
X-Git-Tag: release_V1.2.70_20241020_135402~807^2~8
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F521%2Fhead;p=mirrors%2FFD230.git

取消早安闹钟一直响铃
---

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 cb59e2fae..908a720d6 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -84,6 +84,7 @@ extern "C"
         sleep_time_min = sleep_time & 0x0000FFFF;
         wake_time_hour = (wake_up_time & 0xFFFF0000) >> 16;
         wake_time_min = wake_up_time & 0x0000FFFF;
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sleep_time_hour:%d sleep_time_min:%d wake_time_hour:%d wake_time_min:%d", sleep_time_hour, sleep_time_min, wake_time_hour,wake_time_min);
     }
 
     void set_sedentary_data(void)
@@ -124,7 +125,7 @@ extern "C"
         sleep_notify_time_hour = (sleep_notify_time_hour < 0) ? 23 : sleep_notify_time_hour; // 处理从0点前20分钟的情况，变为前一天的23点40分
 
         sleep_notify_time = (sleep_notify_time_hour << 16) | sleep_notify_time_min;
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sleep_time_hour:%d sleep_time_min:%d sleep_notify_time:%d", sleep_notify_time_hour, sleep_notify_time_min, sleep_notify_time);
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sleep_notify_time_hour:%d sleep_notify_time_min:%d sleep_notify_time:%d", sleep_notify_time_hour, sleep_notify_time_min, sleep_notify_time);
     }
     void AlarmEventPublish(uint16_t topic, uint8_t *data, uint32_t size)
     {
@@ -340,6 +341,7 @@ extern "C"
                 OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEPP);
                 if (curTime.tm_hour == sleep_time_hour && curTime.tm_min == sleep_time_min && curTime.tm_sec == 0)
                 {
+                    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "要睡觉啦!");
                     AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4);
                     OHOS::SleepModel::GetInstance().DeleteSleepData(); // 清空前一天睡眠数据
                 }
diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index 35e010462..8837100b3 100644
--- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@ -658,6 +658,10 @@ void MsgCenterNotifySleepProc(const Topic topic, Request* req)
         NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_TWO);
         AlarmClockModel::GetInstance()->PopInterPlayMusic();
     }
+    else
+    {
+        NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_THREE);
+    }
     NotificationManager::GetInstance()->ShowNotify(showSleepNotify, (uint16_t)topic, true);
 }
 #endif
diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/sleep_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/sleep_notification.cpp
index 64a3e0252..b465e1f16 100644
--- a/code/sdk/application/wearable/service/msg_center/src/notify/sleep_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/sleep_notification.cpp
@@ -384,6 +384,7 @@ namespace OHOS
      */
     int SleepViewEventListener::SleepRingPlayStop(void)
     {
+        AlarmClockModel::GetInstance()->PopInterCancelMusic();
         int32_t ret = 0;
         AudioManager &amIntance = AudioManager::GetInstance();
         if (playerCtr.get() == nullptr)