From 870d5e0430846159a4cae207c08c5ed18ce65345 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Tue, 9 Jul 2024 16:21:43 +0800
Subject: [PATCH] =?utf8?q?=E5=85=B3=E9=97=AD=E4=B8=8D=E5=BF=85=E8=A6=81?=
 =?utf8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../src/notify/message_notification.cpp       | 24 ++++-----
 .../src/notify/sleep_notification.cpp         | 50 +++++++++----------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/message_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/message_notification.cpp
index e4b1463e9..9558a1c10 100644
--- a/code/sdk/application/wearable/service/msg_center/src/notify/message_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/message_notification.cpp
@@ -31,12 +31,12 @@ namespace OHOS
 
     MessageViewEventListener::MessageViewEventListener()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageViewEventListener::MessageViewEventListener");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MessageViewEventListener::MessageViewEventListener");
     }
 
     MessageViewEventListener::~MessageViewEventListener()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageViewEventListener::~MessageViewEventListener");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MessageViewEventListener::~MessageViewEventListener");
     }
 
     MessageViewEventListener &MessageViewEventListener::GetInstance()
@@ -46,7 +46,7 @@ namespace OHOS
     }
     bool MessageViewEventListener::OnRelease(UIView &view, const ReleaseEvent &event)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageViewEventListener::OnRelease");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MessageViewEventListener::OnRelease");
         UNUSED(event);
         if (strcmp(view.GetViewId(), DELETEBUTTON) == 0)
         {
@@ -75,7 +75,7 @@ namespace OHOS
     /*创建信息弹窗*/
     UIViewGroup *CreateMessageView(void)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CreateMessageView");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CreateMessageView");
         MessageGroupView = new UIViewGroup();
         if (MessageGroupView == nullptr)
         {
@@ -110,7 +110,7 @@ namespace OHOS
         }
 #endif
         /*初始化label*/
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitView");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitView");
         /* -------------------------------------------------------------------------- */
         titleLabel = new UILabel();
         if (titleLabel == nullptr)
@@ -125,7 +125,7 @@ namespace OHOS
         titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
         titleLabel->SetVisible(true);
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "titleLabel is ok!");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "titleLabel is ok!");
         /* -------------------------------------------------------------------------- */
         timeLabel = new UILabel();
         if (timeLabel == nullptr)
@@ -142,7 +142,7 @@ namespace OHOS
         timeLabel->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
         timeLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         timeLabel->SetVisible(true);
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "timeLabel is ok!");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "timeLabel is ok!");
         /* -------------------------------------------------------------------------- */
         /*初始化消息内容*/
         messageLabel = new UILabel();
@@ -158,7 +158,7 @@ namespace OHOS
         messageLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
         messageLabel->SetLineBreakMode(UILabel::LINE_BREAK_CLIP);             // 换行裁剪
         messageLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); // 居中显示
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "messageLabel is ok");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "messageLabel is ok");
 
         /*加载清除按键*/
 #ifdef FD230
@@ -189,14 +189,14 @@ namespace OHOS
             return nullptr;
         }
         deleteButton->SetOnTouchListener(TouchListener);
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "deleteButton");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "deleteButton");
         /* -------------------------------------------------------------------------- */
         MessageGroupView->Add(titleLabel);
         MessageGroupView->Add(timeLabel);
         MessageGroupView->Add(messageLabel);
         MessageGroupView->Add(deleteButton);
 
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Create MessageGroupView succeed!!");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Create MessageGroupView succeed!!");
         // 震动提醒
         custom_VibratorFunc(VibratorType::VIBRATOR_TYPE_TWO);
         return MessageGroupView;
@@ -204,7 +204,7 @@ namespace OHOS
     /*释放消息弹窗视图*/
     void FreeMessageView(void)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FreeMessageView(void)");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FreeMessageView(void)");
         if (MessageGroupView != nullptr)
         {
             MessageGroupView->RemoveAll();
@@ -224,7 +224,7 @@ namespace OHOS
             RootView::GetInstance()->Remove(MessageGroupView);
             delete MessageGroupView;
             MessageGroupView = nullptr;
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Free MessageView succeed!!");
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Free MessageView succeed!!");
         }
         return;
     }
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 292d68c5f..b461244d3 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
@@ -49,7 +49,7 @@ namespace OHOS
     /*创建睡眠弹窗*/
     UIViewGroup *CreateSleepNotifyView(void)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CreateSleepNotifyView");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CreateSleepNotifyView");
         SleepGroupView = new UIViewGroup();
         if (SleepGroupView == nullptr)
         {
@@ -107,7 +107,7 @@ namespace OHOS
         sleeptitle->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         sleeptitle->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 40);
         sleeptitle->SetVisible(true);
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sleeptitle is ok!");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "sleeptitle is ok!");
         /* -------------------------------------------------------------------------- */
         /*初始化图片*/
         InitImageView(sleepicon, 193, 130, 80, 80, "image", PNG_APPLIST_SLEEP_IMAGE);
@@ -127,7 +127,7 @@ namespace OHOS
         sleepnotifylabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
         sleepnotifylabel->SetLineBreakMode(UILabel::LINE_BREAK_CLIP);             // 换行裁剪
         sleepnotifylabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); // 居中显示
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sleepnotifylabel is ok");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "sleepnotifylabel is ok");
 
         /*加载清除按键*/
         InitButtonExt(sleepbutton, 0, 366, 466, 100, DELETEBUTTON, STR_KONW, 30);
@@ -140,14 +140,14 @@ namespace OHOS
             return nullptr;
         }
         sleepbutton->SetOnTouchListener(TouchListener);
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sleepbutton");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "sleepbutton");
         /* -------------------------------------------------------------------------- */
         SleepGroupView->Add(sleeptitle);
         SleepGroupView->Add(sleepicon);
         SleepGroupView->Add(sleepnotifylabel);
         SleepGroupView->Add(sleepbutton);
 
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Create SleepGroupView succeed!!");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Create SleepGroupView succeed!!");
         custom_VibratorFunc(VibratorType::VIBRATOR_TYPE_TWO); // 震动提醒
         return SleepGroupView;
     }
@@ -185,13 +185,13 @@ namespace OHOS
         SleepGroupView->Add(nopbutton);
         SleepGroupView->Add(closebutton);
 
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Create SleepGroupView succeed!!");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Create SleepGroupView succeed!!");
         custom_VibratorFunc(VibratorType::VIBRATOR_TYPE_TWO); // 震动提醒
     }
     /*释放消息弹窗视图*/
     void FreeSleepView(void)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FreeSleepView(void)");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FreeSleepView(void)");
         if (SleepGroupView != nullptr)
         {
             SleepGroupView->RemoveAll();
@@ -235,7 +235,7 @@ namespace OHOS
             RootView::GetInstance()->Remove(SleepGroupView);
             delete SleepGroupView;
             SleepGroupView = nullptr;
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Free SleepView succeed!!");
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Free SleepView succeed!!");
         }
         return;
     }
@@ -244,12 +244,12 @@ namespace OHOS
     // Presenter
     SleepViewEventListener::SleepViewEventListener()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepViewEventListener::SleepViewEventListener");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SleepViewEventListener::SleepViewEventListener");
     }
 
     SleepViewEventListener::~SleepViewEventListener()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepViewEventListener::~SleepViewEventListener");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SleepViewEventListener::~SleepViewEventListener");
     }
 
     SleepViewEventListener &SleepViewEventListener::GetInstance()
@@ -259,7 +259,7 @@ namespace OHOS
     }
     bool SleepViewEventListener::OnRelease(UIView &view, const ReleaseEvent &event)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepViewEventListener::OnRelease");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SleepViewEventListener::OnRelease");
         UNUSED(event);
         if (strcmp(view.GetViewId(), DELETEBUTTON) == 0)
         {
@@ -275,14 +275,14 @@ namespace OHOS
     }
     bool SleepViewEventListener::OnDrag(UIView &view, const DragEvent &event)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepViewEventListener::OnDrag");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SleepViewEventListener::OnDrag");
         UNUSED(view);
         return true;
     }
 
     bool SleepViewEventListener::OnDragEnd(UIView &view, const DragEvent &event)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepViewEventListener::OnDragEnd");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SleepViewEventListener::OnDragEnd");
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)
         {
             SleepRingPlayStop();
@@ -298,7 +298,7 @@ namespace OHOS
     int SleepViewEventListener::SleepRingPlayerInit(char *RingMusicName)
     {
         // 本地播放文件路径和状态
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RingPlayerInit start!");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RingPlayerInit start!");
         std::string strSrcMusic("/music/ring");
         std::string tempStr("/");
         std::string strName = RingMusicName;
@@ -316,7 +316,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerCallback new fail");
             return OHOS_FAILURE;
         }
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RingPlayerInit end!");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RingPlayerInit end!");
         return OHOS_SUCCESS;
     }
 
@@ -343,7 +343,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "source new fail");
             return OHOS_FAILURE;
         }
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SleepRing Player url:%s", uri.c_str());
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SleepRing Player url:%s", uri.c_str());
         playerCtr->SetSource(*source);
         // 配置播放器
         playerCtr->SetAudioStreamType(AUDIO_STREAM_ALARM_CLOCK); // 设置播放器的音频流类型为闹钟音乐。
@@ -356,7 +356,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "session invalid");
             return OHOS_FAILURE;
         }
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MakeSessionId  %d", sessionId);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MakeSessionId  %d", sessionId);
         playerInterruptListener = std::make_shared<SleepRingPlayerListener>();
         if (playerInterruptListener.get() == nullptr)
         {
@@ -397,7 +397,7 @@ namespace OHOS
         {
             return OHOS_FAILURE;
         }
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Reset, ret:%d", ret);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Reset, ret:%d", ret);
         return OHOS_SUCCESS;
     }
 
@@ -484,20 +484,20 @@ namespace OHOS
 
     void SleepRingPlayerListener::StartSleepRing(void)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[SleepRingPlayerListener::StopSleepRing] start");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[SleepRingPlayerListener::StopSleepRing] start");
         GraphicService::GetInstance()->PostGraphicEvent(Start);
     }
 
     void SleepRingPlayerListener::StopSleepRing(void)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[SleepRingPlayerListener::StopSleepRing] start");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[SleepRingPlayerListener::StopSleepRing] start");
         GraphicService::GetInstance()->PostGraphicEvent(Stop);
     }
 
     /*响应外部的音频中断事件*/
     void SleepRingPlayerListener::OnInterrupt(int32_t type, int32_t hint)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnInterrupt go in, type %d, hint %d.", type, hint);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnInterrupt go in, type %d, hint %d.", type, hint);
         if (type == INTERRUPT_TYPE_BEGIN && hint == INTERRUPT_HINT_PAUSE)
         {
             isDelayed_ = true;
@@ -519,26 +519,26 @@ namespace OHOS
     /* --------------------- SleepRingPlayerCallbackImpl -------------------- */
     void SleepRingPlayerCallbackImpl::OnPlaybackComplete(void)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnPlaybackComplete");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnPlaybackComplete");
         SleepViewEventListener::GetInstance().PopInterCancelMusic();
         SleepViewEventListener::GetInstance().PopInterPlayMusic();
     }
 
     void SleepRingPlayerCallbackImpl::OnError(int32_t errorType, int32_t errorCode)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnError test, errorType %d, errorCode %d", errorType, errorCode);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnError test, errorType %d, errorCode %d", errorType, errorCode);
         // 此处实现代码处理错误事件
     }
 
     void SleepRingPlayerCallbackImpl::OnInfo(int type, int extra)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnInfo test, type %d, extra %d.", type, extra);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnInfo test, type %d, extra %d.", type, extra);
         // 此处实现代码处理普通事件
     }
 
     void SleepRingPlayerCallbackImpl::OnRewindToComplete(void)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnRewindToComplete test");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnRewindToComplete test");
         // 此处实现代码处理进度控制完成的事件
     }
 }
\ No newline at end of file
-- 
2.17.1