From 779a922888dc66c84e098e7c237f79b938441831 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=BD=97=E6=AD=A3?= <1732036298@qq.com> Date: Tue, 5 Nov 2024 07:52:13 +0000 Subject: [PATCH] Merge #1341 into sdk602patch0911 from refs/changes/1341/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 罗正 * refs/changes/1341/head: (4 commits squashed) - Applist样式：弧形列表优化UI显示 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - 采用WEARABLE_LOGD代替WEARABLE_LOGE,控制log打印 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 Signed-off-by: 罗正 <1732036298@qq.com> Reviewed-by: Caisking <3449750381@qq.com> Reviewed-by: 罗正 <1732036298@qq.com> Reviewed-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Reviewed-by: aliyun6865282430 <1624952103@qq.com> Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1341 --- .../nativeui/aimodels/src/AiModelsModel.cpp | 2 +- .../nativeui/aimodels/src/AiModelsView.cpp | 24 +++---- .../src/AiVoiceBluetoothFailedStartView.cpp | 6 +- .../aivoice/src/AiVoiceConnectingView.cpp | 6 +- .../nativeui/aivoice/src/AiVoiceModel.cpp | 24 +++---- .../nativeui/aivoice/src/AiVoicePresenter.cpp | 6 +- .../nativeui/aivoice/src/AiVoiceView.cpp | 28 ++++---- .../aivoice/src/AivoiceConnectTimeoutView.cpp | 6 +- .../aivoice/src/AivoiceListeningView.cpp | 6 +- .../src/AivoiceMobileDataFailedStartView.cpp | 6 +- .../src/AivoiceReturnResultTextView.cpp | 6 +- .../aivoice/src/AivoiceThinkingView.cpp | 6 +- .../aivoice/src/apikeys/ApiKeysDeleteView.cpp | 4 +- .../aivoice/src/apikeys/ApiKeysPresenter.cpp | 2 +- .../aivoice/src/apikeys/NotSetApiKeysView.cpp | 6 +- .../aivoice/src/apikeys/SetApiKeysView.cpp | 6 +- .../nativeui/alarm/src/AlarmClockModel.cpp | 10 +-- .../nativeui/alarm/src/AlarmJudgeView.cpp | 2 +- .../nativeui/alarm/src/AlarmNewTimeView.cpp | 8 +-- .../nativeui/alarm/src/AlarmPresenter.cpp | 12 ++-- .../nativeui/alarm/src/AlarmSetWeekView.cpp | 8 +-- .../nativeui/alarm/src/MainAlarmView.cpp | 10 +-- .../alarmclockmanage/src/AlarmClockManage.cpp | 6 +- .../src/AlarmClockTimerConfig.cpp | 32 ++++----- .../nativeui/applist/src/ApplistPresenter.cpp | 2 +- .../nativeui/applist/src/ApplistView.cpp | 7 +- .../src/BluetoothCaseListAdapter.cpp | 8 +-- .../src/BluetoothDeviceCaseListAdapter.cpp | 12 ++-- .../bluetooth/src/BluetoothEarPhoneView.cpp | 2 +- .../bluetooth/src/BluetoothHeadsetEvent.cpp | 2 +- .../bluetooth/src/BluetoothItemView.cpp | 2 +- .../nativeui/bluetooth/src/BluetoothModel.cpp | 2 +- .../bluetooth/src/BluetoothReconnectView.cpp | 2 +- .../src/BluetoothServiceOptionsView.cpp | 4 +- .../src/ClassicBlueToothPresenter.cpp | 6 +- .../src/ClassicBlueToothView.cpp | 4 +- .../compass/src/CompassControlView.cpp | 6 +- .../nativeui/compass/src/CompassView.cpp | 4 +- .../nativeui/countdown/src/CountDownModel.cpp | 22 +++--- .../countdown/src/MainCountDownPresenter.cpp | 10 +-- .../countdown/src/StartCountDownView.cpp | 4 +- .../src/BrightnessControlView.cpp | 4 +- .../src/DisplayBrightnessView.cpp | 4 +- .../src/ScreenDurationView.cpp | 4 +- .../dnotdisturb/src/DnotDisturbView.cpp | 6 +- .../nativeui/findphone/src/FindPhoneModel.cpp | 2 +- .../nativeui/findphone/src/FindPhoneView.cpp | 34 ++++----- .../flashlight/src/FlashlightModel.cpp | 20 +++--- .../flashlight/src/FlashlightPresenter.cpp | 4 +- .../flashlight/src/FlashlightView.cpp | 32 ++++----- .../nativeui/key/src/KeyInputListener.cpp | 14 ++-- .../nativeui/languagecode/LanguageInit.cpp | 16 ++--- .../languagecode/src/LanguageSwitchModel.cpp | 4 +- .../src/LanguageSwitchPresenter.cpp | 8 +-- .../languagecode/src/LanguageSwitchView.cpp | 4 +- .../nativeui/main/src/MainPresenterSample.cpp | 10 +-- .../nativeui/main/src/PullUpDownView.cpp | 32 ++++----- .../main/src/VolumeSettingPresenter.cpp | 2 +- .../main/src/dropdown/DropDownCardPage1.cpp | 12 ++-- .../main/src/dropdown/DropDownCardPage2.cpp | 6 +- .../src/MotionRecognitionView.cpp | 6 +- .../musicplayer/src/MusicPlayerView.cpp | 6 +- .../src/MobileDataOptionsView.cpp | 4 +- .../src/NetworkAndCallPresenter.cpp | 6 +- .../networkandcall/src/NetworkAndCallView.cpp | 6 +- .../src/MusicPlayerBTConnectFailedView.cpp | 10 +-- .../src/MusicPlayerBluetoothDisConView.cpp | 6 +- .../player/src/MusicPlayerSourceView.cpp | 10 +-- .../player/src/MusicPlayerTipView.cpp | 10 +-- .../player/src/PlayerListDelSongView.cpp | 2 +- .../player/src/PlayersCaseListAdapter.cpp | 2 +- .../nativeui/player/src/PlayersModel.cpp | 18 ++--- .../nativeui/player/src/PlayersPresenter.cpp | 8 +-- .../nativeui/player/src/PlayersView.cpp | 34 ++++----- .../nativeui/record/src/RecordDeleteView.cpp | 4 +- .../nativeui/record/src/RecordListView.cpp | 6 +- .../nativeui/record/src/RecordingModel.cpp | 40 +++++------ .../record/src/RecordingPresenter.cpp | 70 +++++++++---------- .../nativeui/record/src/RecordingView.cpp | 12 ++-- ...spiratoryTrainingDurationSelectionView.cpp | 6 +- .../src/RespiratoryTrainingModel.cpp | 6 +- .../src/RespiratoryTrainingPresenter.cpp | 4 +- .../src/RespiratoryTrainingView.cpp | 10 +-- .../schedule/src/ScheduleListAdapter.cpp | 10 ++- .../schedule/src/ScheduleListItem.cpp | 2 +- .../nativeui/schedule/src/ScheduleModel.cpp | 28 ++++---- .../schedule/src/SchedulePresenter.cpp | 8 +-- .../nativeui/schedule/src/ScheduleView.cpp | 24 +++---- .../src/FastTrainingPresenter.cpp | 2 - .../nativeui/settings/src/SettingView.cpp | 8 +-- .../soundandvibration/src/CallVolumeView.cpp | 6 +- .../src/SoundAndVibrationPresenter.cpp | 8 +-- .../src/SoundAndVibrationView.cpp | 12 ++-- ...oundAndVibrationVolumeSettingPresenter.cpp | 2 +- .../SoundAndVibrationVolumeSettingView.cpp | 2 +- .../src/SystemVolumeView.cpp | 10 +-- .../src/VibrationModeView.cpp | 8 +-- .../stopwatch/src/MainStopWatchPresenter.cpp | 6 +- .../src/StopWatchRecordTimeToLimitView.cpp | 4 +- .../system/src/SystemAboutTheWatchView.cpp | 8 +-- .../system/src/SystemFactoryResetView.cpp | 4 +- .../nativeui/system/src/SystemLogModel.cpp | 8 +-- .../nativeui/system/src/SystemPresenter.cpp | 10 +-- .../system/src/SystemSuperviseView.cpp | 4 +- .../nativeui/system/src/SystemView.cpp | 24 +++---- .../systemupdate/src/SystemUpdateModel.cpp | 20 +++--- .../src/SystemUpdatePresenter.cpp | 6 +- .../systemupdate/src/SystemUpdateView.cpp | 32 ++++----- .../themestyle/src/ThemeStyleModel.cpp | 4 +- .../watchQRcode/src/WatchQRCodeView.cpp | 24 +++---- .../weather/src/FutureWeatherView.cpp | 10 +-- .../weather/src/GetWeatherDataErrorView.cpp | 6 +- .../nativeui/weather/src/MainWeatherView.cpp | 6 +- .../weather/src/WeatherControlView.cpp | 6 +- .../weather/src/WeatherReportView.cpp | 14 ++-- .../nativeui/weather/src/WeatherView.cpp | 22 +++--- .../src/notify/alarm_notification.cpp | 16 ++--- .../src/notify/drinkReminder_notification.cpp | 2 +- .../src/notify/findwatch_notification.cpp | 12 ++-- .../motion_recognition_notification.cpp | 12 ++-- .../src/notify/pairing_notification.cpp | 42 +++++------ .../notify/sedentaryReminder_notification.cpp | 12 ++-- 122 files changed, 638 insertions(+), 641 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsModel.cpp index 5466fca59..3ef46c119 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsModel.cpp @@ -41,7 +41,7 @@ namespace OHOS AiModelsPresenter *aiModelsPresenter = AiModelsPresenter::GetInstance(); if (aiModelsPresenter == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiModelsModel::ChangeAiModel - AiModelsPresenter instance is nullptr"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiModelsModel::ChangeAiModel - AiModelsPresenter instance is nullptr"); return false; } aiModelsPresenter->ChangeAiModel(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp index a1da41418..8f2e71a99 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aimodels/src/AiModelsView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-15 11:58:45 + * @LastEditTime: 2024-11-05 11:08:16 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiModels/src/AiModelsView.cpp */ #include "aimodels/include/AiModelsPresenter.h" @@ -14,13 +14,13 @@ namespace OHOS static AiModelsView *g_pAiModelsView{nullptr}; AiModelsView::AiModelsView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiModelsView::AiModelsView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiModelsView::AiModelsView"); g_pAiModelsView = this; } AiModelsView::~AiModelsView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiModelsView::~AiModelsView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiModelsView::~AiModelsView"); g_pAiModelsView = nullptr; } @@ -28,7 +28,7 @@ namespace OHOS { if (!g_pAiModelsView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiModelsView::GetInstance - Instance not initialized!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiModelsView::GetInstance - Instance not initialized!"); } return g_pAiModelsView; } @@ -179,7 +179,7 @@ namespace OHOS AiModelsTitle = AiModelsViewLabelInit(labelConfig); if (AiModelsTitle == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiModelsTitle new fail!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiModelsTitle new fail!"); return false; } @@ -199,7 +199,7 @@ namespace OHOS AiModelsBackGroundImage = AiModelsViewImageViewInit(imagecinfig); if (AiModelsBackGroundImage == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiModelsView::AiModelsBackGroundImage is nullptr!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiModelsView::AiModelsBackGroundImage is nullptr!!"); return false; } /* -------------------------------------------------------------------------- */ @@ -213,7 +213,7 @@ namespace OHOS AiModelsTitleBackGroundImage = AiModelsViewImageViewInit(imagecinfig); if (AiModelsTitleBackGroundImage == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiModelsView::AiModelsTitleBackGroundImage is nullptr!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiModelsView::AiModelsTitleBackGroundImage is nullptr!!"); return false; } /* -------------------------------------------------------------------------- */ @@ -243,7 +243,7 @@ namespace OHOS AiModelsImages[i] = AiModelsViewImageViewInit(imagecinfig); if (AiModelsImages[i] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiModelsImages[%d] new fail!", i); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiModelsImages[%d] new fail!", i); return false; } } @@ -281,7 +281,7 @@ namespace OHOS AiModelsButtons[i] = AiModelsViewButtonInit(buttonconfig); if (AiModelsButtons[i] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiModelsButtons[%d] new fail!", i); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiModelsButtons[%d] new fail!", i); return false; } AiModelsButtons[i]->SetImageSrc(AiModelsImagePath[i], AiModelsImagePath[i]); @@ -296,7 +296,7 @@ namespace OHOS AiModelsScrollView = new UIScrollView(); if (AiModelsScrollView == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiModelsView::CreateAiModelsScrollView new fail!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiModelsView::CreateAiModelsScrollView new fail!"); return false; } AiModelsScrollView->SetPosition(0, 0, 466, 466); @@ -313,7 +313,7 @@ namespace OHOS if (!CreateAiModelsScrollView() || !CreateAiModelsViewLabel() || !CreateAiModelsViewImageView() || !CreateAiModelsViewButton()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiModelsView::CreateAiModelsView fail!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiModelsView::CreateAiModelsView fail!"); return; } @@ -337,7 +337,7 @@ namespace OHOS SetContainerView(new UIViewGroup()); if (GetContainer() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetContainerView fail!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetContainerView fail!!"); return; } container_->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp index c8372af06..0d11484d2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceBluetoothFailedStartView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-02 15:43:57 + * @LastEditTime: 2024-11-05 11:08:30 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AiVoiceBluetoothFailedStartView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -18,13 +18,13 @@ namespace OHOS AiVoiceBluetoothFailedStartView::AiVoiceBluetoothFailedStartView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceBluetoothFailedStartView::AiVoiceBluetoothFailedStartView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceBluetoothFailedStartView::AiVoiceBluetoothFailedStartView"); g_pAiVoiceBluetoothFailedStartView = this; } AiVoiceBluetoothFailedStartView::~AiVoiceBluetoothFailedStartView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceBluetoothFailedStartView::~AiVoiceBluetoothFailedStartView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceBluetoothFailedStartView::~AiVoiceBluetoothFailedStartView"); ClearAll(); g_pAiVoiceBluetoothFailedStartView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp index 09e45f169..b04ee9513 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-03 11:10:08 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-11-01 15:46:19 + * @LastEditTime: 2024-11-05 11:08:54 * @FilePath: /xts_origin/FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp */ #include "aivoice/include/AiVoiceConnectingView.h" @@ -24,13 +24,13 @@ namespace OHOS static AiVoiceConnectingView *g_pAiVoiceConnecting{nullptr}; AiVoiceConnectingView::AiVoiceConnectingView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceConnectingView::AiVoiceConnectingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceConnectingView::AiVoiceConnectingView"); g_pAiVoiceConnecting = this; } AiVoiceConnectingView::~AiVoiceConnectingView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceConnectingView::~AiVoiceConnectingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceConnectingView::~AiVoiceConnectingView"); ClearAll(); g_pAiVoiceConnecting = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp index 6adb6e0d1..d1486a911 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-20 15:14:50 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-28 11:02:51 + * @LastEditTime: 2024-11-05 11:16:39 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp */ #include "aivoice/include/AiVoiceModel.h" @@ -55,7 +55,7 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Directory %s not exist, creating directory\n", path); if (mkdir(path, 0777) != 0) { // 尝试创建目录，如果创建失败 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Create directory %s failed\n", path); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Create directory %s failed\n", path); return false; } } @@ -325,7 +325,7 @@ namespace OHOS // 如果列表只有一项，直接清空 adapter->GetChatContentItem().clear(); } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "listSize = %d", listSize); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "listSize = %d", listSize); ChatContentListCount -= (listSize < 2 ? listSize : 2); } } @@ -463,7 +463,7 @@ namespace OHOS { AIResponseType = type; errnote = str; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AIResponseType = %d,errnote = %s\n", AIResponseType, errnote.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AIResponseType = %d,errnote = %s\n", AIResponseType, errnote.c_str()); //如果是：AI录音解析错误或AI 回应错误 ，或者重传多次录音数据->跳转AI回应错误界面 if (AIResponseType == AiVoiceModel::AI_RECORDING_PARSING_ERROR || AIResponseType == AiVoiceModel::AI_RESPONSE_ERROR || AIResponseType == AiVoiceModel::AI_BLE_ERROR) @@ -561,7 +561,7 @@ namespace OHOS FILE *file = fopen(filePath.c_str(), "r"); if (file != nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "File already exists: %s", filePath.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "File already exists: %s", filePath.c_str()); fseek(file, 0, SEEK_END); long size = ftell(file); @@ -613,7 +613,7 @@ namespace OHOS static void AIVoice_TimerCallbackProc(int data) { // 等待AI思考完成的定时器 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AIVoice_TimerCallbackProc,Time = %d", Time); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AIVoice_TimerCallbackProc,Time = %d", Time); if (Time == 30) // 等待一秒，确保录音停止，发送录音准备就绪指令 { AiVoiceModel::GetInstance().CheckFileAndSendAIIsReady(); @@ -655,7 +655,7 @@ namespace OHOS */ void AiVoiceModel::AIVoice_StartTimer(uint32_t interval) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceModel::AIVoice_StartTimer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceModel::AIVoice_StartTimer"); /* -------------------------- 1.检查定时器是否已经存在，如果存在则返回 ------------------------- */ if (g_timer != nullptr) { @@ -718,9 +718,9 @@ namespace OHOS static void ai_start_screen60s_timer_callbackProc(int data) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceModel::ai_start_screen60s_timer_callbackProc,time = %d", SCREEN_60S_TIME); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceModel::ai_start_screen60s_timer_callbackProc,time = %d", SCREEN_60S_TIME); SCREEN_60S_TIME -= 30; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceModel::ai_start_screen60s_timer_callbackProc,time = %d", SCREEN_60S_TIME); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceModel::ai_start_screen60s_timer_callbackProc,time = %d", SCREEN_60S_TIME); if (SCREEN_60S_TIME <= 0) { // 60s后息屏停止定时 @@ -736,7 +736,7 @@ namespace OHOS } void AiVoiceModel::ai_start_screen60s_timer(uint32_t interval) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceModel::ai_start_screen60s_timer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceModel::ai_start_screen60s_timer"); /* -------------------------- 1.检查定时器是否已经存在，如果存在则返回 ------------------------- */ if (g_screen60s_timer != nullptr) { @@ -828,7 +828,7 @@ namespace OHOS // 开启一个AI录音的定时器 void AiVoiceModel::start_listening_timer(uint32_t interval) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceModel::start_listening_timer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceModel::start_listening_timer"); /* -------------------------- 1.检查定时器是否已经存在，如果存在则返回 ------------------------- */ if (g_listeningEndHandle != nullptr) { @@ -908,7 +908,7 @@ namespace OHOS // 开启一个查询AI是否准备就绪的定时器 void AiVoiceModel::start_ai_isready_timer(uint32_t interval) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceModel::start_ai_isready_timer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceModel::start_ai_isready_timer"); /* -------------------------- 1.检查定时器是否已经存在，如果存在则返回 ------------------------- */ if (g_ai_is_ready_Handle != nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp index 4f7a05809..8f21d1832 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-20 15:11:17 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-24 18:35:43 + * @LastEditTime: 2024-11-05 11:17:28 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp */ #include "AppViewIDs.h" @@ -300,7 +300,7 @@ namespace OHOS { if (it->first == AIVOICERETURNRESULTTEXT_CONTINUECHAT_BUTTON_VIEW_ID) // 点击继续对话按钮要发取消当前对话指令,避免AI回应中途按继续对话按钮没有取消上一次对话问题 { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CancelCurAIChat"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CancelCurAIChat"); AiVoiceModel::GetInstance().CancelCurAIChat(); PlayersModel::GetInstance()->HandPausePhoneMusic(); // 暂停手机音乐 PlayersModel::GetInstance()->PlayerPause(); // 暂停手机音乐 @@ -479,7 +479,7 @@ namespace OHOS } else if (model->GetAiModelTextId() == STR_AIMODES_CHATGPT && event.GetDragDirection() == DragEvent::DIRECTION_BOTTOM_TO_TOP) /*上滑*/ { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DIRECTION_BOTTOM_TO_TOP"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DIRECTION_BOTTOM_TO_TOP"); if (model->IsExistOpenAIAPIKeys() == true) { ChangeViewAndLogicOperator(AIVOICE_STARTCHAT_VIEWID, AIVOICE_SETAPIKEYS); /*开始对话界面->API Keys set界面*/ diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp index ef2258fb3..a12d46886 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-28 11:14:56 + * @LastEditTime: 2024-11-05 11:18:37 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AiVoiceView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -18,13 +18,13 @@ namespace OHOS AiVoiceView::AiVoiceView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceView::AiVoiceView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceView::AiVoiceView"); g_pAiVoiceView = this; } AiVoiceView::~AiVoiceView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceView::~AiVoiceView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceView::~AiVoiceView"); g_pAiVoiceView = nullptr; } @@ -509,7 +509,7 @@ namespace OHOS /*切换到开始对话Ai界面*/ bool AiVoiceView::ChangeAiVoiceStartChatView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoiceStartChatView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoiceStartChatView"); if (AiVoiceScrollView[thisView] == nullptr) { container_->Add(AiVoiceScrollView[thisView]); @@ -521,7 +521,7 @@ namespace OHOS /*切换到APP蓝牙或4G网络未连接界面界面*/ bool AiVoiceView::ChangeAiVoiceBluetoothFailedStartView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoiceBluetoothFailedStartView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoiceBluetoothFailedStartView"); if (AiVoiceScrollView[thisView] == nullptr) { p_AiVoiceBluetoothFailedStartView = new AiVoiceBluetoothFailedStartView(); @@ -546,7 +546,7 @@ namespace OHOS /*切换到模型连接失败界面*/ bool AiVoiceView::ChangeAiVoiceMobileDataFailedStartView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoiceMobileDataFailedStartView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoiceMobileDataFailedStartView"); if (AiVoiceScrollView[thisView] == nullptr) { p_AivoiceMobileDataFailedStartView = new AivoiceMobileDataFailedStartView(); @@ -571,7 +571,7 @@ namespace OHOS /*切换到连接超时界面*/ bool AiVoiceView::ChangeAiVoicConnectTimeoutView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicConnectTimeoutView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicConnectTimeoutView"); if (AiVoiceScrollView[thisView] == nullptr) { p_AivoiceConnectTimeoutView = new AivoiceConnectTimeoutView(); @@ -597,7 +597,7 @@ namespace OHOS /*切换到聆听中界面*/ bool AiVoiceView::ChangeAiVoicListeningView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicListeningView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicListeningView"); if (AiVoiceScrollView[thisView] == nullptr) { p_AivoiceListeningView = new AivoiceListeningView(); @@ -628,7 +628,7 @@ namespace OHOS /*切换到思考中界面*/ bool AiVoiceView::ChangeAiVoicThinkingView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicThinkingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicThinkingView"); if (AiVoiceScrollView[thisView] == nullptr) { p_AivoiceThinkingView = new AivoiceThinkingView(); @@ -653,7 +653,7 @@ namespace OHOS /*切换到返回结果文本界面*/ bool AiVoiceView::ChangeAiVoicReturnResultTextView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicReturnResultTextView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicReturnResultTextView"); if (AiVoiceScrollView[thisView] == nullptr) { p_AivoiceReturnResultTextView = new AivoiceReturnResultTextView(); @@ -678,7 +678,7 @@ namespace OHOS /*切换到setapikeys界面*/ bool AiVoiceView::ChangeAiVoicSetApiKeysView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicSetApiKeysView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicSetApiKeysView"); if (AiVoiceScrollView[thisView] == nullptr) { p_SetApiKeysView = new SetApiKeysView(); @@ -703,7 +703,7 @@ namespace OHOS /*切换到notsetapikeys界面*/ bool AiVoiceView::ChangeAiVoicNotSetApiKeysView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicNotSetApiKeysView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicNotSetApiKeysView"); if (AiVoiceScrollView[thisView] == nullptr) { p_NotSetApiKeysView = new NotSetApiKeysView(); @@ -728,7 +728,7 @@ namespace OHOS /*切换到apikeys删除界面*/ bool AiVoiceView::ChangeAiVoicApiKeysDeleteView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicApiKeysDeleteView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicApiKeysDeleteView"); if (AiVoiceScrollView[thisView] == nullptr) { p_ApiKeysDeleteView = new ApiKeysDeleteView(); @@ -753,7 +753,7 @@ namespace OHOS /*切换到AI正在连接中视图*/ bool AiVoiceView::ChangeAiVoicConnectingView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicConnectingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceView::ChangeAiVoicConnectingView"); if (AiVoiceScrollView[thisView] == nullptr) { p_AiVoiceConnectingView = new AiVoiceConnectingView(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp index 00962b635..b9d1a0abf 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-16 11:37:43 + * @LastEditTime: 2024-11-05 11:09:24 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AivoiceConnectTimeoutView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -19,13 +19,13 @@ namespace OHOS AivoiceConnectTimeoutView::AivoiceConnectTimeoutView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AivoiceConnectTimeoutView::AivoiceConnectTimeoutView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AivoiceConnectTimeoutView::AivoiceConnectTimeoutView"); g_pAivoiceConnectTimeoutView = this; } AivoiceConnectTimeoutView::~AivoiceConnectTimeoutView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AivoiceConnectTimeoutView::~AivoiceConnectTimeoutView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AivoiceConnectTimeoutView::~AivoiceConnectTimeoutView"); ClearAll(); g_pAivoiceConnectTimeoutView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp index e93f99e90..d571e6499 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceListeningView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-05 10:21:11 + * @LastEditTime: 2024-11-05 11:09:40 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AivoiceListeningView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -19,13 +19,13 @@ namespace OHOS AivoiceListeningView::AivoiceListeningView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AivoiceListeningView::AivoiceListeningView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AivoiceListeningView::AivoiceListeningView"); g_pAivoiceListeningView = this; } AivoiceListeningView::~AivoiceListeningView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AivoiceListeningView::~AivoiceListeningView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AivoiceListeningView::~AivoiceListeningView"); ClearAll(); g_pAivoiceListeningView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp index da0d3f158..7e2b0ad04 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceMobileDataFailedStartView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-02 15:44:58 + * @LastEditTime: 2024-11-05 11:10:02 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AivoiceMobileDataFailedStartView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -18,13 +18,13 @@ namespace OHOS AivoiceMobileDataFailedStartView::AivoiceMobileDataFailedStartView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AivoiceMobileDataFailedStartView::AivoiceMobileDataFailedStartView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AivoiceMobileDataFailedStartView::AivoiceMobileDataFailedStartView"); g_pAivoiceMobileDataFailedStartView = this; } AivoiceMobileDataFailedStartView::~AivoiceMobileDataFailedStartView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AivoiceMobileDataFailedStartView::~AivoiceMobileDataFailedStartView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AivoiceMobileDataFailedStartView::~AivoiceMobileDataFailedStartView"); ClearAll(); g_pAivoiceMobileDataFailedStartView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp index 4c1e8d10a..34d88744b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceReturnResultTextView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-23 14:58:03 + * @LastEditTime: 2024-11-05 11:17:57 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AivoiceReturnResultTextView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -52,13 +52,13 @@ namespace OHOS AivoiceReturnResultTextView::AivoiceReturnResultTextView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AivoiceReturnResultTextView::AivoiceReturnResultTextView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AivoiceReturnResultTextView::AivoiceReturnResultTextView"); g_pAivoiceReturnResultTextView = this; } AivoiceReturnResultTextView::~AivoiceReturnResultTextView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AivoiceReturnResultTextView::~AivoiceReturnResultTextView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AivoiceReturnResultTextView::~AivoiceReturnResultTextView"); ClearAll(); g_pAivoiceReturnResultTextView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp index e50d3a0fe..aa68b6542 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceThinkingView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-28 11:12:52 + * @LastEditTime: 2024-11-05 11:18:14 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AivoiceThinkingView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -19,13 +19,13 @@ namespace OHOS AivoiceThinkingView::AivoiceThinkingView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AivoiceThinkingView::AivoiceThinkingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AivoiceThinkingView::AivoiceThinkingView"); g_pAivoiceThinkingView = this; } AivoiceThinkingView::~AivoiceThinkingView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AivoiceThinkingView::~AivoiceThinkingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AivoiceThinkingView::~AivoiceThinkingView"); ClearAll(); g_pAivoiceThinkingView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysDeleteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysDeleteView.cpp index 410d0de7e..27ca80763 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysDeleteView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysDeleteView.cpp @@ -15,12 +15,12 @@ namespace OHOS { ApiKeysDeleteView::ApiKeysDeleteView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ApiKeysDeleteView::ApiKeysDeleteView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ApiKeysDeleteView::ApiKeysDeleteView"); } ApiKeysDeleteView::~ApiKeysDeleteView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ApiKeysDeleteView::~ApiKeysDeleteView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ApiKeysDeleteView::~ApiKeysDeleteView"); ClearAll(); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysPresenter.cpp index 2b3b57b83..cdea2d367 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/ApiKeysPresenter.cpp @@ -104,7 +104,7 @@ namespace OHOS } else if (event.GetDragDirection() == DragEvent::DIRECTION_TOP_TO_BOTTOM) /*下滑*/ { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DIRECTION_TOP_TO_BOTTOM"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DIRECTION_TOP_TO_BOTTOM"); if (viewId == SETAPIKEYS_SCROLLVIEW_VIEWID) { p_AiVoiceView->ChangeView(AIVOICE_SETAPIKEYS, AIVOICE_STARTCHAT_VIEWID); /*API Keys set界面->开始对话界面*/ diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/NotSetApiKeysView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/NotSetApiKeysView.cpp index 72c129c9d..e9c902d11 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/NotSetApiKeysView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/NotSetApiKeysView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-07-29 16:04:23 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-30 18:34:01 + * @LastEditTime: 2024-11-05 11:20:24 * @FilePath: /xts_origin/FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/NotSetApiKeysView.cpp */ @@ -14,12 +14,12 @@ namespace OHOS { NotSetApiKeysView::NotSetApiKeysView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NotSetApiKeysView::NotSetApiKeysView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NotSetApiKeysView::NotSetApiKeysView"); } NotSetApiKeysView::~NotSetApiKeysView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NotSetApiKeysView::~NotSetApiKeysView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NotSetApiKeysView::~NotSetApiKeysView"); ClearAll(); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/SetApiKeysView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/SetApiKeysView.cpp index faaa2db41..5b9fcd772 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/SetApiKeysView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/SetApiKeysView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-07-29 16:04:23 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-30 16:22:06 + * @LastEditTime: 2024-11-05 11:20:35 * @FilePath: /xts_origin/FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/apikeys/SetApiKeysView.cpp */ @@ -14,12 +14,12 @@ namespace OHOS { SetApiKeysView::SetApiKeysView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetApiKeysView::SetApiKeysView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetApiKeysView::SetApiKeysView"); } SetApiKeysView::~SetApiKeysView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetApiKeysView::~SetApiKeysView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetApiKeysView::~SetApiKeysView"); ClearAll(); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp index 491f4761a..5fc0d55d2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp @@ -430,7 +430,7 @@ void AlarmClockModel::DeleteClockModel(uint16_t num) "AlarmClockModel::DeleteAlarmClock = %d, currentAlarm[alarmListener] = %p, id = %u!", status, currentAlarm[num], currentAlarm[num]->alarmClockId); DeleteAlarmId(clockId); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel alarmSerial = %u!", alarmSerial); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::DeleteClockModel alarmSerial = %u!", alarmSerial); for (; num < alarmSerial - 1; num ++) { if (currentAlarm[num + 1] == nullptr || currentAlarm[num + 1]->alarmType == TYPE_INVALID_ALARM_CLOCK) { @@ -679,7 +679,7 @@ void AlarmClockModel::SetAlarmInfo(uint32_t time_hour, uint32_t time_min, uint8_ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::SetAlarmInfo copy alarmname error!"); return; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::NewAlarmTime clock name = %s, id = %u", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::NewAlarmTime clock name = %s, id = %u", currentAlarm[alarmListener]->alarmClockName, currentAlarm[alarmListener]->alarmClockId); if (setListener == NEW_TIME_LISTENER) { //表示新建闹钟 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::SetAlarmWeek new time!"); @@ -935,8 +935,8 @@ int AlarmClockModel::AlarmPlayerInit_BY_fir_name(char *str) { // 本地播放文件路径和状态 sliceId = str; // 播放音乐的文件名 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayerInit start!"); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayerInit, url:%s ", sliceId); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayerInit start!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayerInit, url:%s ", sliceId); std::string strName = sliceId; uri =strName; // 创建 AM @@ -951,7 +951,7 @@ int AlarmClockModel::AlarmPlayerInit_BY_fir_name(char *str) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerCallback new fail"); return OHOS_FAILURE; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayerInit end!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayerInit end!"); return OHOS_SUCCESS; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmJudgeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmJudgeView.cpp index 82d725b92..17a5ad477 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmJudgeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmJudgeView.cpp @@ -65,7 +65,7 @@ void AlarmJudgeView::DeinitDeleteScreen() UIScrollView * AlarmJudgeView::InitDeleteScreen() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__); if(nullptr == DeleteGroup_) { DeleteGroup_ = new UIScrollView(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp index 983e796f4..e00410e6c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmNewTimeView.cpp @@ -47,7 +47,7 @@ namespace OHOS AlarmNewTimeView::AlarmNewTimeView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::AlarmNewTimeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::AlarmNewTimeView"); g_pAlarmNewTimeView = this; } @@ -75,7 +75,7 @@ namespace OHOS group = nullptr; } g_pAlarmNewTimeView = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::~AlarmNewTimeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::~AlarmNewTimeView"); } AlarmNewTimeView *AlarmNewTimeView::GetInstance(void) @@ -135,7 +135,7 @@ namespace OHOS UIScrollView *AlarmNewTimeView::InitNewTimeView(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::InitNewTimeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::InitNewTimeView"); if (group == nullptr) { group = new UIScrollView(); @@ -186,7 +186,7 @@ namespace OHOS void AlarmNewTimeView::RefreshNewTime(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::RefreshNewTime"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmNewTimeView::RefreshNewTime"); struct tm local_time; time_t seconds = time(nullptr); if (localtime_r(&seconds, &local_time) == nullptr) diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp index bc3397dab..e964ac2ba 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp @@ -73,7 +73,7 @@ void AlarmPresenter::OnResume(void) {} void AlarmPresenter::OnStop(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter OnStop"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter OnStop"); } AlarmPresenter *AlarmPresenter::GetInstance() @@ -186,7 +186,7 @@ void AlarmPresenter::ClickJudgeTrue(uint16_t num) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::ClickJudgeTrue new MainAlarmView::GetInstance() error"); return; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "clockQty = %d", clockQty); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "clockQty = %d", clockQty); clockQty--; AlarmClockModel::GetInstance()->SetSerialRdc(); MainAlarmView::GetInstance()->RefreshAlarm(); @@ -299,7 +299,7 @@ void AlarmPresenter::ClickAlarmWeekOk(uint16_t num) WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickAlarmWeekOk new time!"); alarmListener = clockQty; clockQty++; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "******************ClickAlarmWeekOk alarmListener = %d***************", alarmListener); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "******************ClickAlarmWeekOk alarmListener = %d***************", alarmListener); AlarmClockModel::GetInstance()->SetSerialAdd(); AlarmClockModel::GetInstance()->SetAlarmInfo(timeHour, timeMin, clockWeek, alarmListener, setListener); if (!(AlarmClockModel::GetInstance()->GetClockTime(alarmListener, &clockTime))) { @@ -326,7 +326,7 @@ void AlarmPresenter::ClickAlarmNewTime(uint16_t num) return; } clockQty = AlarmClockModel::GetInstance()->GetAlarmNum(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter alarmNumbel = %u", clockQty); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter alarmNumbel = %u", clockQty); UNUSED(num); if (clockQty >= ALARM_MAX_NUM) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter new alarm max"); @@ -435,7 +435,7 @@ bool AlarmPresenter::ClickFuncId(const char *buttonName) bool AlarmPresenter::ClickFuncView(UIView &view) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ClickFuncView view = %s", view.GetViewId()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClickFuncView view = %s", view.GetViewId()); for (int num = 0; num < WEEK_BUTTON_MAX_NUM; num++) { if (strcmp(view.GetViewId(), WEEK_BUTTON_VIEWID[num]) == 0) { alarmWeek[num] = alarmWeek[num] ? CANCEL_DATA: SELECT_DATA; @@ -540,7 +540,7 @@ void AlarmPresenter::OnSwipe(UISwipeView &view) { UNUSED(view); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnSwipe "); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnSwipe "); view.SetIntercept((0 == view.GetCurrentPage()) ? false : true); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp index 6d19f2a2a..bfbb8abb3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp @@ -38,7 +38,7 @@ constexpr int16_t WEEK_SUN = 0; AlarmSetWeekView::AlarmSetWeekView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::AlarmSetWeekView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::AlarmSetWeekView"); g_pAlarmSetWeekView = this; } @@ -68,7 +68,7 @@ AlarmSetWeekView::~AlarmSetWeekView() group = nullptr; } g_pAlarmSetWeekView = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::~AlarmSetWeekView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::~AlarmSetWeekView"); } AlarmSetWeekView *AlarmSetWeekView::GetInstance(void) @@ -267,7 +267,7 @@ UIScrollView *AlarmSetWeekView::InitSetWeekView() //该函数用于设置AlarmSetWeekView中周一到周日按钮的背景颜色 void AlarmSetWeekView::RefreshSetWeek1(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::RefreshStep1"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::RefreshStep1"); if (buttonWeek[WEEK_MON] == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView::RefreshStep1 buttonMon nullptr error!"); return; @@ -321,7 +321,7 @@ void AlarmSetWeekView::RefreshSetWeek2(uint8_t week) return; } } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: week = %u", week); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmSetWeekView:: week = %u", week); if ((week & 0x01) == 1) { // 判断星期天的位数是否为1 // buttonWeek[WEEK_SUN]->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); buttonWeek[WEEK_SUN]->SetStyle(STYLE_BACKGROUND_COLOR, Color::GetColorFromRGB(0x6c, 0xB8, 0xFD).full); buttonWeek[WEEK_SUN]->SetStyle(STYLE_BACKGROUND_COLOR, SELECTED_BG_COLOR.full); diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp index 76382d370..81dc01ecb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp @@ -385,7 +385,7 @@ void MainAlarmView::NewClockCtl(int16_t alarmNum) void MainAlarmView::LabelGetWeek(uint8_t week, int16_t alarmNum) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView::week = %u!", week); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::week = %u!", week); std::string weekStr; std::string weekStr_en; if ((week & 0x7f) == 0x7f) { // 判断0~6位是否都为1，如若都为1，则一周7天闹钟都响应 @@ -456,7 +456,7 @@ void MainAlarmView::RefreshAlarmStatus(uint8_t alarmEnable, int16_t num) void MainAlarmView::OnStart() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView::OnStart"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::OnStart"); View::OnStart(); BaseView::RootView(Color::Black().full); // 增加按键监听 @@ -486,7 +486,7 @@ void MainAlarmView::OnStart() void MainAlarmView::OnSetUpView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView::OnSetUpView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::OnSetUpView"); View::OnSetUpView(); AlarmTitleCreate(); @@ -561,7 +561,7 @@ void MainAlarmView::RefreshAlarm(void) RefreshAlarmStatus(alarmEnable, i); dClock[i]->SetTime24Hour(refreshHour, refreshMin, 0); } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]: dClockNum = %d", __LINE__, dClockNum); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]: dClockNum = %d", __LINE__, dClockNum); // group->ScrollBy(0, ADD_BUTTON_Y - addButton->GetY()); if (dClockNum > (i - 1)) { @@ -607,7 +607,7 @@ void MainAlarmView::RefreshAlarm(void) } dClockNum = i - 1; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]: dClockNum=%d", __LINE__, dClockNum); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]: dClockNum=%d", __LINE__, dClockNum); AlarmAddButtonUpdate(i); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarmclockmanage/src/AlarmClockManage.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarmclockmanage/src/AlarmClockManage.cpp index ce5948f36..614698a55 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarmclockmanage/src/AlarmClockManage.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclockmanage/src/AlarmClockManage.cpp @@ -378,7 +378,7 @@ static int32 SetFirstAlarmToday(FirstAlarmTodaySetType type) std::list< AlarmClockInfoToday>::iterator node; std::list< AlarmClockInfoToday>::iterator tempNode; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetFirstAlarmToday !!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetFirstAlarmToday !!"); if (AlarmGetCurrentTimeInfo(&curTime) != 0) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetFirstAlarmToday AlarmGetCurrentTimeInfo failed!!"); return STATUS_TIME_FUN_ERROR; @@ -400,8 +400,8 @@ static int32 SetFirstAlarmToday(FirstAlarmTodaySetType type) continue; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "alarmTime : %lx!!", node->alarmTime); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "curTime: hour %ld, min %ld!!", curTime.tm_hour, curTime.tm_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "alarmTime : %lx!!", node->alarmTime); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "curTime: hour %ld, min %ld!!", curTime.tm_hour, curTime.tm_min); if (((node->alarmTime >> TWO_BYTES_BITS == (uint32)curTime.tm_hour) && ((node->alarmTime & AND_FOR_LOW_TWO_BYTES) > (uint32)curTime.tm_min)) || 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 bc995c298..64ee7801b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp @@ -106,7 +106,7 @@ extern "C" wake_time_min = wake_up_time & 0x0000FFFF; clean_sleep_monitoring_flag(); // 解析结束时间 - 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); + WEARABLE_LOGD(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) @@ -125,7 +125,7 @@ extern "C" sedentary_start_min = (sedentary_time & 0X0000FF00) >> 8; sedentary_start_hour = sedentary_time & 0X000000FF; clean_sedentary_flag(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "set_sedentary_data:%d:%d~%d:%d", sedentary_start_hour, sedentary_start_min, sedentary_stop_hour, sedentary_stop_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "set_sedentary_data:%d:%d~%d:%d", sedentary_start_hour, sedentary_start_min, sedentary_stop_hour, sedentary_stop_min); } void set_drinkreminder_data(void) @@ -142,16 +142,16 @@ extern "C" // 解析开始时间 drinkreminder_start_hour = (drinkreminder_start_time & 0XFFFF0000) >> 16; // 前16位是小时 drinkreminder_start_min = drinkreminder_start_time & 0X0000FFFF; // 后16位是分钟 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d:%d", drinkreminder_start_hour, drinkreminder_start_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%d:%d", drinkreminder_start_hour, drinkreminder_start_min); // 解析结束时间 drinkreminder_end_hour = (drinkreminder_end_time & 0XFFFF0000) >> 16; // 前16位是小时 drinkreminder_end_min = drinkreminder_end_time & 0x0000FFFF; // 后16位是分钟 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d:%d", drinkreminder_end_hour, drinkreminder_end_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%d:%d", drinkreminder_end_hour, drinkreminder_end_min); if (drinkreminder_switch == 2) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d:%d~%d:%d", drinkreminder_start_hour, drinkreminder_start_min, drinkreminder_end_hour, drinkreminder_end_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%d:%d~%d:%d", drinkreminder_start_hour, drinkreminder_start_min, drinkreminder_end_hour, drinkreminder_end_min); } } @@ -195,7 +195,7 @@ extern "C" { int goal_hour = (sleep_time & 0XFFFF0000) >> 16; int goal_min = (sleep_time & 0X0000FFFF); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "goal_hour:%d goal_min:%d", goal_hour, goal_min); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "goal_hour:%d goal_min:%d", goal_hour, goal_min); sleep_notify_time_min = (goal_min >= SLEPPNOTIFY) ? goal_min - SLEPPNOTIFY : ((goal_min + 60) - SLEPPNOTIFY); // 避免分钟数为负 sleep_notify_time_hour = goal_hour; @@ -207,7 +207,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_notify_time_hour:%d sleep_notify_time_min:%d sleep_notify_time:%d", sleep_notify_time_hour, sleep_notify_time_min, sleep_notify_time); + WEARABLE_LOGD(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) { @@ -338,7 +338,7 @@ extern "C" static void on_time_CallBackProc(void) { AlarmClockEventData unuse; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "on_time_CallBackProc invoked"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "on_time_CallBackProc invoked"); AlarmTimerEventPublish(TOPIC_EVENT_ON_TIME, unuse); // GraphicService::GetInstance()->PostGraphicEvent( // std::bind(AlarmTimerEventPublish, TOPIC_EVENT_ON_TIME, unuse)); @@ -482,7 +482,7 @@ extern "C" if ((curTime->tm_hour == sleep_notify_time_hour) && (curTime->tm_min == sleep_notify_time_min) && (curTime->tm_sec == 0)) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "It's bedtime in 20 minutes"); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "20分钟后要睡觉啦!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "20分钟后要睡觉啦!"); // 设置状态为睡眠提醒 OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEEPNOTIFY); AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, NULL, 0); @@ -493,7 +493,7 @@ extern "C" { if (curTime->tm_hour == wake_time_hour && curTime->tm_min == wake_time_min && curTime->tm_sec == 0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "闹铃!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "闹铃!"); //退出睡眠模式 OHOS::SleepModeModel::GetInstance().SetSleepModeDisabled(); OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE); @@ -523,7 +523,7 @@ extern "C" do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, &cmd); // 强制获取小睡数据，结束小睡 // 睡眠弹窗 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "要睡觉啦!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "要睡觉啦!"); // 设置状态为睡眠 OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEPP); @@ -531,9 +531,9 @@ extern "C" { //进入睡眠模式 OHOS::SleepModeModel::GetInstance().SetSleepModeEnabled(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "要睡觉啦!!!! 开始"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "要睡觉啦!!!! 开始"); AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, NULL, 0); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "要睡觉啦!!!! 结束"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "要睡觉啦!!!! 结束"); } do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE, NULL); // 算法底层切换睡眠监测模式 @@ -548,7 +548,7 @@ extern "C" if (curTime->tm_hour == drinkreminder_start_hour && curTime->tm_min == drinkreminder_start_min && curTime->tm_sec == 0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "该喝水了!!该喝水了!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "该喝水了!!该喝水了!!"); AlarmEventPublish(TOPIC_EVENT_DRINKREMINDER, NULL, 0); } } else if (drinkreminder_switch == 2) { // 间隔提醒 @@ -564,7 +564,7 @@ extern "C" drinkremind_expectedTime = current_seconds + interval_time_seconds; drinkremind_expectedTime %= hour_24_seconds; // 同时处理24小时循环 } else if (current_seconds == drinkremind_expectedTime && curTime->tm_sec == 0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "该喝水了!!该喝水了!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "该喝水了!!该喝水了!!"); drinkremind_expectedTime += interval_time_seconds; drinkremind_expectedTime %= hour_24_seconds; // 处理24小时循环 AlarmEventPublish(TOPIC_EVENT_DRINKREMINDER, NULL, 0); @@ -584,7 +584,7 @@ extern "C" if (heartRateDetectionInterval) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Heart rate detection cycle detection is enabled %d",curTime->tm_min % heartRateDetectionInterval); if (curTime->tm_min % heartRateDetectionInterval == 0 && curTime->tm_sec == 0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Automatic heart rate detection starts"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Automatic heart rate detection starts"); // 开启心率检测 OHOS::HeartModel::GetInstance()->Heart_Control(OHOS::HeartState::Start, OHOS::HeartCheck::PASSIVITY); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp index 9269219d4..0dfdc318f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp @@ -162,7 +162,7 @@ namespace OHOS viewId = itemView->GetViewId(); uid = (char *)itemView->GetAppUid(); } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ApplistPresenter::OnClick viewid = %d type = %d", viewId, type); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ApplistPresenter::OnClick viewid = %d type = %d", viewId, type); if (viewId < VIEW_MAX_INTER_APP) { /*心率Slice需要增加特殊配置*/ diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp index 1a97b71b4..da67e40e5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp @@ -258,7 +258,7 @@ static bool TransformItemBaseOnPosition(UITransformList* list, UIView* item) void ApplistView::ArcScaleListStyleOnStart(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ApplistView::ArcScaleListStyleOnStart [%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ApplistView::ArcScaleListStyleOnStart [%d]", __LINE__); if(nullptr == ArcScaleListGroup_) { ArcScaleListGroup_ = new UIViewGroup(); @@ -322,7 +322,7 @@ void ApplistView::ArcScaleListStyleOnStart(void) void ApplistView::OnSetUpView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ApplistView::OnSetUpView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ApplistView::OnSetUpView"); View::OnSetUpView(); AppListStyle style = presenter_->GetCurrentStyle(); if (style == AppListStyle::FOOTBALL_STYLE) { @@ -411,7 +411,8 @@ void ApplistView::ArcScaleListStyleOnSetUpView(void) headY = presenter_->GetArcListHeadItemY(); } if (headY == 0) { - headY = VERTICAL_RESOLUTION / NUM_2; + // headY = VERTICAL_RESOLUTION / NUM_2; + headY = -42; } } WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d],startIndex = %d,headY = %d", __LINE__,startIndex,headY); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothCaseListAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothCaseListAdapter.cpp index 51a126bbc..545186e66 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothCaseListAdapter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothCaseListAdapter.cpp @@ -90,12 +90,12 @@ public: // 判断是否正在连接 bd_addr_t *lastAddr = BluetoothModel::GetInstance()->GetLastConnedAddr(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Disconnect LastDevice retVal = %02X %02X %02X * * *", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Disconnect LastDevice retVal = %02X %02X %02X * * *", lastAddr->addr[0],lastAddr->addr[1],lastAddr->addr[2]); bool ret = bt_is_acl_connected(lastAddr); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Disconnect LastDevice retVal = ret %d %02X %02X %02X * * *", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Disconnect LastDevice retVal = ret %d %02X %02X %02X * * *", ret, lastAddr->addr[0],lastAddr->addr[1],lastAddr->addr[2]); @@ -103,14 +103,14 @@ public: && lastAddr->addr[3] == 0 && lastAddr->addr[4] == 0 && lastAddr->addr[5] == 0 ) && ret) { BluetoothModel::GetInstance()->SetTagConnectNew(true); errcode_t retVal = gap_disconnect_remote_device(lastAddr); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Disconnect LastDevice retVal = %d %02X %02X %02X * * *", retVal, + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Disconnect LastDevice retVal = %d %02X %02X %02X * * *", retVal, lastAddr->addr[0],lastAddr->addr[1],lastAddr->addr[2]); } else { mainBluetoothView->ChangeView(BluetoothModel::GetInstance()->GetCurView(), BLUETOOTHRECONNECTVIEW); errcode_t retVal = BluetoothModel::GetInstance()->ConnectRemoteDevice(&addr); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ConnectRemoteDevice ret = %d", retVal); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ConnectRemoteDevice ret = %d", retVal); } // 跳转可选页 return true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceCaseListAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceCaseListAdapter.cpp index c6346f7f3..ed75a08c8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceCaseListAdapter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceCaseListAdapter.cpp @@ -53,7 +53,7 @@ public: { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BluetoothDeviceOnClickListListener"); UNUSED(event); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BluetoothDeviceOnClickListListener addr: %02x%02x%02x%02x%02x%02x", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BluetoothDeviceOnClickListListener addr: %02x%02x%02x%02x%02x%02x", bluetoothInfo_.addr[5], bluetoothInfo_.addr[4], bluetoothInfo_.addr[3], /* mac下标 0 1 2 3 4 5 */ bluetoothInfo_.addr[2], bluetoothInfo_.addr[1], bluetoothInfo_.addr[0]); /* mac下标 0 1 2 3 4 5 */ BluetoothModel::GetInstance()->SetTempMacValue(&bluetoothInfo_); @@ -75,9 +75,9 @@ public: } if(view.GetViewType() == UIViewType::UI_BUTTON) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UIViewType::UI_BUTTON,%s",reinterpret_cast(bluetoothInfo_.deviceName)); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UIViewType::UI_BUTTON,%s",reinterpret_cast(bluetoothInfo_.deviceName)); bd_addr_t *lastAddr = BluetoothModel::GetInstance()->GetLastConnedAddr(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "lastAddr:%02X %02X %02X * * *", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "lastAddr:%02X %02X %02X * * *", lastAddr->addr[0],lastAddr->addr[1],lastAddr->addr[2]); bool ret = bt_is_acl_connected(lastAddr); @@ -89,16 +89,16 @@ public: lastAddr->addr[3] == 0 && lastAddr->addr[4] == 0 && lastAddr->addr[5] == 0 ) && ret) { BluetoothModel::GetInstance()->SetTagConnectNew(false); errcode_t retVal = gap_disconnect_remote_device(lastAddr); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[gap_disconnect_remote_device] retVal = %d", retVal); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[gap_disconnect_remote_device] retVal = %d", retVal); } else { mainBluetoothView->ChangeView(BluetoothModel::GetInstance()->GetCurView(), BLUETOOTHRECONNECTVIEW); errcode_t retVal = BluetoothModel::GetInstance()->ConnectRemoteDevice(&addr); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[ConnectRemoteDevice] retVal = %d", retVal); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[ConnectRemoteDevice] retVal = %d", retVal); } } else if(view.GetViewType() == UIViewType::UI_IMAGE_VIEW) /*点击的是图片*/ { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UIViewType::UI_IMAGE_VIEW"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UIViewType::UI_IMAGE_VIEW"); mainBluetoothView->ChangeView(BluetoothModel::GetInstance()->GetCurView(), BLUETOOTHEOPTIONSVIEW); BluetoothOptionsView *bluetoothOptionsView = BluetoothOptionsView::GetInstance(); if (bluetoothOptionsView == nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp index 4a5bcec06..594b51773 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp @@ -168,7 +168,7 @@ namespace OHOS ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); /* -------------------------------------------------------------------------- */ bool results = gap_br_cancel_discovery(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CancelBtDiscovery results %d", results); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CancelBtDiscovery results %d", results); } // 结束扫描处理 diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp index 1fe4c21c1..bc1379a4b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp @@ -478,7 +478,7 @@ static void BtAvrcpCtNotificationCallback( return; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ct notification cbk event_id:0x%x\n", event_id); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ct notification cbk event_id:0x%x\n", event_id); bool notify_flag = true; switch (event_id) { case AVRCP_NOTIFY_EVENT_PLAYBACK_STATUS_CHANGED: //播放状态变更事件,从播放变为暂停、停止等状态，会触发这个事件 diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothItemView.cpp index 26ed8385d..b0bddd3f2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothItemView.cpp @@ -100,7 +100,7 @@ namespace OHOS SetTouchable(true); } } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "index = %d", GetViewIndex()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "index = %d", GetViewIndex()); if(!isCaseList) { //已连接的耳机界面 diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp index 2dfbc8e49..372226898 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp @@ -330,7 +330,7 @@ void BluetoothModel::AddCase(BluetoothCaseInfo caseInfo) return; } else { btScansDevicesList_.push_back(caseInfo); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "btScansDevicesList_ num = %d",btScansDevicesList_.size()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "btScansDevicesList_ num = %d",btScansDevicesList_.size()); if(BluetoothEarListView::GetInstance()) //动态计算扫描出来的设备列表ui高度 GraphicService::GetInstance()->PostGraphicEvent( std::bind(&BluetoothEarListView::RefreshBluetoothEarListView, BluetoothEarListView::GetInstance())); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothReconnectView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothReconnectView.cpp index 1b977f424..df336f54c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothReconnectView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothReconnectView.cpp @@ -247,7 +247,7 @@ static void ConnectTimerCallbackProc(int data) return; } BluetoothCaseInfo *bluetoothInfo_= BluetoothModel::GetInstance()->GetTempMacValue(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "device name = %s",bluetoothInfo_->deviceName); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "device name = %s",bluetoothInfo_->deviceName); bd_addr_t addr; (void)memcpy_s(addr.addr, BD_ADDR_LEN, bluetoothInfo_->addr, BD_ADDR_LEN); tipsConnFailMessageView->RefreshNameLabel(addr); diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp index bbaff85f7..3c7face64 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp @@ -16,13 +16,13 @@ namespace OHOS BluetoothServiceOptionsView::BluetoothServiceOptionsView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BluetoothServiceOptionsView::BluetoothServiceOptionsView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BluetoothServiceOptionsView::BluetoothServiceOptionsView"); g_pBluetoothServiceOptionsView = this; } BluetoothServiceOptionsView::~BluetoothServiceOptionsView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "~BluetoothServiceOptionsView::BluetoothServiceOptionsView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "~BluetoothServiceOptionsView::BluetoothServiceOptionsView"); ClearAll(); g_pBluetoothServiceOptionsView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp index 6d0cbaf55..5f294e0bf 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-25 11:50:57 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-07-23 10:18:06 + * @LastEditTime: 2024-11-05 11:47:17 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp */ #include "classicbluetooth/include/ClassicBlueToothPresenter.h" @@ -120,7 +120,7 @@ namespace OHOS switch (state) { case UICheckBox::SELECTED: - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BlueTooth Capability Is Enabled"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BlueTooth Capability Is Enabled"); start_custom_ble_service(); // 主动开启蓝牙 //开启完增加回连 @@ -154,7 +154,7 @@ namespace OHOS ConfigModel::GetInstance()->SetClassicBlueToothState(true); break; case UICheckBox::UNSELECTED: - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BlueTooth Capability Is Disabled"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BlueTooth Capability Is Disabled"); stop_custom_ble_service(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp index 21b0ed6cb..77a5e4082 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp @@ -9,13 +9,13 @@ namespace OHOS ClassicBlueToothView::ClassicBlueToothView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ClassicBlueToothView::ClassicBlueToothView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ClassicBlueToothView::ClassicBlueToothView"); g_pClassicBlueToothView = this; } ClassicBlueToothView::~ClassicBlueToothView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "~ClassicBlueToothView::ClassicBlueToothView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "~ClassicBlueToothView::ClassicBlueToothView"); g_pClassicBlueToothView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp index 8e0174a51..4ecea4634 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-12 11:44:23 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-27 10:48:45 + * @LastEditTime: 2024-11-05 11:48:01 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp */ #include "compass/include/CompassControlView.h" @@ -87,7 +87,7 @@ void CompassControlView::SetCalibrationView(bool flag) void CompassControlView::PreLoad(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CompassControlView::PreLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CompassControlView::PreLoad"); if (!viewiInitStatus) { InitView(); viewiInitStatus = true; @@ -100,7 +100,7 @@ void CompassControlView::PreLoad(void) void CompassControlView::UnLoad(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CompassControlView::UnLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CompassControlView::UnLoad"); if( compassView != nullptr) { compassView->UnLoadCompassImageRes(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassView.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassView.cpp index 1eeeb5634..1a8334d71 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassView.cpp @@ -119,7 +119,7 @@ void CompassView::SetResLoadStatus(bool state) /*预加载指南针图片资源*/ void CompassView::PreLoadCompassImageRes(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CompassView::PreLoadCompassImageRes"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CompassView::PreLoadCompassImageRes"); if(!GetResLoadStatus()){ if (LoadCompassImage(backGround, COMPASS_COMPASS0) == false) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], triangulation load fail", __LINE__); @@ -139,7 +139,7 @@ void CompassView::PreLoadCompassImageRes(void) /*卸载指南针图片资源*/ void CompassView::UnLoadCompassImageRes(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CompassView::UnLoadCompassImageRes"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CompassView::UnLoadCompassImageRes"); if(GetResLoadStatus()) { ImageInfo* image = nullptr; diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp index d711f3620..c0832fc16 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-07 18:15:53 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-25 17:47:51 + * @LastEditTime: 2024-11-05 11:49:33 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/countdown/src/CountDownModel.cpp */ #include "countdown/include/CountDownModel.h" @@ -49,7 +49,7 @@ namespace OHOS { // 解析成功，现在转换为总秒数 g_CountDownTimes = hours * NUM_TIME_HOUR + minutes * NUM_TIME_MIN + seconds; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "g_CountDownTimes = %d", g_CountDownTimes); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_CountDownTimes = %d", g_CountDownTimes); } else { @@ -121,7 +121,7 @@ namespace OHOS */ int CountDownModel::CountDownRingPlayerInit(const char *RingMusicName) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownModel::CountDownRingPlayerInit"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CountDownModel::CountDownRingPlayerInit"); /* ------------------------------- 1.播放文件路径设置 ------------------------------- */ uri = RingMusicName; /* -------------------------------- 2.播放器对象创建 ------------------------------- */ @@ -153,7 +153,7 @@ namespace OHOS */ int CountDownModel::InitializeAndPlayRingtone(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownModel::InitializeAndPlayRingtone"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CountDownModel::InitializeAndPlayRingtone"); /* -------------------------------- 1.检查播放器实例 ------------------------------- */ int32_t ret; int32_t state; @@ -172,7 +172,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[CountDownModel] source.get() == fail"); return OHOS_FAILURE; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[CountDownModel] Player url:%s", uri.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CountDownModel] Player url:%s", uri.c_str()); playerCtr->SetSource(*source); /* --------------------------------- 4.配置播放器 -------------------------------- */ playerCtr->SetAudioStreamType(AUDIO_STREAM_NOTIFICATION_SYSTEM); // 设置播放器的音频流类型 @@ -213,7 +213,7 @@ namespace OHOS */ int CountDownModel::StartRingtonePlayback(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownModel::StartRingtonePlayback"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CountDownModel::StartRingtonePlayback"); if (CountDownRingPlayerInit(RingMusicPath) != OHOS_SUCCESS) { // 错误处理，例如记录日志或者返回错误状态码 @@ -277,7 +277,7 @@ namespace OHOS int CountDownModel::ResetRingtonePlayback(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CountDownModel::ResetRingtonePlayback"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CountDownModel::ResetRingtonePlayback"); int32_t ret = 0; int32_t state = 0; if (playerCtr.get() == nullptr) @@ -600,21 +600,21 @@ namespace OHOS /*开始计时器铃声播放*/ void CountDownRingPlayerListener::StartCountDownRing(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[CountDownRingPlayerListener::StartCountDownRing] start"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CountDownRingPlayerListener::StartCountDownRing] start"); GraphicService::GetInstance()->PostGraphicEvent(Start); } /*停止计时器铃声播放*/ void CountDownRingPlayerListener::StopCountDownRing(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[CountDownRingPlayerListener::StopCountDownRing] start"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CountDownRingPlayerListener::StopCountDownRing] start"); GraphicService::GetInstance()->PostGraphicEvent(Stop); } /*响应外部的音频中断事件*/ void CountDownRingPlayerListener::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; @@ -636,7 +636,7 @@ namespace OHOS /* --------------------- CountDownRingPlayerCallbackImpl -------------------- */ void CountDownRingPlayerCallbackImpl::OnPlaybackComplete(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnPlaybackComplete"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnPlaybackComplete"); // CountDownModel::GetInstance()->RequestStopRingtone(); // CountDownModel::GetInstance()->RequestStartRingtone(); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp index da464782c..26c6c0578 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/MainCountDownPresenter.cpp @@ -135,22 +135,22 @@ namespace OHOS /*四个快速开始倒计时按钮*/ if (strcmp(view.GetViewId(), COUNTDOWN_ONE_MINUTE_BUTTON_VIEWID) == 0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_ONE_MINUTE_BUTTON_VIEWID"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_ONE_MINUTE_BUTTON_VIEWID"); return SetCountDownAndChangeView(p_MainCountDownView, OneMinuteTime); } else if (strcmp(view.GetViewId(), COUNTDOWN_FIVE_MINUTE_BUTTON_VIEWID) == 0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_FIVE_MINUTE_BUTTON_VIEWID"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_FIVE_MINUTE_BUTTON_VIEWID"); return SetCountDownAndChangeView(p_MainCountDownView, FiveMinuteTime); } else if (strcmp(view.GetViewId(), COUNTDOWN_TEN_MINUTE_BUTTON_VIEWID) == 0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_TEN_MINUTE_BUTTON_VIEWID"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_TEN_MINUTE_BUTTON_VIEWID"); return SetCountDownAndChangeView(p_MainCountDownView, TenMinuteTime); } else if (strcmp(view.GetViewId(), COUNTDOWN_THIRTY_MINUTE_BUTTON_VIEWID) == 0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_THIRTY_MINUTE_BUTTON_VIEWID"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "COUNTDOWN_THIRTY_MINUTE_BUTTON_VIEWID"); return SetCountDownAndChangeView(p_MainCountDownView, ThirtyMinuteTime); } @@ -291,7 +291,7 @@ namespace OHOS void MainCountDownPresenter::OnTimePickerStoped(UITimePicker &picker) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "picker.GetSelectValue = %s", picker.GetSelectValue()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "picker.GetSelectValue = %s", picker.GetSelectValue()); CountDownModel::GetInstance()->SetCountDownTime(picker.GetSelectValue()); // 设置倒计时时间 CountDownModel::GetInstance()->SetRingTime(picker.GetSelectValue()); // 设置响铃时间 } diff --git a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp index 7a04500ef..3eb3f4fda 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/countdown/src/StartCountDownView.cpp @@ -13,13 +13,13 @@ namespace OHOS StartCountDownView::StartCountDownView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StartCountDownView::StartCountDownView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StartCountDownView::StartCountDownView"); g_pStartCountDownView = this; } StartCountDownView::~StartCountDownView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StartCountDownView::~StartCountDownView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StartCountDownView::~StartCountDownView"); ClearAll(); g_pStartCountDownView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp index 1ae94dd3b..da7923cd4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp @@ -267,7 +267,7 @@ namespace OHOS /// @param value 滑块的当前值。 void BrightnessSliderEventListener::OnChange(int32_t value) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnChange %d", value); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnChange %d", value); ChangeBrightness(BRIGHTNESSDRAG, value); ConfigModel::GetInstance()->SetBrightness(value); } @@ -276,7 +276,7 @@ namespace OHOS /// @param value 滑块的当前值。 void BrightnessSliderEventListener::OnRelease(int32_t value) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnRelease %d", value); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnRelease %d", value); ChangeBrightness(BRIGHTNESSDRAG, value); ConfigModel::GetInstance()->SetBrightness(value); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp index 3323422a5..431e6eb00 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp @@ -13,13 +13,13 @@ namespace OHOS DisplayBrightnessView::DisplayBrightnessView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::DisplayBrightnessView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::DisplayBrightnessView"); g_pDisplayBrightnessView = this; } DisplayBrightnessView::~DisplayBrightnessView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::~DisplayBrightnessView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::~DisplayBrightnessView"); g_pDisplayBrightnessView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp index 546b2ceba..fb72545ea 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp @@ -11,13 +11,13 @@ namespace OHOS ScreenDurationView::ScreenDurationView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::ScreenDurationView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::ScreenDurationView"); g_pScreenDurationView = this; } ScreenDurationView::~ScreenDurationView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::~ScreenDurationView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::~ScreenDurationView"); ClearAll(); g_pScreenDurationView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbView.cpp b/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbView.cpp index 3c792bbe5..06ce7c741 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-10 11:58:21 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-29 21:19:46 + * @LastEditTime: 2024-11-05 11:54:11 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbView.cpp */ #include "dnotdisturb/include/DnotDisturbView.h" @@ -21,13 +21,13 @@ namespace OHOS DnotDisturbView::DnotDisturbView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DnotDisturbView::DnotDisturbView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DnotDisturbView::DnotDisturbView"); g_pDnotDisturbView = this; } DnotDisturbView::~DnotDisturbView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DnotDisturbView::~DnotDisturbView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DnotDisturbView::~DnotDisturbView"); g_pDnotDisturbView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneModel.cpp index aa6df22ba..d9ebeb233 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneModel.cpp @@ -49,7 +49,7 @@ namespace OHOS } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "start_or_stop_find_phone not connected"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "start_or_stop_find_phone not connected"); } } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneView.cpp b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneView.cpp index d8e920deb..88a47a51d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneView.cpp @@ -8,7 +8,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-27 10:47:46 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-12 17:13:01 + * @LastEditTime: 2024-11-05 11:55:53 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhoneView.cpp */ #include "findphone/include/FindPhoneView.h" @@ -28,13 +28,13 @@ namespace OHOS FindPhoneView::FindPhoneView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FindPhoneView::FindPhoneView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FindPhoneView::FindPhoneView"); g_pFindPhoneView = this; } FindPhoneView::~FindPhoneView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FindPhoneView::~FindPhoneView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FindPhoneView::~FindPhoneView"); g_pFindPhoneView = nullptr; } @@ -85,21 +85,21 @@ namespace OHOS } delete FindPhoneGroupView; FindPhoneGroupView = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FindPhoneView::ClearAll over!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FindPhoneView::ClearAll over!!"); } } /*蓝牙如果是未连接状态*/ void FindPhoneView::FindPhoneViewInit_BlueToothDisConnected(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FindPhoneView::FindPhoneViewInit_BlueToothConnected"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FindPhoneView::FindPhoneViewInit_BlueToothConnected"); if (FindPhoneGroupView == nullptr) { /* --------------------------- FindPhoneGroupView --------------------------- */ FindPhoneGroupView = new UIViewGroup(); if (FindPhoneGroupView == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[FindPhoneViewInit_BlueToothConnected] FindPhoneGroupView new fail!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[FindPhoneViewInit_BlueToothConnected] FindPhoneGroupView new fail!!"); return; } FindPhoneGroupView->SetPosition(0, 0, 466, 466); @@ -111,7 +111,7 @@ namespace OHOS FindPhoneTitleLabel = new UILabelExt(); if (FindPhoneTitleLabel == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[FindPhoneViewInit_BlueToothConnected] FindPhoneTitleLabel new fail!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[FindPhoneViewInit_BlueToothConnected] FindPhoneTitleLabel new fail!!"); return; } FindPhoneTitleLabel->SetPosition(83, 50, 300, 35); @@ -125,7 +125,7 @@ namespace OHOS FindPhoneImageView = new UIImageView(); if (FindPhoneImageView == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[FindPhoneViewInit_BlueToothConnected] FindPhoneTitleLabel new fail!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[FindPhoneViewInit_BlueToothConnected] FindPhoneTitleLabel new fail!!"); return; } FindPhoneImageView->SetPosition(193, 140, 80, 80); @@ -134,7 +134,7 @@ namespace OHOS FindPhoneLabel = new UILabelExt(); if (FindPhoneLabel == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView] FindPhoneLabel new fail"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView] FindPhoneLabel new fail"); return; } FindPhoneLabel->SetPosition(83, 270, 300, 35); @@ -149,7 +149,7 @@ namespace OHOS FindPhoneLabelButton = new UILabelButtonExt(); if (FindPhoneLabelButton == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView] FindPhoneLabelButton new fail"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView] FindPhoneLabelButton new fail"); return; } FindPhoneLabelButton->SetPosition(0, 366, 466, 100); @@ -172,14 +172,14 @@ namespace OHOS /*蓝牙如果是已连接状态将初始化这个视图*/ void FindPhoneView::FindPhoneViewInit_BlueToothConnected(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FindPhoneView::FindPhoneViewInit_BlueToothConnected"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FindPhoneView::FindPhoneViewInit_BlueToothConnected"); if (FindPhoneGroupView == nullptr) { /* --------------------------- FindPhoneGroupView --------------------------- */ FindPhoneGroupView = new UIViewGroup(); if (FindPhoneGroupView == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[FindPhoneViewInit_BlueToothConnected] FindPhoneGroupView new fail!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[FindPhoneViewInit_BlueToothConnected] FindPhoneGroupView new fail!!"); return; } FindPhoneGroupView->SetPosition(0, 0, 466, 466); @@ -191,7 +191,7 @@ namespace OHOS FindPhoneTitleLabel = new UILabelExt(); if (FindPhoneTitleLabel == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[FindPhoneViewInit_BlueToothConnected] FindPhoneTitleLabel new fail!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[FindPhoneViewInit_BlueToothConnected] FindPhoneTitleLabel new fail!!"); return; } FindPhoneTitleLabel->SetPosition(83, 50, 300, 35); @@ -208,7 +208,7 @@ namespace OHOS FindPhoneImageAnimator = new UIImageAnimatorView(); if (FindPhoneImageAnimator == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView] FindPhoneImageAnimator new fail"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView] FindPhoneImageAnimator new fail"); return; } for (uint8_t i = 0; i < FINDPHONE_IMAGE_ANIMATOR_VIEW_NUM_FRAMES; i++) @@ -232,7 +232,7 @@ namespace OHOS FindPhoneLabel = new UILabelExt(); if (FindPhoneLabel == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView] FindPhoneLabel new fail"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView] FindPhoneLabel new fail"); return; } FindPhoneLabel->SetPosition(83, 270, 300, 35); @@ -247,7 +247,7 @@ namespace OHOS FindPhoneLabelButton = new UILabelButtonExt(); if (FindPhoneLabelButton == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView] FindPhoneLabelButton new fail"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView] FindPhoneLabelButton new fail"); return; } FindPhoneLabelButton->SetPosition(0, 366, 466, 100); @@ -274,7 +274,7 @@ namespace OHOS SetContainerView(new UIViewGroup()); if (GetContainer() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "container_ new fail!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "container_ new fail!!"); return; } container_->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightModel.cpp index 801c6c885..efc657c24 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightModel.cpp @@ -15,7 +15,7 @@ namespace OHOS FlashlightModel::FlashlightModel() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:", __LINE__); OHOS::ConfigModel::GetInstance()->GetFlashLightConfigData(&ColorIndex_, &ColorValue_, &FlashingLevel_); } @@ -89,7 +89,7 @@ namespace OHOS */ void FlashlightModel::FlashlightStartTimer(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:%d", __LINE__, FlashingLevel_); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:%d", __LINE__, FlashingLevel_); uint32_t interval = 0; switch (FlashingLevel_) { @@ -108,12 +108,12 @@ namespace OHOS default: break; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:%d", __LINE__, interval); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:%d", __LINE__, interval); /* -------------------------- 1.检查定时器是否已经存在，如果存在则返回 ------------------------- */ if (g_timer != NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FlashlightModel::FlashlightStartTimer Timer already exists!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashlightModel::FlashlightStartTimer Timer already exists!!"); return; } @@ -122,7 +122,7 @@ namespace OHOS // 检查定时器创建是否成功 if (g_timer == NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FlashlightModel::FlashlightStartTimer Timer create failed!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashlightModel::FlashlightStartTimer Timer create failed!!"); return; } @@ -135,13 +135,13 @@ namespace OHOS /* -------------------- 5.检查定时器启动是否成功,如果启动失败，删除定时器并置为 NULL -------------------- */ if (ret != osOK) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[FlashlightStartTimer] osTimerDelete failed, ret = %lx!!", ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[FlashlightStartTimer] osTimerDelete failed, ret = %lx!!", ret); if (g_timer != NULL) { ret = osTimerDelete(g_timer); if (ret != osOK) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScanTimerCallback osTimerDelete failed, ret = %lx!!", ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScanTimerCallback osTimerDelete failed, ret = %lx!!", ret); } g_timer = NULL; } @@ -155,19 +155,19 @@ namespace OHOS { if (g_timer != NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FlashlightModel::FlashlightStopTimer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashlightModel::FlashlightStopTimer"); osStatus_t ret = osOK; ret = osTimerStop(g_timer); if (ret != osOK) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FlashlightPauseTimer osTimerStop failed, ret = %lx!!", ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashlightPauseTimer osTimerStop failed, ret = %lx!!", ret); return; } // 删除定时器并置为 NULL ret = osTimerDelete(g_timer); if (ret != osOK) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScanTimerCallback osTimerDelete failed, ret = %lx!!", ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScanTimerCallback osTimerDelete failed, ret = %lx!!", ret); return; } g_timer = NULL; diff --git a/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightPresenter.cpp index 956420681..2831b5fbc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightPresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-10 17:32:38 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-11-03 15:58:20 + * @LastEditTime: 2024-11-05 14:19:14 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/flashligh/src/FlashlightPresenter.cpp */ @@ -194,7 +194,7 @@ namespace OHOS void FlashlightPresenter::OnSwipe(UISwipeView &view) { UNUSED(view); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FlashlightPresenter::OnSwipe"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashlightPresenter::OnSwipe"); if(0 == view.GetCurrentPage()) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightView.cpp b/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightView.cpp index fe82a4831..ee0a3d5cc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/flashlight/src/FlashlightView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-10 17:32:08 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-11-03 15:50:47 + * @LastEditTime: 2024-11-05 11:56:57 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/flashligh/src/FlashlightView.cpp */ #include "flashlight/include/FlashlightView.h" @@ -20,13 +20,13 @@ namespace OHOS FlashlightView::FlashlightView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FlashlightView::FlashlightView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashlightView::FlashlightView"); g_pFlashlightView = this; } FlashlightView::~FlashlightView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FlashlightView::~FlashlightView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashlightView::~FlashlightView"); g_pFlashlightView = nullptr; } @@ -42,7 +42,7 @@ namespace OHOS SetContainerView(new UIViewGroup()); if (nullptr == GetContainer()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__); return; } container_->SetPosition(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); @@ -106,7 +106,7 @@ namespace OHOS SwipeView_ = new UISwipeView(UISwipeView::VERTICAL); if(nullptr == SwipeView_) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); return nullptr; } SwipeView_->SetPosition(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); @@ -136,7 +136,7 @@ namespace OHOS SwipeView_->SetLoopState(false); container_->Add(SwipeView_); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FlashlightView::InitSwipeData"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashlightView::InitSwipeData"); } return dynamic_cast(SwipeView_); @@ -186,7 +186,7 @@ namespace OHOS } GroupMain_->Add(ImageArrow_); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FlashlightView::InitViewMainData"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashlightView::InitViewMainData"); } return GroupMain_; @@ -194,14 +194,14 @@ namespace OHOS void FlashlightView::UpdateViewMainScreenFlashing(bool flag) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); if(nullptr == GroupMain_) return; if(false == GroupMain_->IsVisible()) return; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:%d", __LINE__, flag); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]:%d", __LINE__, flag); if(true == flag) { // GroupMain_->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); @@ -345,7 +345,7 @@ namespace OHOS GroupSetting_->Add(ImageFlashingSetting_); GroupSetting_->Add(LabelColorSetting_); GroupSetting_->Add(LabelFlashingSetting_); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FlashlightView::InitViewSettingData"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FlashlightView::InitViewSettingData"); } return GroupSetting_; @@ -588,18 +588,18 @@ namespace OHOS if(nullptr == ImageColorCustomSelected_) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); return ; } if(nullptr == ImageColorCustomBackground_) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); return ; } const ImageInfo * info = ImageColorCustomBackground_->GetImageInfo(); if(nullptr == info) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); return ; } // @@ -620,18 +620,18 @@ namespace OHOS if(nullptr == ImageColorCustomSelected_) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); return ; } if(nullptr == ImageColorCustomBackground_) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); return ; } const ImageInfo * info = ImageColorCustomBackground_->GetImageInfo(); if(nullptr == info) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[@CHENG][%d]", __LINE__); return ; } // diff --git a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp index 822eb8c32..2e812bc6a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp @@ -56,14 +56,14 @@ namespace OHOS void KeyInputListener::OnKeyPress() { pressFlag = 1; // 短按标志 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnKeyPress: pressFlag = %d", pressFlag); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnKeyPress: pressFlag = %d", pressFlag); } void KeyInputListener::OnKeyLongPress(const KeyEvent &event) { longPressFlag = 1; // 长按标志 uint16 keyID = event.GetKeyId(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnKeyLongPress: keyID = %d, longPressFlag = %d", keyID, longPressFlag); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnKeyLongPress: keyID = %d, longPressFlag = %d", keyID, longPressFlag); } void KeyInputListener::CallVolumeDipSwitchControl(VolumeChangeStatus status) @@ -71,7 +71,7 @@ namespace OHOS auto *mainPresenter = MainCallingPresenter::GetInstance(); auto *callerLogModel = CallerLogModel::GetInstance(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CallVolumeDipSwitchControl: status = %d", status); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CallVolumeDipSwitchControl: status = %d", status); if (mainPresenter != nullptr && callerLogModel->GetCallStatus()) { @@ -119,7 +119,7 @@ namespace OHOS uint16_t currentViewId = NativeAbility::GetInstance().GetCurSliceId(); uint16 keyID = event.GetKeyId(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnKeyRelease: keyID = %d, currentViewId = %d, longPressFlag = %d, pressFlag = %d", keyID, currentViewId, longPressFlag, pressFlag); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnKeyRelease: keyID = %d, currentViewId = %d, longPressFlag = %d, pressFlag = %d", keyID, currentViewId, longPressFlag, pressFlag); if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER)) { @@ -143,7 +143,7 @@ namespace OHOS void KeyInputListener::HandlePowerKeyPress(uint16_t currentViewId) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandlePowerKeyPress: currentViewId = %d", currentViewId); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HandlePowerKeyPress: currentViewId = %d", currentViewId); if (currentViewId != VIEW_MAIN) { @@ -187,7 +187,7 @@ namespace OHOS void KeyInputListener::HandleFuncKeyPress(uint16_t currentViewId) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandleFuncKeyPress: currentViewId = %d", currentViewId); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HandleFuncKeyPress: currentViewId = %d", currentViewId); if (currentViewId != VIEW_MAIN) { @@ -211,7 +211,7 @@ namespace OHOS UNUSED(view); uint8 state = event.GetState(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnKeyAct: state = %d", state); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnKeyAct: state = %d", state); switch (state) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp index 67e7ca5c4..781559ae8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp @@ -1,8 +1,8 @@ /* * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-30 09:14:38 - * @LastEditors: SnickerSun snickersun@163.com - * @LastEditTime: 2024-08-30 20:45:36 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-11-05 14:18:49 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/LanguageInit.cpp */ #include @@ -167,13 +167,13 @@ namespace OHOS language::language() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "language::language"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "language::language"); ///g_planguage = this; } language::~language() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "language::~language"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "language::~language"); //g_planguage = nullptr; } @@ -185,7 +185,7 @@ namespace OHOS bool language::InitLangues() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLangues"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitLangues"); // 获取json里面的语言 #ifdef A5133_DEMO_CLIENT NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN); @@ -243,7 +243,7 @@ namespace OHOS ConfigModel::GetInstance()->SetLanguageCode(languages[currentLanguageId].code); ConfigModel::GetInstance()->SetLanguage(currentLanguageId); int ret = set_current_global_font_name(languages[currentLanguageId].fontname); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "resFiles [%d]:%s fontname:%s , ret = %d", currentLanguageId,resFiles[currentLanguageId],languages[currentLanguageId].fontname,ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "resFiles [%d]:%s fontname:%s , ret = %d", currentLanguageId,resFiles[currentLanguageId],languages[currentLanguageId].fontname,ret); return true; } @@ -257,14 +257,14 @@ namespace OHOS // 获取语言Code对应的语言Id LanguageId currentLanguageId = LanguageManager::GetInstance().GetLanguageIdByCode(language_code); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d %s", currentLanguageId, language_code.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%d %s", currentLanguageId, language_code.c_str()); FontGlobalManager::GetInstance()->RegisterLanguageInfo(resFiles, MAX_LANGUAGE, currentLanguageId); UIFont::GetInstance()->SetCurrentLangId(currentLanguageId); ConfigModel::GetInstance()->SetLanguageCode(language_code.c_str()); ConfigModel::GetInstance()->SetLanguage(currentLanguageId); int ret = set_current_global_font_name(languages[currentLanguageId].fontname); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "resFiles[%d]:%s fontname %s , ret = %d", currentLanguageId, resFiles[currentLanguageId], languages[currentLanguageId].fontname, ret ); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "resFiles[%d]:%s fontname %s , ret = %d", currentLanguageId, resFiles[currentLanguageId], languages[currentLanguageId].fontname, ret ); return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp index 71b7e706f..87afd9277 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-28 16:36:46 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-29 19:42:28 + * @LastEditTime: 2024-11-05 14:19:02 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchModel.cpp */ #include "languagecode/include/LanguageSwitchModel.h" @@ -27,7 +27,7 @@ namespace OHOS void LanguageSwitchModel::LanguageSwitchViewupdata(uint32_t id) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LanguageSwitchViewupdata:%d",id); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LanguageSwitchViewupdata:%d",id); if(is_load_languages(id)) { if(LanguageSwitchView::GetInstance()) diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp index 812e1749e..f48684041 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-28 14:17:43 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-29 19:45:03 + * @LastEditTime: 2024-11-05 14:19:24 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp */ #include "AppViewIDs.h" @@ -94,7 +94,7 @@ namespace OHOS bool LanguageSwitchPresenter::OnClick(UIView &view, const ClickEvent &event) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LanguageSwitchPresenter::OnClick"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LanguageSwitchPresenter::OnClick"); UNUSED(event); const char *lastLanguageCode = p_LanguageSwitchModel->GetLastLanguageCode(); @@ -179,7 +179,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "p_UILabelButtonExt is nullptr !!"); return false; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "lastLanguageCode = %s , CurrLanguageCode = %s", p_LanguageSwitchModel->GetLastLanguageCode(), p_LanguageSwitchModel->GetCurLanguageCode()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "lastLanguageCode = %s , CurrLanguageCode = %s", p_LanguageSwitchModel->GetLastLanguageCode(), p_LanguageSwitchModel->GetCurLanguageCode()); // 检查当前语言ID是否已经是点击的语言ID,否则重复点击同一语言不响应切换 if (strcmp(p_LanguageSwitchModel->GetCurLanguageCode(), lastLanguageCode) == 0) { @@ -225,7 +225,7 @@ namespace OHOS void LanguageSwitchPresenter::OnItemSelected(int16 index, UIView *view) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LanguageSwitchPresenter::OnItemSelected:%d",index); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LanguageSwitchPresenter::OnItemSelected:%d",index); } void LanguageSwitchPresenter::SetLabelExt(UILabelExt *labelext) diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp index 54681670d..b3336ffe6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp @@ -24,13 +24,13 @@ namespace OHOS static LanguageSwitchView *g_pLanguageSwitchView{nullptr}; LanguageSwitchView::LanguageSwitchView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LanguageSwitchView::LanguageSwitchView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LanguageSwitchView::LanguageSwitchView"); g_pLanguageSwitchView = this; } LanguageSwitchView::~LanguageSwitchView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LanguageSwitchView::~LanguageSwitchView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LanguageSwitchView::~LanguageSwitchView"); g_pLanguageSwitchView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp index aa36fde85..864e1c7da 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -68,7 +68,7 @@ namespace OHOS MainPresenterSample::~MainPresenterSample() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "~MainPresenterSample"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "~MainPresenterSample"); g_pMainPresenterSample = nullptr; /*从主界面退出，关闭心率检测*/ HeartModel::GetInstance()->Heart_Control(HeartState::End, @@ -437,7 +437,7 @@ namespace OHOS /*打印日志*/ void MainPresenterSample::LogCardTransition(CardId previous, CardId current) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[MainCard slide]previousCardId:%d cardId:%d", previous, current); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[MainCard slide]previousCardId:%d cardId:%d", previous, current); } /*睡眠卡片*/ void MainPresenterSample::ResetSleepCardView() @@ -452,7 +452,7 @@ namespace OHOS } if (SleepModel::GetInstance().CheckSleepTime()) { //通知睡眠更新 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "睡眠数据更新"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "睡眠数据更新"); GraphicService::GetInstance()->PostGraphicEvent( std::bind(&OHOS::SleepModel::UpdateSleepView, &OHOS::SleepModel::GetInstance())); } @@ -600,7 +600,7 @@ namespace OHOS float voltage = 0.0F; uint8_t value = 0; value = battery_get_voltage(&voltage); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "battery_get_voltage = %d", value); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "battery_get_voltage = %d", value); std::string dateAndweek = std::string(dateStr) + " " + std::string(weekStr); if (PullUpDownView::GetInstance() != nullptr) { @@ -663,7 +663,7 @@ namespace OHOS */ void MainPresenterSample::PullUpDown_StartTimer(uint32_t interval) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainPresenterSample::PullUpDown_StartTimer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainPresenterSample::PullUpDown_StartTimer"); /* -------------------------- 1.检查定时器是否已经存在，如果存在则返回 ------------------------- */ if (g_timer != NULL) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp index 5a158c803..0b00d01af 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-26 18:14:24 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-30 18:32:51 + * @LastEditTime: 2024-11-05 14:22:07 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp */ @@ -67,7 +67,7 @@ namespace OHOS void PullUpDownView::OnSwipe(UISwipeView &view) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::OnSwipe,current tab index = %d", view.GetCurrentPage()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::OnSwipe,current tab index = %d", view.GetCurrentPage()); if (view.GetCurrentPage() == 0) { UpdateSwipviewSelect(true); @@ -335,7 +335,7 @@ namespace OHOS delete showBluetoothConnectedStatus; showBluetoothConnectedStatus = nullptr; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ClearAllConnectedStatusComponentsView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ClearAllConnectedStatusComponentsView"); } /* -------------------------------------------------------------------------- */ /*** @@ -575,7 +575,7 @@ namespace OHOS delete showDateAndWeekLabel; showDateAndWeekLabel = nullptr; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ClearAll_2 over!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ClearAll_2 over!!"); } // 获取信号强度 @@ -607,11 +607,11 @@ namespace OHOS int signal = uapi_dev_runtime_get_cat1_signal(); int network_on = uapi_dev_runtime_get_cat1_networkstat(); int cat1_network_type = uapi_dev_runtime_get_cat1_networtype(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "sim = %d", sim); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cat1_powerOn = %d", cat1_powerOn); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "signal = %d", signal); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "network_on = %d", network_on); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cat1_network_type = %d", cat1_network_type); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "sim = %d", sim); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cat1_powerOn = %d", cat1_powerOn); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "signal = %d", signal); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "network_on = %d", network_on); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cat1_network_type = %d", cat1_network_type); const int SIGNAL_NO_SIGNAL = 99; const int NETWORK_TYPE_NO_NETWORK = 0; @@ -957,7 +957,7 @@ namespace OHOS { recordCard[i] = nullptr; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ClearAll_3 over!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ClearAll_3 over!!"); } // 创建与滑动列表相关组件 void PullUpDownView::CreateDropDownswipeViewListView(void) @@ -1039,7 +1039,7 @@ namespace OHOS delete line; line = nullptr; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ClearAll_4 over!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ClearAll_4 over!!"); } /* -------------------------------------------------------------------------- */ @@ -1076,7 +1076,7 @@ namespace OHOS void PullUpDownView::PreLoad(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::PreLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::PreLoad"); if (!viewiInitStatus) { PullUpDownViewInit(); @@ -1086,7 +1086,7 @@ namespace OHOS void PullUpDownView::UnLoad(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::UnLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::UnLoad"); } /*更新勿扰模式状态*/ @@ -1116,7 +1116,7 @@ namespace OHOS { if (group[thisView] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ChangeConnectedStatusView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ChangeConnectedStatusView"); connectedStatusView = new ConnectedStatusView(); if (connectedStatusView == nullptr) { @@ -1160,7 +1160,7 @@ namespace OHOS void PullUpDownView::ChangeView(int16_t hideView, int16_t showView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ChangeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ChangeView"); if (hideView > MAX_DROPDOWNVIEWID) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView:: SystemViewId Overstep ones bounds"); @@ -1182,7 +1182,7 @@ namespace OHOS // 处理按键事件回到下拉主页面 void PullUpDownView::HandOnKeyEventSwitchMainPullDownView(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::HandOnKeyEventSwitchMainPullDownView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::HandOnKeyEventSwitchMainPullDownView"); if (curView == CONNECTEDSTATUSVIEW) /*当前是连接状态视图*/ { ChangeView(curView, DROPDOWNVIEW); /*切换到下拉主页面*/ diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/VolumeSettingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/VolumeSettingPresenter.cpp index 57e7989e6..1d732dd98 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/VolumeSettingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/VolumeSettingPresenter.cpp @@ -145,7 +145,7 @@ void VolumeSliderEventListener::BtAndLocalVolumeSet(int16_t sounding) if (g_avrcp_srv_inf.avrcp_srv_conn_stat == PROFILE_STATE_CONNECTED) { // uint8_t volume = sounding * AVRCP_ABSOLUTE_VOLUME_PERCENTAGE_100 / 100; // 100：本地音量最大值 uint8_t volume = mapVolume(sounding); - WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "avrcp volume = %d", volume); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "手表音量设置同步远端BT音量 %d", volume); (void)avrcp_ct_set_absolute_volume(&(g_avrcp_srv_inf.bd_addr), volume); // 手表音量设置同步远端BT音量 } /* -------------------------- 若ct或tg端是已连接状态且当前为手机音乐 ------------------------- */ diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp index 3ad2db5d1..ca422fd2a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-21 11:54:00 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-11 15:29:18 + * @LastEditTime: 2024-11-05 15:09:04 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp */ #include "main/include/dropdown/DropDownCardPage1.h" @@ -54,14 +54,14 @@ namespace OHOS static DropDownCardPage1 *g_pDropDownCardPage1{nullptr}; DropDownCardPage1::DropDownCardPage1() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DropDownCardPage1::DropDownCardPage1"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DropDownCardPage1::DropDownCardPage1"); SetPosition(0, 0, 430, 210); g_pDropDownCardPage1 = this; } DropDownCardPage1::~DropDownCardPage1() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DropDownCardPage1::~DropDownCardPage1"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DropDownCardPage1::~DropDownCardPage1"); ClearAll(); g_pDropDownCardPage1 = nullptr; } @@ -75,7 +75,7 @@ namespace OHOS { std::string viewId = view.GetViewId(); bool state; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DropDownCardPage1::OnClick %s ", view.GetViewId()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DropDownCardPage1::OnClick %s ", view.GetViewId()); if (viewId == DROPDOWN_BT_TOGGLEBUTTON_VIEWID) // 蓝牙开关 { NativeAbility::GetInstance().EnterSlice(VIEW_CLASSIC_BLUETOOTH); @@ -198,7 +198,7 @@ namespace OHOS bool DropDownCardPage1::InitPage(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DropDownCardPage1::InitPage"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DropDownCardPage1::InitPage"); bool state_bt = ConfigModel::GetInstance()->GetClassicBlueToothState(); // 传统蓝牙开关 bool state_4g = uapi_cat1_get_power_stat(); @@ -234,7 +234,7 @@ namespace OHOS bool DropDownCardPage1::InitView(void *caller) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DropDownCardPage1::InitView %p", caller); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DropDownCardPage1::InitView %p", caller); if (InitPage() == false) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DropDownCardPage1::InitPage fail"); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage2.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage2.cpp index 7647e2c83..c14c51cc4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage2.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage2.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-21 11:54:00 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-22 19:01:37 + * @LastEditTime: 2024-11-05 15:09:26 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage2.cpp */ #include "main/include/dropdown/DropDownCardPage2.h" @@ -25,14 +25,14 @@ namespace OHOS static DropDownCardPage2 *g_pDropDownCardPage2{nullptr}; DropDownCardPage2::DropDownCardPage2() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DropDownCardPage2::DropDownCardPage2"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DropDownCardPage2::DropDownCardPage2"); SetPosition(0, 0, 430, 210); g_pDropDownCardPage2 = this; } DropDownCardPage2::~DropDownCardPage2() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DropDownCardPage2::~DropDownCardPage2"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DropDownCardPage2::~DropDownCardPage2"); ClearAll(); g_pDropDownCardPage2 = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp index f38efecc0..417b6ecfc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-23 17:28:52 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-12 11:17:45 + * @LastEditTime: 2024-11-05 14:24:02 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp */ #include "motionrecognition/include/MotionRecognitionPresenter.h" @@ -18,13 +18,13 @@ namespace OHOS MotionRecognitionView::MotionRecognitionView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MotionRecognitionView::MotionRecognitionView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MotionRecognitionView::MotionRecognitionView"); g_pMotionRecognitionView = this; } MotionRecognitionView::~MotionRecognitionView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MotionRecognitionView::~MotionRecognitionView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MotionRecognitionView::~MotionRecognitionView"); g_pMotionRecognitionView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/musicplayer/src/MusicPlayerView.cpp b/code/sdk/application/wearable/fd230app/nativeui/musicplayer/src/MusicPlayerView.cpp index 0d551ba6b..a68c88225 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/musicplayer/src/MusicPlayerView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/musicplayer/src/MusicPlayerView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-29 18:03:54 + * @LastEditTime: 2024-11-05 14:23:38 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/MusicPlayer/src/MusicPlayerView.cpp */ #include "musicplayer/include/MusicPlayerPresenter.h" @@ -15,13 +15,13 @@ namespace OHOS static MusicPlayerView *g_pMusicPlayerView{nullptr}; MusicPlayerView::MusicPlayerView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerView::MusicPlayerView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerView::MusicPlayerView"); g_pMusicPlayerView = this; } MusicPlayerView::~MusicPlayerView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerView::~MusicPlayerView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerView::~MusicPlayerView"); g_pMusicPlayerView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/MobileDataOptionsView.cpp b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/MobileDataOptionsView.cpp index f4a4ae68a..5e977b865 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/MobileDataOptionsView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/MobileDataOptionsView.cpp @@ -8,13 +8,13 @@ namespace OHOS static MobileDataOptionsView *g_pMobileDataOptionsView{nullptr}; MobileDataOptionsView::MobileDataOptionsView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MobileDataOptionsView::MobileDataOptionsView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MobileDataOptionsView::MobileDataOptionsView"); g_pMobileDataOptionsView = this; } MobileDataOptionsView::~MobileDataOptionsView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MobileDataOptionsView::~MobileDataOptionsView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MobileDataOptionsView::~MobileDataOptionsView"); ClearAll(); g_pMobileDataOptionsView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp index 1d813a4b0..7c5a2aaf2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-23 09:59:32 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-26 19:31:45 + * @LastEditTime: 2024-11-05 14:25:03 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp */ #include "AppViewIDs.h" @@ -83,7 +83,7 @@ namespace OHOS { if (toggleButton->GetState() == true) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s is enable!", it->second.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%s is enable!", it->second.c_str()); if (it->second == "VoLTE" && p_NetworkAndCallView->GetMobileDataToggleButton()->GetState() == true) { ConfigModel::GetInstance()->SetVoLTE_Call(true); @@ -101,7 +101,7 @@ namespace OHOS } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s is disable!", it->second.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%s is disable!", it->second.c_str()); if (it->second == "VoLTE" && p_NetworkAndCallView->GetMobileDataToggleButton()->GetState() == true) { ConfigModel::GetInstance()->SetVoLTE_Call(false); diff --git a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp index 18c6e3b5c..16d213edd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp @@ -12,14 +12,14 @@ namespace OHOS NetworkAndCallView::NetworkAndCallView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NetworkAndCallView::NetworkAndCallView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NetworkAndCallView::NetworkAndCallView"); g_pNetworkAndCallView = this; } NetworkAndCallView::~NetworkAndCallView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NetworkAndCallView::~NetworkAndCallView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NetworkAndCallView::~NetworkAndCallView"); g_pNetworkAndCallView = nullptr; } @@ -286,7 +286,7 @@ namespace OHOS { if (NetworkAndCallScrollView[thisView] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::ChangeScreenDurationView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::ChangeScreenDurationView"); mobileDataOptionsView = new MobileDataOptionsView(); if (mobileDataOptionsView == nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBTConnectFailedView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBTConnectFailedView.cpp index 1129348d9..2a5100547 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBTConnectFailedView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBTConnectFailedView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-12 11:31:43 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-19 11:51:53 + * @LastEditTime: 2024-11-05 14:28:21 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBTConnectFailedView.cpp */ #include "player/include/MusicPlayerBTConnectFailedView.h" @@ -17,12 +17,12 @@ namespace OHOS static constexpr const char *CLOSEBUTTON_VIEWID = "CLOSEButton"; MusicPlayerBTConnectFailedView::MusicPlayerBTConnectFailedView(/* args */) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBTConnectFailedView::MusicPlayerBTConnectFailedView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerBTConnectFailedView::MusicPlayerBTConnectFailedView"); } MusicPlayerBTConnectFailedView::~MusicPlayerBTConnectFailedView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBTConnectFailedView::~MusicPlayerBTConnectFailedView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerBTConnectFailedView::~MusicPlayerBTConnectFailedView"); ClearAll(); } @@ -107,7 +107,7 @@ namespace OHOS bool MusicPlayerBTConnectFailedView::CreateMusicPlayerBTConnectFailedViewLabel() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBTConnectFailedView::CreateMusicPlayerBTConnectFailedViewLabel"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerBTConnectFailedView::CreateMusicPlayerBTConnectFailedViewLabel"); /* ------------------------------- titleLabel ------------------------------- */ if (titleLabel == nullptr) { @@ -230,7 +230,7 @@ namespace OHOS bool MusicPlayerBTConnectFailedView::CreateMusicPlayerBTConnectFailedViewButton() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBTConnectFailedView::CreateMusicPlayerBTConnectFailedViewButton"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerBTConnectFailedView::CreateMusicPlayerBTConnectFailedViewButton"); if (CloseButton == nullptr) { CloseButton = new UIButton(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp index 3bd84eb00..e8160521b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-10 16:23:46 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-19 11:52:00 + * @LastEditTime: 2024-11-05 14:28:09 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp */ #include "player/include/MusicPlayerBluetoothDisConView.h" @@ -17,12 +17,12 @@ namespace OHOS static constexpr const char *OKBUTTON_VIEWID = "OkButton"; MusicPlayerBluetoothDisConView::MusicPlayerBluetoothDisConView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::MusicPlayerBluetoothDisConView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::MusicPlayerBluetoothDisConView"); } MusicPlayerBluetoothDisConView::~MusicPlayerBluetoothDisConView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::~MusicPlayerBluetoothDisConView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::~MusicPlayerBluetoothDisConView"); ClearAll(); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp index ee89bf6a0..78cdfa050 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp @@ -21,13 +21,13 @@ namespace OHOS static MusicPlayerSourceView *g_bluetoothView{nullptr}; MusicPlayerSourceView::MusicPlayerSourceView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerSourceView::MusicPlayerSourceView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerSourceView::MusicPlayerSourceView"); g_bluetoothView = this; } MusicPlayerSourceView::~MusicPlayerSourceView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerSourceView::~MusicPlayerSourceView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerSourceView::~MusicPlayerSourceView"); ClearAll(); g_bluetoothView = nullptr; } @@ -60,7 +60,7 @@ namespace OHOS bool a2dp = uapi_a2dp_snk_get_device_connect_state(); // 获取a2dp连接状态 if (button == phoneLableButton) // 若点击的是手机音乐按钮 { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnClick phoneLableButton"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnClick phoneLableButton"); if (!PlayersModel::GetInstance()->GetMusicSource()) // 切换到手机音乐 { PlayersModel::GetInstance()->SetMusicSource(true); @@ -95,7 +95,7 @@ namespace OHOS } else if (button == watchLableButton) // 若点击的是手表音乐按钮 { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnClick watchLableButton"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnClick watchLableButton"); if (PlayersModel::GetInstance()->GetMusicSource()) // 切换到手表音乐 { PlayersModel::GetInstance()->SetMusicSource(false); @@ -112,7 +112,7 @@ namespace OHOS } else if (button == bluetoothHeadsetLableButton) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnClick bluetoothHeadsetLableButton"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnClick bluetoothHeadsetLableButton"); NativeAbility::GetInstance().EnterSlice(VIEW_BLUETOOTH_EARPHONE); // 配置主界面回退界面 MainModel::GetInstance().SetFromSetCardView(true); diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerTipView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerTipView.cpp index 09255d973..12537a8f9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerTipView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerTipView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-10-19 11:27:19 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-19 15:35:34 + * @LastEditTime: 2024-11-05 14:29:01 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerTipView.cpp */ #include "player/include/MusicPlayerTipView.h" @@ -19,13 +19,13 @@ namespace OHOS static MusicPlayerTipView *g_pMusicPlayerTipView = nullptr; MusicPlayerTipView::MusicPlayerTipView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerTipView::MusicPlayerTipView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerTipView::MusicPlayerTipView"); g_pMusicPlayerTipView = this; } MusicPlayerTipView::~MusicPlayerTipView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "~MusicPlayerTipView::MusicPlayerTipView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "~MusicPlayerTipView::MusicPlayerTipView"); ClearAll(); g_pMusicPlayerTipView = nullptr; } @@ -37,7 +37,7 @@ namespace OHOS void MusicPlayerTipView::ClearAll(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerTipView::ClearAll"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerTipView::ClearAll"); if (group) { group->RemoveAll(); @@ -70,7 +70,7 @@ namespace OHOS bool MusicPlayerTipView::OnClick(UIView &view, const ClickEvent &event) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerTipView::OnClick"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerTipView::OnClick"); PlayersView *playersView = PlayersView::GetInstance(); if (!playersView) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp index 92eed0c0c..26e96a37a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp @@ -98,7 +98,7 @@ namespace OHOS // 删除歌曲文件 void PlayerListDelSongView::DeleteSongNameFile(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " whill Deleted file:%s", delSongName.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " whill Deleted file:%s", delSongName.c_str()); std::string path = PlayersModel::GetInstance()->GetMusicPlayPath() + "/" + delSongName; if (uapi_delete_files(path.c_str())) diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp index 3209df35d..8d1c55ed9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp @@ -35,7 +35,7 @@ namespace OHOS bool BtnOnClickListListener::OnClick(UIView &view, const ClickEvent &event) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BtnOnClickListListener OnClick:"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BtnOnClickListListener OnClick:"); UNUSED(event); int ret; diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp index 508f9981a..255ad686a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp @@ -789,7 +789,7 @@ void PlayersModel::SetMusicSource(bool value) /*更新音乐列表*/ void PlayersModel::UpdateMusicPlayerList(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersModel::UpdateMusicPlayerList"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersModel::UpdateMusicPlayerList"); PlayersListGroup::GetInstance()->SetUpListCase(); PlayersView *playersView = PlayersView::GetInstance(); if (playersView == nullptr) { @@ -817,7 +817,7 @@ bool PlayersModel::GetCurrentMusicIsPlaying(void) static void PlayerMusic_TimerCallbackProc(int data) { g_PlayerTimes--; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "g_PlayerTimes = %d",g_PlayerTimes); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_PlayerTimes = %d",g_PlayerTimes); PlayersView *playersView = PlayersView::GetInstance(); if (playersView == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playersView nullptr err"); @@ -988,8 +988,8 @@ bool PlayersModel::GetCurrentMusicIsPlaying(void) WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BtAndLocalVolumeSet addr: %02x%02x%02x%02x%02x%02x ", bdAddr.addr[5], bdAddr.addr[4], bdAddr.addr[3], /* 5 4 3 idx */ bdAddr.addr[2], bdAddr.addr[1], bdAddr.addr[0]); /* 2 1 0 idx */ - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "connCtState:%x", connCtState); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "connTgState:%x", connTgState); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "connCtState:%x", connCtState); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "connTgState:%x", connTgState); if (connCtState == PROFILE_STATE_CONNECTED || connTgState == PROFILE_STATE_CONNECTED) { return true; @@ -1003,10 +1003,10 @@ bool PlayersModel::GetCurrentMusicIsPlaying(void) bd_addr_t active_bd_addr = a2dp_snk_get_active_device(); int state = a2dp_snk_get_playing_state(&active_bd_addr); if (state == A2DP_IS_PLAYING) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "A2DP_IS_PLAYING"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "A2DP_IS_PLAYING"); return true; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "A2DP_NOT_PLAYING"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "A2DP_NOT_PLAYING"); return false; } @@ -1016,7 +1016,7 @@ bool PlayersModel::GetCurrentMusicIsPlaying(void) { if (get_avrcp_ct_or_tg_is_connected() && get_a2dp_sink_playing_state()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AVRCP_KEY_PAUSE"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AVRCP_KEY_PAUSE"); set_phone_music_play_state(AVRCP_KEY_PAUSE); // 控制手机音乐暂停 } } @@ -1026,7 +1026,7 @@ bool PlayersModel::GetCurrentMusicIsPlaying(void) { if (get_avrcp_ct_or_tg_is_connected() && get_a2dp_sink_playing_state()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AVRCP_KEY_PLAY"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AVRCP_KEY_PLAY"); set_phone_music_play_state(AVRCP_KEY_PLAY); // 控制手机音乐暂停 } } @@ -1147,7 +1147,7 @@ bool PlayersModel::GetCurrentMusicIsPlaying(void) { for (const auto &entry : idToMusicNameMap) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "id = %d name.first = %s name.second = %s", entry.first,entry.second.first.c_str(),entry.second.second.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "id = %d name.first = %s name.second = %s", entry.first,entry.second.first.c_str(),entry.second.second.c_str()); } } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp index 2e6639bb2..2e4617cb3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp @@ -457,7 +457,7 @@ void PlayersListGroup::SetUpListCase() } playerCaseInfo.index = i; i++; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "musicName = %s,index = %d",playerCaseInfo.sliceId,playerCaseInfo.index); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "musicName = %s,index = %d",playerCaseInfo.sliceId,playerCaseInfo.index); playersCaseList_->PushBack(playerCaseInfo); } PlayersModel::GetInstance()->showIdToMusicNameMapData(); @@ -572,7 +572,7 @@ int PlayersListGroup::GetAllFiles(std::list &playersList) } // 关闭目录 closedir(dirp); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::GetAllFiles end!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::GetAllFiles end!"); return OHOS_SUCCESS; } @@ -590,7 +590,7 @@ std::string PlayersListGroup::hex_to_string(const std::string &hex_str) // 将十六进制字符串转换为字符 result.push_back(static_cast(strtol(byteString.c_str(), nullptr, 16))); } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "hex_to_string:%s",result.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "hex_to_string:%s",result.c_str()); return result; // 返回结果字符串 } ButtonOnClickListener::~ButtonOnClickListener() @@ -636,7 +636,7 @@ void ButtonOnClickListener::PlayerButtonOnClick() { if(PlayersListGroup::GetInstance()->GetCase().IsEmpty()) //若当前歌曲列表为空且为本地音乐他跳转到音乐列表进行提示 { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "current playersCaseList_ is empty!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "current playersCaseList_ is empty!!"); playersView->SetPlayerButtonState(UICheckBox::UICheckBoxState::UNSELECTED); playersView->ChangeView(PlayersView::MAIN_MUSICPLAYER_VIEW,PlayersView::MUSIC_LIST_VIEW); return; diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp index e6a274a10..5524adeac 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp @@ -506,7 +506,7 @@ namespace OHOS { group[i] = nullptr; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::ClearAll end"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::ClearAll end"); } UIButton *PlayersView::PlayerViewButtonInit(ButtonConfig &buttonconfig) @@ -895,7 +895,7 @@ namespace OHOS PlayersListGroup::GetInstance()->SetUpListCase(); if (musicAdapter && musicListIsEmptyImage && musicListIsEmptyLabel && musicList) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "musicNum = %d", musicAdapter->GetCount()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "musicNum = %d", musicAdapter->GetCount()); if (0 == musicAdapter->GetCount()) /*歌曲为空*/ { musicListIsEmptyImage->SetVisible(true); @@ -929,7 +929,7 @@ namespace OHOS /*点击返回键回到音乐主视图*/ void PlayersView::OnClickBackKeyToMainMusicPlayerView(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::OnClickBackKeyToMainMusicPlayerView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::OnClickBackKeyToMainMusicPlayerView"); int index = 0; for (int i = MAIN_MUSICPLAYER_VIEW; i < MUSICPLAYERJUMPVIEWID_MAX; i++) { @@ -960,7 +960,7 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdatePlayerView"); bool phoneMusicConnectStatus = uapi_a2dp_snk_get_device_connect_state();// 获取a2dp连接状态 bool musicSourceType = PlayersModel::GetInstance()->GetMusicSource(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "phoneMusicConnectStatus %d,musicSourceType %d",phoneMusicConnectStatus,musicSourceType); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "phoneMusicConnectStatus %d,musicSourceType %d",phoneMusicConnectStatus,musicSourceType); ImageInfo *image; if (musicSourceType) { @@ -1008,7 +1008,7 @@ namespace OHOS { musicPlayerSourceView->UpdateBluetoothHeadSetViewIsVisible(); } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdatePlayerView over!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdatePlayerView over!!"); } // 初始化音乐播放器主视图 @@ -1040,7 +1040,7 @@ namespace OHOS void PlayersView::PreLoad(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::PreLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::PreLoad"); if (!viewiInitStatus) { if (InitView()) @@ -1053,7 +1053,7 @@ namespace OHOS void PlayersView::UnLoad(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::UnLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::UnLoad"); UnLoadPlayerImageRes(); } @@ -1177,7 +1177,7 @@ namespace OHOS /*预加载音乐播放器资源*/ void PlayersView::PreLoadPlayerImageRes(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::playerResPreLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::playerResPreLoad"); if (!resLoadStatus) { if (LoadPlayerImage(musicPlayerBackGround, PLAYER_BACKGROUND) == false) @@ -1232,7 +1232,7 @@ namespace OHOS /*卸载音乐播放器资源*/ void PlayersView::UnLoadPlayerImageRes(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::playerResUnLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::playerResUnLoad"); if (resLoadStatus) { ImageInfo *image = nullptr; @@ -1386,7 +1386,7 @@ namespace OHOS /*切换到音乐来源视图*/ bool PlayersView::ChangeToMusicSourceView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicSourceView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicSourceView"); if (group[thisView] == nullptr) { musicPlayerSourceView = new MusicPlayerSourceView(); @@ -1404,7 +1404,7 @@ namespace OHOS /*切换到声音调节视图*/ bool PlayersView::ChangeToVolumeControlView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToVolumeControlView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToVolumeControlView"); if (group[thisView] == nullptr) { volumeSettingView = new VolumeSettingView(); @@ -1427,7 +1427,7 @@ namespace OHOS /*切换到音乐列表视图*/ bool PlayersView::ChangeToMusicListView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicListView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicListView"); if (group[thisView] == nullptr) { UIViewGroup *groupview = CreateMusicListGroupView(); @@ -1446,7 +1446,7 @@ namespace OHOS /*切换到音乐删除视图*/ bool PlayersView::ChangeToMusicDeleteView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicDeleteView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicDeleteView"); if (group[thisView] == nullptr) { playerListDelSongView = new PlayerListDelSongView(); @@ -1470,7 +1470,7 @@ namespace OHOS /*切换到蓝牙未连接视图*/ bool PlayersView::ChangeToMusicBluetoothDisConnectView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicBluetoothDisConnectView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicBluetoothDisConnectView"); if (group[thisView] == nullptr) { musicPlayerBluetoothDisConView = new MusicPlayerBluetoothDisConView(); @@ -1494,7 +1494,7 @@ namespace OHOS /*切换到蓝牙未连接视图*/ bool PlayersView::ChangeToMusicBluetoothConnectFailedView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicBluetoothConnectFailedView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicBluetoothConnectFailedView"); if (group[thisView] == nullptr) { musicPlayerBTConnectFailedView = new MusicPlayerBTConnectFailedView(); @@ -1518,7 +1518,7 @@ namespace OHOS /*切换到连接动画视图*/ bool PlayersView::ChangeToMusicConnectingView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicConnectingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicConnectingView"); if (group[thisView] == nullptr) { musicPlayerConnectingView = new AiVoiceConnectingView(); @@ -1542,7 +1542,7 @@ namespace OHOS bool PlayersView::ChangeToMusicPlayerTipView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicPlayerTipView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicPlayerTipView"); if (group[thisView] == nullptr) { musicPlayerTipView = new MusicPlayerTipView(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp index af5c3e3ad..49a27d4b6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordDeleteView.cpp @@ -10,13 +10,13 @@ namespace OHOS RecordDeleteView::RecordDeleteView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::RecordDeleteView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::RecordDeleteView"); g_pRecordDeleteView = this; } RecordDeleteView::~RecordDeleteView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::~RecordDeleteView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordDeleteView::~RecordDeleteView"); ClearAll(); g_pRecordDeleteView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordListView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordListView.cpp index 43c317f0c..330f48c50 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordListView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordListView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-02-27 09:16:50 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-21 10:15:26 + * @LastEditTime: 2024-11-05 14:39:41 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordListView.cpp */ @@ -107,7 +107,7 @@ namespace OHOS // 每次录音完将数据刷新显示到list void RecordListView::RefreshRecordingListData(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListView::RefreshRecordingListData"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::RefreshRecordingListData"); RecordingModel::GetInstance()->InitRecordingListItem(); int num = RecordingModel::GetInstance()->GetRecordingListNum(); if (p_RecordingListAdapter != nullptr && recordList != nullptr) @@ -138,7 +138,7 @@ namespace OHOS recordList->RefreshList(); recordList->Invalidate(); } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListView::RefreshRecordingListData over!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListView::RefreshRecordingListData over!!"); } return; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingModel.cpp index 99cbf0231..e07dc4047 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingModel.cpp @@ -252,12 +252,12 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Resource new fail"); return OHOS_FAILURE; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Player uri %s.", Uri.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Player uri %s.", Uri.c_str()); PlayerCtr->SetSource(*Resource); PlayerCtr->Prepare(); ret = PlayerCtr->GetDuration(DurationTime); ConvertMillisecondToTime(DurationTime); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%s,%d] GetDuration:%lld,%s, ret:%d", __func__, __LINE__, DurationTime, TotalRecordDuration.c_str(), ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%s,%d] GetDuration:%lld,%s, ret:%d", __func__, __LINE__, DurationTime, TotalRecordDuration.c_str(), ret); /* -------------------------------------------------------------------------- */ if (!IsActivateAudioInterrupt) { @@ -269,7 +269,7 @@ namespace OHOS WEARABLE_LOGD(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); p_RecordingPlayerInterruptListener = std::make_shared(); if (p_RecordingPlayerInterruptListener.get() == nullptr) { @@ -401,7 +401,7 @@ namespace OHOS int RecordingModel::RecordingPlayerReset(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingModel::RecordingPlayerReset"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingModel::RecordingPlayerReset"); int ret = PlayerCtr->Stop(); if (ret != 0) { @@ -441,7 +441,7 @@ namespace OHOS return; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NextPlayout before index %d,filename %s", GetClickRecordingIndex(), GetCurrentPlayRecordingName().c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NextPlayout before index %d,filename %s", GetClickRecordingIndex(), GetCurrentPlayRecordingName().c_str()); if ((index > num - 1) || (index < 0)) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "currentIndex err"); @@ -449,13 +449,13 @@ namespace OHOS return; } SetClickRecordingIndex(--index < 0 ? num - 1 : index); // 如果从第一首录音设置上一首，那就跳到最后一首 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NextPlayout after index %d,filename %s", GetClickRecordingIndex(), GetCurrentPlayRecordingName().c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NextPlayout after index %d,filename %s", GetClickRecordingIndex(), GetCurrentPlayRecordingName().c_str()); SetRecordingPlayerUri(directory + GetCurrentPlayRecordingName() + ".mp3"); SetCircleProgress(0); int32_t ret; int32_t playerState; PlayerCtr->GetPlayerState(playerState); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerState Value %d.", playerState); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "playerState Value %d.", playerState); if ((playerState == PlayerStates::PLAYER_STARTED) || (playerState == PlayerStates::PLAYER_PLAYBACK_COMPLETE)) { /* start play */ @@ -501,7 +501,7 @@ namespace OHOS return; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NextPlayout before index %d,filename %s", GetClickRecordingIndex(), GetCurrentPlayRecordingName().c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NextPlayout before index %d,filename %s", GetClickRecordingIndex(), GetCurrentPlayRecordingName().c_str()); if ((index > num - 1) || (index < 0)) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "currentIndex err"); @@ -509,13 +509,13 @@ namespace OHOS return; } SetClickRecordingIndex(++index > num - 1 ? 0 : index); // 如果从最后一首录音设置下一首，那就跳到第一首 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NextPlayout after index %d,filename %s", GetClickRecordingIndex(), GetCurrentPlayRecordingName().c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NextPlayout after index %d,filename %s", GetClickRecordingIndex(), GetCurrentPlayRecordingName().c_str()); SetRecordingPlayerUri(directory + GetCurrentPlayRecordingName() + ".mp3"); SetCircleProgress(0); int32_t ret; int32_t playerState; PlayerCtr->GetPlayerState(playerState); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerState Value %d.", playerState); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "playerState Value %d.", playerState); if ((playerState == PlayerStates::PLAYER_STARTED) || (playerState == PlayerStates::PLAYER_PLAYBACK_COMPLETE)) { /* start play */ @@ -672,7 +672,7 @@ namespace OHOS Recordings.push_back({i, GetCurrentPlayRecordingName(info[i].recordingFileName), info[i].recordingDuration, info[i].recordingTime}); } } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingModel::InitRecordingListItem over!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingModel::InitRecordingListItem over!!"); } /* @@ -892,7 +892,7 @@ namespace OHOS return OHOS_FAILURE; } name = directory + name.append(".txt"); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:RecordDataWriteToFile %s", __LINE__, name.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:RecordDataWriteToFile %s", __LINE__, name.c_str()); FILE *fp = fopen(name.c_str(), "wb+"); if (nullptr == fp) { @@ -910,7 +910,7 @@ namespace OHOS size_t ret = fwrite((void *)&recordingInfo, sizeof(RecordingInfo), 1, fp); fclose(fp); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:RecordDataWriteToFile success", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:RecordDataWriteToFile success", __LINE__); return OHOS_SUCCESS; } @@ -923,7 +923,7 @@ namespace OHOS return OHOS_FAILURE; } name = directory + name.append(".txt"); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:RecordDataReadToFile %s", __LINE__, name.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:RecordDataReadToFile %s", __LINE__, name.c_str()); FILE *fp = fopen(name.c_str(), "rb"); if (fp == nullptr) { @@ -933,15 +933,15 @@ namespace OHOS fread((void *)&recordingInfo, sizeof(RecordingInfo), 1, fp); printfRecordData(); fclose(fp); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:RecordDataReadToFile success", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:RecordDataReadToFile success", __LINE__); return OHOS_SUCCESS; } void RecordingModel::printfRecordData() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "recordingFileName %s", recordingInfo.recordingFileName); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "recordingDuration %s", recordingInfo.recordingDuration); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "recordingTime %s", recordingInfo.recordingTime); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "recordingFileName %s", recordingInfo.recordingFileName); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "recordingDuration %s", recordingInfo.recordingDuration); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "recordingTime %s", recordingInfo.recordingTime); } /*设置当前哪个子视图是可见的*/ @@ -982,7 +982,7 @@ namespace OHOS { RecordingSpaceIsOut = false; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingModel::CheckRecordingSpaceOut:%d", RecordingSpaceIsOut); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingModel::CheckRecordingSpaceOut:%d", RecordingSpaceIsOut); } bool RecordingModel::GetCheckRecordingSpaceOut(void) @@ -1086,7 +1086,7 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_RecordingTimes + g_TotalUsedTime = %d", g_RecordingTimes + g_TotalUsedTime); if (RecordingModel::GetInstance()->CheckRecordingTimeOut(g_RecordingTimes + g_TotalUsedTime)) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Recording_TimerCallback g_TotalUsedSpace >= TOTAL_RECORDING_TIME"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Recording_TimerCallback g_TotalUsedSpace >= TOTAL_RECORDING_TIME"); // 录取时长不足，停止录制并弹出警告 if (RecordingPresenter::GetInstance()) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp index e7846e738..ac456644a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-30 09:14:38 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-21 17:01:15 + * @LastEditTime: 2024-11-05 14:38:39 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp */ @@ -258,7 +258,7 @@ namespace OHOS if (strcmp(view.GetViewId(), RECORD_BUTTON) == 0) { int g_TotalUsedTime = RecordingModel::GetInstance()->GetUsedRecordingTime(); // 已用时间 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "g_TotalUsedTime:%d", g_TotalUsedTime); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_TotalUsedTime:%d", g_TotalUsedTime); if (p_RecordingModel->CheckRecordingTimeOut(g_TotalUsedTime) || p_RecordingModel->GetRecordingListNum() >= MAX_RECORDING_NUM || p_RecordingModel->GetCheckRecordingSpaceOut()) { @@ -329,7 +329,7 @@ namespace OHOS void RecordingPresenter::SetCircleProgress() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPresenter::SetCircleProgress"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPresenter::SetCircleProgress"); RecordingPlayerView *p_RecordingPlayerView = RecordingPlayerView::GetInstance(); if (p_RecordingPlayerView == nullptr) { @@ -390,7 +390,7 @@ namespace OHOS UNUSED(event); RecordingListitemView *p_RecordingListitemView = static_cast(&view); int index = p_RecordingListitemView->GetRecordingListIndex(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListViewListener::OnClick index:%d", index); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordListViewListener::OnClick index:%d", index); if (index >= RecordingModel::GetInstance()->GetRecordingListNum()) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordListViewListener::OnClick is no index"); @@ -481,16 +481,16 @@ namespace OHOS state = p_RecordingPlayerView->GetPlayerButtonState(); playerState = p_RecordingModel->GetRecordingPlayerState(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "buttonState = %d playerState = %d", state, playerState); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "buttonState = %d playerState = %d", state, playerState); if (state == UICheckBox::UICheckBoxState::SELECTED) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "state == SELECTED"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "state == SELECTED"); if (playerState == PlayerStates::PLAYER_PAUSED) { ret = p_RecordingModel->GetPlayerCtr()->Play(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Play, ret:%d", ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Play, ret:%d", ret); } else { @@ -503,9 +503,9 @@ namespace OHOS } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "state == UNSELECTED"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "state == UNSELECTED"); ret = p_RecordingModel->GetPlayerCtr()->Pause(); // 本地暂停 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Pause, ret:%d", ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Pause, ret:%d", ret); } } @@ -563,12 +563,12 @@ namespace OHOS */ RecordingPlayerInterruptListener::RecordingPlayerInterruptListener() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::RecordingPlayerInterruptListener"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::RecordingPlayerInterruptListener"); } RecordingPlayerInterruptListener::~RecordingPlayerInterruptListener() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::~RecordingPlayerInterruptListener"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::~RecordingPlayerInterruptListener"); } /* * 函数的调用通常发生在音频播放器或者任何使用音频资源的应用程序遇到外部中断事件时。 @@ -579,7 +579,7 @@ namespace OHOS */ void RecordingPlayerInterruptListener::OnInterrupt(int32_t type, int32_t hint) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::OnInterrupt"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::OnInterrupt"); if (type == INTERRUPT_TYPE_BEGIN && hint == INTERRUPT_HINT_PAUSE) // 这表明当某个中断事件开始时，如果接收到暂停的提示，应当暂停播放器的播放。 { PausePlayer(); @@ -610,7 +610,7 @@ namespace OHOS */ std::shared_ptr RecordingPlayerInterruptListener::GetPlayer() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::GetPlayer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::GetPlayer"); return player_; } @@ -620,7 +620,7 @@ namespace OHOS */ void RecordingPlayerInterruptListener::SetOwner(std::shared_ptr player) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::SetOwner"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::SetOwner"); player_ = player; } @@ -630,7 +630,7 @@ namespace OHOS */ void RecordingPlayerInterruptListener::SetPaused(bool value) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::SetPaused"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::SetPaused"); isPaused_ = value; } @@ -640,7 +640,7 @@ namespace OHOS */ void RecordingPlayerInterruptListener::SetResumed(bool value) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::SetResumed"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::SetResumed"); isResumed_ = value; } @@ -649,7 +649,7 @@ namespace OHOS */ void RecordingPlayerInterruptListener::ResetFlag(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::RestFlag"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::RestFlag"); isPaused_ = false; isDelayed_ = false; @@ -663,7 +663,7 @@ namespace OHOS */ bool RecordingPlayerInterruptListener::IsPaused() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::IsPaused"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::IsPaused"); return isPaused_; } @@ -673,7 +673,7 @@ namespace OHOS */ bool RecordingPlayerInterruptListener::IsDelayed() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::IsDelayed"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::IsDelayed"); return isDelayed_; } @@ -683,7 +683,7 @@ namespace OHOS */ bool RecordingPlayerInterruptListener::IsResumed() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::IsDelayed"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::IsDelayed"); return isResumed_; } @@ -693,7 +693,7 @@ namespace OHOS */ bool RecordingPlayerInterruptListener::IsBeginStopped() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::IsBeginStopped"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::IsBeginStopped"); return isBeginStopped_; } @@ -703,7 +703,7 @@ namespace OHOS */ bool RecordingPlayerInterruptListener::IsEndStopped() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::IsEndStopped"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::IsEndStopped"); return isEndStopped_; } @@ -715,7 +715,7 @@ namespace OHOS static void Pause(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[RecordingPlayerInterruptListener::PausePlayer] start"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[RecordingPlayerInterruptListener::PausePlayer] start"); int32_t state; int32_t ret; std::shared_ptr PlayerIntrptListener = @@ -751,14 +751,14 @@ namespace OHOS } PlayerIntrptListener->ResetFlag(); PlayerIntrptListener->SetPaused(true); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[RecordingPlayerInterruptListener::PausePlayer]"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[RecordingPlayerInterruptListener::PausePlayer]"); } } } static void Resume(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[RecordingPlayerInterruptListener::ResumePlayer] start"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[RecordingPlayerInterruptListener::ResumePlayer] start"); int32_t state; int32_t ret; /* ----------------------------- 1.获取播放器中断监听器实例 ----------------------------- */ @@ -798,7 +798,7 @@ namespace OHOS /* ------------------------------- 6.重置中断监听器状态 ------------------------------ */ PlayerIntrptListener->ResetFlag(); PlayerIntrptListener->SetResumed(true); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[RecordingPlayerInterruptListener::ResumePlayer]"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[RecordingPlayerInterruptListener::ResumePlayer]"); } } } @@ -814,7 +814,7 @@ namespace OHOS */ void RecordingPlayerInterruptListener::PausePlayer(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::PausePlayer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::PausePlayer"); PlayerPostGraphicEvent(Pause); } @@ -824,7 +824,7 @@ namespace OHOS */ void RecordingPlayerInterruptListener::ResumePlayer(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::ResumePlayer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::ResumePlayer"); PlayerPostGraphicEvent(Resume); } @@ -834,24 +834,24 @@ namespace OHOS */ void RecordingPlayerInterruptListener::StopPlayer(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::StopPlayer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerInterruptListener::StopPlayer"); PlayerPostGraphicEvent(Stop); } /* ---------------------------------- 播放器回调 --------------------------------- */ RecordingPlayerCallbackImpl::RecordingPlayerCallbackImpl() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerCallbackImpl::RecordingPlayerCallbackImpl"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerCallbackImpl::RecordingPlayerCallbackImpl"); } RecordingPlayerCallbackImpl::~RecordingPlayerCallbackImpl() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerCallbackImpl::~RecordingPlayerCallbackImpl"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerCallbackImpl::~RecordingPlayerCallbackImpl"); } void RecordingPlayerCallbackImpl::OnPlaybackComplete() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerCallbackImpl::OnPlaybackComplete"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerCallbackImpl::OnPlaybackComplete"); /* --------------------------- 处实现代码用于处理文件播放完成的事件 --------------------------- */ /* ----------------------- 用户在回调函数中不能有阻塞操作，也不能调用播放器接口 ----------------------- */ // 此处实现代码用于处理文件播放完成的事件 @@ -872,19 +872,19 @@ namespace OHOS void RecordingPlayerCallbackImpl::OnError(int32_t errorType, int32_t errorCode) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerCallbackImpl::OnError"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerCallbackImpl::OnError"); /* ------------------------------ 此处实现代码用于处理错误事件 ------------------------------ */ } void RecordingPlayerCallbackImpl::OnInfo(int type, int extra) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerCallbackImpl::OnInfo"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerCallbackImpl::OnInfo"); /* ------------------------------- 此处实现代码用于处理普通事件 ------------------------------ */ } void RecordingPlayerCallbackImpl::OnRewindToComplete() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingPlayerCallbackImpl::OnRewindToComplete"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingPlayerCallbackImpl::OnRewindToComplete"); /* ---------------------------- 此处实现代码用于处理进度控制完成的事件 ---------------------------- */ } } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingView.cpp index 5dcb6f150..484ef75b0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingView.cpp @@ -143,7 +143,7 @@ namespace OHOS { if (RecordingViewScrollView[thisView] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::ChangeRecordListView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::ChangeRecordListView"); p_RecordListView = new RecordListView(); if (p_RecordListView == nullptr) { @@ -171,7 +171,7 @@ namespace OHOS { if (RecordingViewScrollView[thisView] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::ChangeRecordGoingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::ChangeRecordGoingView"); p_RecordGoingView = new RecordGoingView(); if (p_RecordGoingView == nullptr) { @@ -191,7 +191,7 @@ namespace OHOS { if (RecordingViewScrollView[thisView] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::ChangeRecordingPlayerView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::ChangeRecordingPlayerView"); p_RecordingPlayerView = new RecordingPlayerView(); if (p_RecordingPlayerView == nullptr) { @@ -211,7 +211,7 @@ namespace OHOS { if (RecordingViewScrollView[thisView] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::ChangeRecordDeleteView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::ChangeRecordDeleteView"); p_RecordDeleteView = new RecordDeleteView(); if (p_RecordDeleteView == nullptr) { @@ -233,7 +233,7 @@ namespace OHOS { if (RecordingViewScrollView[thisView] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::ChangeRecordVolumeSettingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::ChangeRecordVolumeSettingView"); p_RecordingVolumeSettingView = new RecordingVolumeSettingView(); if (p_RecordingVolumeSettingView == nullptr) { @@ -251,7 +251,7 @@ namespace OHOS { if (RecordingViewScrollView[thisView] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RecordingView::ChangeRecordNumLimitView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RecordingView::ChangeRecordNumLimitView"); p_RecordingNumLimitView = new RecordingNumLimitView(); if (p_RecordingNumLimitView == nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp index d8d6bc281..22971d4bf 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-09-29 15:57:59 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-05 12:34:35 + * @LastEditTime: 2024-11-05 14:40:12 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp */ #include "respiratorytraining/include/RespiratoryTrainingDurationSelectionView.h" @@ -18,13 +18,13 @@ namespace OHOS static RespiratoryTrainingDurationSelectionView *g_pRespiratoryTrainingDurationSelectionView{nullptr}; RespiratoryTrainingDurationSelectionView::RespiratoryTrainingDurationSelectionView(/* args */) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingDurationSelectionView::RespiratoryTrainingDurationSelectionView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingDurationSelectionView::RespiratoryTrainingDurationSelectionView"); g_pRespiratoryTrainingDurationSelectionView = this; } RespiratoryTrainingDurationSelectionView::~RespiratoryTrainingDurationSelectionView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingDurationSelectionView::~RespiratoryTrainingDurationSelectionView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingDurationSelectionView::~RespiratoryTrainingDurationSelectionView"); ClearAll(); g_pRespiratoryTrainingDurationSelectionView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingModel.cpp index d054f787f..cafbf2c2d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingModel.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-11 16:26:20 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-09 15:09:06 + * @LastEditTime: 2024-11-05 14:40:25 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingModel.cpp */ #include "respiratorytraining/include/RespiratoryTrainingModel.h" @@ -183,7 +183,7 @@ namespace OHOS */ void RespiratoryTrainingModel::RT_StartTimer(uint64_t interval) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingModel::RT_StartTimer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingModel::RT_StartTimer"); /* -------------------------- 1.检查定时器是否已经存在，如果存在则返回 ------------------------- */ if (g_timer != NULL) { @@ -223,10 +223,10 @@ namespace OHOS */ void RespiratoryTrainingModel::RT_StopTimer(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingModel::RT_StopTimer"); // 检查定时器是否存在 if (g_timer != NULL) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingModel::RT_StopTimer"); osTimerStop(g_timer); // 删除定时器并置为 NULL osStatus_t ret = osTimerDelete(g_timer); diff --git a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp index d7c988c62..770d9b399 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingPresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:26:06 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-09 15:08:31 + * @LastEditTime: 2024-11-05 14:52:23 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/RespiratoryTraining/src/RespiratoryTrainingPresenter.cpp */ @@ -91,7 +91,7 @@ namespace OHOS { if (viewId == it->first) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "select time = %d", it->second); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "select time = %d", it->second); RespiratoryTrainingModel::GetInstance().SetRespiratoryTrainingSelectTime(it->second); if (RespiratoryTrainingDurationSelectionView::GetInstance()) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp index 64289037c..80e946ca7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-09 15:07:50 + * @LastEditTime: 2024-11-05 14:40:57 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/RespiratoryTraining/src/RespiratoryTrainingView.cpp */ @@ -43,7 +43,7 @@ namespace OHOS bool RespiratoryTrainingView::ChangeRespiratoryTrainingView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingView::ChangeRespiratoryTrainingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingView::ChangeRespiratoryTrainingView"); if (RespiratoryTrainingScrollView[thisView] == nullptr) { container_->Add(RespiratoryTrainingScrollView[thisView]); @@ -58,7 +58,7 @@ namespace OHOS bool RespiratoryTrainingView::ChangeRespiratoryTrainingCompletedView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingView::ChangeRespiratoryTrainingCompletedView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingView::ChangeRespiratoryTrainingCompletedView"); if (RespiratoryTrainingScrollView[thisView] == nullptr) { p_RespiratoryTrainingCompletedView = new RespiratoryTrainingCompletedView(); @@ -81,7 +81,7 @@ namespace OHOS bool RespiratoryTrainingView::ChangeRespiratoryTrainingDurationSelectionView(int16_t thisView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingView::ChangeRespiratoryTrainingCompletedView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingView::ChangeRespiratoryTrainingCompletedView"); if (RespiratoryTrainingScrollView[thisView] == nullptr) { p_RespiratoryTrainingDurationSelectionView = new RespiratoryTrainingDurationSelectionView(); @@ -475,7 +475,7 @@ namespace OHOS void RespiratoryTrainingView::RespiratoryTrainingViewInit(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingView::RespiratoryTrainingViewInit"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingView::RespiratoryTrainingViewInit"); if (!InitRespiratoryTrainingScrollView() || !InitRespiratoryTrainingElements() || !InitRespiratoryTrainingElements2() || !InitRespiratoryTrainingCallBackAndAnimator()) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListAdapter.cpp index a67e6b402..83e52d74f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListAdapter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListAdapter.cpp @@ -1,5 +1,3 @@ - - #include "schedule/include/ScheduleListAdapter.h" #include "wearable_log.h" @@ -25,7 +23,7 @@ namespace OHOS UIView * ScheduleListAdapter::GetView(UIView * inView, int16_t index) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:GetView,%d", __LINE__, index); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:GetView,%d", __LINE__, index); if(nodeList_.IsEmpty() || nodeList_.Size() <= index || 0 > index) { return nullptr; @@ -40,14 +38,14 @@ namespace OHOS if (nullptr == inView) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:GetView", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:GetView", __LINE__); item = new ScheduleListItem(); if (nullptr == item) return nullptr; } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:GetView", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:GetView", __LINE__); item = static_cast(inView); } @@ -73,7 +71,7 @@ namespace OHOS void ScheduleListAdapter::AddListItem(const ScheduleListItemInfo &item) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:AddListItem", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:AddListItem", __LINE__); nodeList_.PushBack(item); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListItem.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListItem.cpp index aa3f8bf2a..40fb26d0f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListItem.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleListItem.cpp @@ -91,7 +91,7 @@ namespace OHOS void ScheduleListItem::ResetItemStyle(const ScheduleListItemInfo &itemInfo) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:ResetItemStyle,%d,%d", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:ResetItemStyle,%d,%d", __LINE__, itemInfo.IsDateItem, itemInfo.ChildIndex); if(true == itemInfo.IsDateItem) diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleModel.cpp index 57353d86d..fb81711e7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleModel.cpp @@ -75,7 +75,7 @@ namespace OHOS void ScheduleModel::ScheduleOriginalDataSetByApp(ScheduleRevData * data, uint8_t index, bool is_finish) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleOriginalDataSetByApp,%d,%d", index, is_finish); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScheduleOriginalDataSetByApp,%d,%d", index, is_finish); uint8_t len = 0; if(index>=SCHEDULE_DATA_COUNT_MAX) { @@ -102,7 +102,7 @@ namespace OHOS void ScheduleModel::ScheduleOriginalDataSetByUI(uint8_t index) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleModel::ScheduleOriginalDataSetByUI,%d", index); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScheduleModel::ScheduleOriginalDataSetByUI,%d", index); uint8_t DataCount = ScheduleOriginalDataCountGet(); uint8_t i = 0; @@ -126,7 +126,7 @@ namespace OHOS void ScheduleModel::ScheduleOriginalDataToItemData(uint8_t DataCount) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleModel::ScheduleOriginalDataToItemData,%d", DataCount); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScheduleModel::ScheduleOriginalDataToItemData,%d", DataCount); uint8_t i = 0; uint8_t j = 0; @@ -193,13 +193,13 @@ namespace OHOS ScheduleItemDataCountSet(ItemCount); } - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleModel::ScheduleOriginalDataToItemData,%d,%s", j, ScheduleItemData_[0].DateStr.c_str()); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScheduleModel::ScheduleOriginalDataToItemData,%d,%s", j, ScheduleItemData_[0].DateStr.c_str()); } void ScheduleModel::DataStringToCharArray(void) { uint8_t DataCount = ScheduleOriginalDataCountGet(); - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:DataStringToCharArray,%d", __LINE__, DataCount); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:DataStringToCharArray,%d", __LINE__, DataCount); memset(C_ScheduleOriginalData_, 0x0, sizeof(C_ScheduleRevData) * SCHEDULE_DATA_COUNT_MAX); @@ -215,7 +215,7 @@ namespace OHOS void ScheduleModel::DataCharArrayToString(uint8_t DataCount) { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:DataCharArrayToString,%d", __LINE__, DataCount); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:DataCharArrayToString,%d", __LINE__, DataCount); uint8_t i = 0; for(i = 0; i < DataCount; i++) @@ -234,7 +234,7 @@ namespace OHOS FILE *fp = fopen(SCHEDULE_DATA_FILE, "rb"); if (fp == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:C_ScheduleDataReadFromFile", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:C_ScheduleDataReadFromFile", __LINE__); return OHOS_FAILURE; } @@ -242,7 +242,7 @@ namespace OHOS int len = ftell(fp); fseek(fp, 0, SEEK_SET); uint8_t DataCount = len / sizeof(C_ScheduleRevData); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:%d,%d", __LINE__, DataCount, len); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:%d,%d", __LINE__, DataCount, len); fread((char *)C_ScheduleOriginalData_, sizeof(C_ScheduleRevData), DataCount, fp); fclose(fp); @@ -258,7 +258,7 @@ namespace OHOS int ScheduleModel::ScheduleDataWriteToFile(void) { uint8_t DataCount = ScheduleOriginalDataCountGet(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:ScheduleDataWriteToFile,%d", __LINE__, DataCount); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:ScheduleDataWriteToFile,%d", __LINE__, DataCount); if(0 == DataCount) { return OHOS_FAILURE; @@ -267,7 +267,7 @@ namespace OHOS FILE *fp = fopen(SCHEDULE_DATA_FILE, "wb+"); if (nullptr == fp) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:ScheduleDataWriteToFile fail", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:ScheduleDataWriteToFile fail", __LINE__); return OHOS_FAILURE; } @@ -276,10 +276,10 @@ namespace OHOS size_t ret = fwrite(C_ScheduleOriginalData_, sizeof(C_ScheduleRevData), DataCount, fp); if (DataCount != ret) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:ScheduleDataWriteToFile fail", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:ScheduleDataWriteToFile fail", __LINE__); } fclose(fp); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:ScheduleDataWriteToFile success", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:ScheduleDataWriteToFile success", __LINE__); return OHOS_SUCCESS; } @@ -294,12 +294,12 @@ namespace OHOS int C_ScheduleDataReadFromFile(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:C_ScheduleDataReadFromFile", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:C_ScheduleDataReadFromFile", __LINE__); return OHOS::ScheduleModel::GetInstance().ScheduleDataReadFromFile(); } int C_ScheduleDataWriteToFile(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:C_ScheduleDataWriteToFile", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:C_ScheduleDataWriteToFile", __LINE__); return OHOS::ScheduleModel::GetInstance().ScheduleDataWriteToFile(); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp index a5dc54c97..ce8b127a8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/SchedulePresenter.cpp @@ -37,14 +37,14 @@ namespace OHOS // 启动时执行的逻辑 void SchedulePresenter::OnStart() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SchedulePresenter::OnStart"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SchedulePresenter::OnStart"); Presenter::OnStart(); } // 页面已经展示后的调用逻辑 void SchedulePresenter::OnResume(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SchedulePresenter::OnResume"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SchedulePresenter::OnResume"); Presenter::OnResume(); if (nullptr == view_) { @@ -71,11 +71,11 @@ namespace OHOS bool SchedulePresenter::OnClick(UIView &view, const ClickEvent &event) { UNUSED(event); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:OnClick", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:OnClick", __LINE__); if (nullptr == &view) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:OnClick", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:OnClick", __LINE__); return false; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp index 86b737da4..e170c9042 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/schedule/src/ScheduleView.cpp @@ -9,13 +9,13 @@ namespace OHOS ScheduleView::ScheduleView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleView::ScheduleView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScheduleView::ScheduleView"); p_ScheduleViewInstance = this; } ScheduleView::~ScheduleView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleView::~ScheduleView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScheduleView::~ScheduleView"); p_ScheduleViewInstance = nullptr; } @@ -26,7 +26,7 @@ namespace OHOS void ScheduleView::OnStart() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleView::OnStart"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScheduleView::OnStart"); View::OnStart(); SetContainerView(new UIViewGroup()); @@ -59,7 +59,7 @@ namespace OHOS void ScheduleView::OnSetUpView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleView::OnSetUpView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScheduleView::OnSetUpView"); View::OnSetUpView(); DisplayDataOrNoScreen(); @@ -68,13 +68,13 @@ namespace OHOS void ScheduleView::OnTearDownView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleView::OnTearDownView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScheduleView::OnTearDownView"); View::OnTearDownView(); } void ScheduleView::OnStop() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScheduleView::OnStop"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScheduleView::OnStop"); View::OnStop(); RootView::GetInstance()->ClearOnKeyActListener(); @@ -120,12 +120,12 @@ namespace OHOS { if(0 == ScheduleModel::GetInstance().ScheduleItemDataCountGet()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:DisplayMainScreen", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:DisplayMainScreen", __LINE__); DisplaySelectScreen(ENUM_SCHEDULE_SCREEN_NO_DATA); } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]:DisplayMainScreen", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:DisplayMainScreen", __LINE__); DisplaySelectScreen(ENUM_SCHEDULE_SCREEN_LIST); ResetScheduleList(); @@ -215,7 +215,7 @@ namespace OHOS UIViewGroup * ScheduleView::InitNoDataScreen() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__); if(nullptr == NoDataGroup_) { NoDataGroup_ = new UIViewGroup(); @@ -301,7 +301,7 @@ namespace OHOS UIViewGroup * ScheduleView::InitDataScreen() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__); if(nullptr == DataGroup_) { DataGroup_ = new UIViewGroup(); @@ -416,7 +416,7 @@ namespace OHOS UIScrollView * ScheduleView::InitContentScreen() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__); if(nullptr == ContentGroup_) { ContentGroup_ = new UIScrollView(); @@ -645,7 +645,7 @@ namespace OHOS UIViewGroup * ScheduleView::InitDeleteScreen() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]", __LINE__); if(nullptr == DeleteGroup_) { DeleteGroup_ = new UIViewGroup(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingPresenter.cpp index ac621c4cb..4a38add32 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingPresenter.cpp @@ -70,12 +70,10 @@ namespace OHOS if (state == UICheckBox::UICheckBoxState::SELECTED) { CheckBoxSelectCount += 1; - printf("CheckBoxSelectCount:%d\n", CheckBoxSelectCount); } else { CheckBoxSelectCount -= 1; - printf("CheckBoxSelectCount:%d\n", CheckBoxSelectCount); } if (CheckBoxSelectCount > 3) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingView.cpp index a09ef611c..79fc0170a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-07-12 09:55:29 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-25 14:53:50 + * @LastEditTime: 2024-11-05 14:41:44 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingView.cpp */ @@ -191,7 +191,7 @@ namespace OHOS int16_t headY = 0; int NUM_2 = 2; int screen_h = Screen::GetInstance().GetHeight(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetStartIndex = %d,GetListItemNum = %d", presenter_->GetStartIndex(), presenter_->GetListItemNum()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GetStartIndex = %d,GetListItemNum = %d", presenter_->GetStartIndex(), presenter_->GetListItemNum()); if (presenter_->GetStartIndex() >= presenter_->GetListItemNum()) { startIndex = presenter_->GetListItemNum() - 1; @@ -215,7 +215,7 @@ namespace OHOS headY = screen_h / NUM_2; } } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "startIndex = %d,headY = %d", startIndex, headY); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "startIndex = %d,headY = %d", startIndex, headY); contentList->SetStartIndex(startIndex); contentList->SetAdapter(listAdapter); contentList->RefreshList(); @@ -229,6 +229,6 @@ namespace OHOS int16_t listHeadIndex = contentList->GetChildrenHead()->GetViewIndex(); presenter_->SetHeadItemY(listHeadY); presenter_->SetStartIndex(listHeadIndex); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "listHeadY = %d,listHeadIndex = %d", listHeadY, listHeadIndex); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "listHeadY = %d,listHeadIndex = %d", listHeadY, listHeadIndex); } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumeView.cpp index 7ffafebaf..784dd1563 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumeView.cpp @@ -13,13 +13,13 @@ namespace OHOS CallVolumeView::CallVolumeView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CallVolumeView::CallVolumeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CallVolumeView::CallVolumeView"); g_pCallVolumeView = this; } CallVolumeView::~CallVolumeView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CallVolumeView::~CallVolumeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CallVolumeView::~CallVolumeView"); g_pCallVolumeView = nullptr; } @@ -44,7 +44,7 @@ namespace OHOS } delete p_SoundAndVibrationVolumeSettingView; p_SoundAndVibrationVolumeSettingView = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CallVolumeView::ClearAll end!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CallVolumeView::ClearAll end!!"); } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp index cd5b8a08e..b1b8037c0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-02-19 10:39:11 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-17 11:10:22 + * @LastEditTime: 2024-11-05 14:42:21 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp */ @@ -136,7 +136,7 @@ namespace OHOS else if ((view_->GetVibrationModeView() != nullptr) && (&view == view_->GetVibrationModeView()->GetVibrationModeLabelButton())) { int VibrationMode = view_->GetVibrationModeView()->GetVibrationModePicker()->GetSelected(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VibrationMode = %d", VibrationMode); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "VibrationMode = %d", VibrationMode); SoundAndVibrationModel::GetInstance()->SetVibrationReminderToggleButtonStaus(VibrationMode); // uapi_vibrationModeSet(VibrationMode); ui_api_vibrate_once_func(); @@ -151,11 +151,11 @@ namespace OHOS switch (state) { case UICheckBox::SELECTED: - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SilentMode is enable!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SilentMode is enable!"); p_SoundAndVibrationModel->SetSilentModeToggleButtonStatus(true); break; case UICheckBox::UNSELECTED: - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SilentMode is disable!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SilentMode is disable!"); p_SoundAndVibrationModel->SetSilentModeToggleButtonStatus(false); break; default: diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp index 3f656e236..04840cc8c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-02-19 10:39:14 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-27 18:30:07 + * @LastEditTime: 2024-11-05 14:42:29 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationView.cpp */ #include "soundandvibration/include/SoundAndVibrationView.h" @@ -32,13 +32,13 @@ namespace OHOS SoundAndVibrationView::SoundAndVibrationView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationView::SoundAndVibrationView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationView::SoundAndVibrationView"); g_pSoundAndVibrationView = this; } SoundAndVibrationView::~SoundAndVibrationView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationView::~SoundAndVibrationView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationView::~SoundAndVibrationView"); g_pSoundAndVibrationView = nullptr; } @@ -87,7 +87,7 @@ namespace OHOS } delete SoundAndVibrationScrollView[SOUNDANDVIBRATIONVIEW]; SoundAndVibrationScrollView[SOUNDANDVIBRATIONVIEW] = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationView::ClearAll end!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationView::ClearAll end!!"); } delete container_; container_ = nullptr; @@ -401,7 +401,7 @@ namespace OHOS { if (SoundAndVibrationScrollView[thisView] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationView::ChangeVibrationModeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationView::ChangeVibrationModeView"); if (vibrationModeView == nullptr) { vibrationModeView = new VibrationModeView(); @@ -486,7 +486,7 @@ namespace OHOS // 更新静音模式开关状态 bool SoundAndVibrationView::UpdateSilentModeSwitchStatus(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationView::UpdateSilentModeSwitchStatus"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationView::UpdateSilentModeSwitchStatus"); if (SilentModeToggleButton == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationView::SilentModeToggleButton is nullptr!!"); diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp index 863643b50..42fd9536a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-19 10:08:31 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-27 15:08:56 + * @LastEditTime: 2024-11-05 14:42:59 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp */ #include "soundandvibration/include/SoundAndVibrationVolumeSettingPresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp index cbaa8151a..ca30ca5cb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp @@ -52,7 +52,7 @@ namespace OHOS } delete ScrollView; ScrollView = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationVolumeSettingView::ClearAll end!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SoundAndVibrationVolumeSettingView::ClearAll end!!"); } } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumeView.cpp index f81f29a6d..78583a46d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumeView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-12 11:44:04 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-27 18:01:41 + * @LastEditTime: 2024-11-05 14:43:28 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumeView.cpp */ #include "soundandvibration/include/SystemVolumeView.h" @@ -23,13 +23,13 @@ namespace OHOS SystemVolumeView::SystemVolumeView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemVolumeView::SystemVolumeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemVolumeView::SystemVolumeView"); g_pSystemVolumeView = this; } SystemVolumeView::~SystemVolumeView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemVolumeView::~SystemVolumeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemVolumeView::~SystemVolumeView"); g_pSystemVolumeView = nullptr; } @@ -54,7 +54,7 @@ namespace OHOS } delete p_SoundAndVibrationVolumeSettingView; p_SoundAndVibrationVolumeSettingView = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemVolumeView::ClearAll end!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemVolumeView::ClearAll end!!"); } } @@ -143,7 +143,7 @@ namespace OHOS return false; } int SystemVolume = uapi_systemVolumeGet(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemVolume = %d", SystemVolume); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemVolume = %d", SystemVolume); p_SoundAndVibrationVolumeSettingView->GetVolumeProcess()->SetValue(SystemVolume); return true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp index 7e6d001d6..7d6f746ff 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-22 14:35:22 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-27 18:14:37 + * @LastEditTime: 2024-11-05 14:43:39 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp */ #include "soundandvibration/include/VibrationModeView.h" @@ -20,13 +20,13 @@ namespace OHOS VibrationModeView::VibrationModeView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VibrationModeView::VibrationModeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "VibrationModeView::VibrationModeView"); g_pVibrationModeView = this; } VibrationModeView::~VibrationModeView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VibrationModeView::~VibrationModeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "VibrationModeView::~VibrationModeView"); ClearAll(); g_pVibrationModeView = nullptr; } @@ -63,7 +63,7 @@ namespace OHOS delete scrollView; scrollView = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VibrationModeView::ClearAll end!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "VibrationModeView::ClearAll end!!"); } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp index db51cfc72..998137d93 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/MainStopWatchPresenter.cpp @@ -198,7 +198,7 @@ namespace OHOS if (isStartMark == false) // 第一次标记 { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "isStartMark = %d", isStartMark); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "isStartMark = %d", isStartMark); mainStopWatchView->SetViewIsVisible(m_stopWatchlabel, false); SetShowTimeLableStyle(m_showTimelabel, 0, 60, 65, 78); mainStopWatchView->SetViewIsVisible(m_list, true); @@ -248,7 +248,7 @@ namespace OHOS if (isStartMark == true) // 重置标记 { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "isStartMark = %d", isStartMark); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "isStartMark = %d", isStartMark); mainStopWatchView->SetViewIsVisible(m_stopWatchlabel, true); SetShowTimeLableStyle(m_showTimelabel, 0, 160, 84, 94); mainStopWatchView->SetViewIsVisible(m_image, false); @@ -293,7 +293,7 @@ namespace OHOS bool MainStopWatchPresenter::OnChange(UICheckBox::UICheckBoxState state) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainStopWatchPresenter::OnChange,state = %d",state); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainStopWatchPresenter::OnChange,state = %d",state); if (state == UICheckBox::UICheckBoxState::SELECTED) { StopWatchModel::GetInstance()->StopWatch_StartTimer(STOPWATCH_TIMER_DURATION); // 开启定时器，如果定时器存在会直接返回 diff --git a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp index 5173de461..83af2f8c3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchRecordTimeToLimitView.cpp @@ -10,13 +10,13 @@ namespace OHOS StopWatchRecordTimeToLimitView::StopWatchRecordTimeToLimitView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StopWatchRecordTimeToLimitView::StopWatchRecordTimeToLimitView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StopWatchRecordTimeToLimitView::StopWatchRecordTimeToLimitView"); g_pStopWatchRecordTimeToLimitView = this; } StopWatchRecordTimeToLimitView::~StopWatchRecordTimeToLimitView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StopWatchRecordTimeToLimitView::~StopWatchRecordTimeToLimitView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StopWatchRecordTimeToLimitView::~StopWatchRecordTimeToLimitView"); ClearAll(); g_pStopWatchRecordTimeToLimitView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp index 7d3e79477..a90eb168f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp @@ -55,13 +55,13 @@ namespace OHOS SystemAboutTheWatchView::SystemAboutTheWatchView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::SystemAboutTheWatchView"); g_pSystemAboutTheWatchView = this; } SystemAboutTheWatchView::~SystemAboutTheWatchView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::~SystemAboutTheWatchView"); ClearAll(); g_pSystemAboutTheWatchView = nullptr; } @@ -348,7 +348,7 @@ namespace OHOS uint8_t ble_name[LABEL_FONTSIZE] = {0}; uint32_t ble_name_len = sizeof(ble_name); errcode_t ret = uapi_get_nv_btname(ble_name, &ble_name_len); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "get btname %s ,ret 0x%X\n", ble_name, ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "get btname %s ,ret 0x%X\n", ble_name, ret); Config = { .left = LABEL_X, @@ -394,7 +394,7 @@ namespace OHOS ret = uapi_get_nv_btaddr((uint8_t *)btaddr, &len); sprintf((char *)btaddr_str, "%02X:%02X:%02X:%02X:%02X:%02X", btaddr[0], btaddr[1], btaddr[2], btaddr[3], btaddr[4], btaddr[5]); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "get btaddr %s , ret 0x%X\n", btaddr_str, ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "get btaddr %s , ret 0x%X\n", btaddr_str, ret); Config = { .left = LABEL_X, .top = WATCH_BT_ADDR_VALUE_TOP, diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp index cfbe5c79a..569f83329 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemFactoryResetView.cpp @@ -11,13 +11,13 @@ namespace OHOS SystemFactoryResetView::SystemFactoryResetView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::SystemFactoryResetView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::SystemFactoryResetView"); g_pSystemFactoryResetView = this; } SystemFactoryResetView::~SystemFactoryResetView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::~SystemFactoryResetView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemFactoryResetView::~SystemFactoryResetView"); ClearAll(); g_pSystemFactoryResetView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemLogModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemLogModel.cpp index 31db5284a..e8276fb6b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemLogModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemLogModel.cpp @@ -263,9 +263,9 @@ bool SystemLogModel::canSyncFile(std::string path, uint32_t path_max_size, uint32_t download_size) { // 获取文件夹的大小 long long usedSpace = getFolderSize(path.c_str()); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "usedSpace = %lld", usedSpace); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "path_max_size = %lld", path_max_size); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "download_size = %lld", download_size); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "usedSpace = %lld", usedSpace); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "path_max_size = %lld", path_max_size); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "download_size = %lld", download_size); return (usedSpace + download_size) <= path_max_size; } @@ -408,7 +408,7 @@ size_t SystemLogModel::get_popup_windows_log_size() const { void SystemLogModel::clear_popup_windows_log() { // 清空当前的日志 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "clear_popup_windows_log"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "clear_popup_windows_log"); popup_windows_log.clear(); std::ofstream outFile(SYSTEM_LOG_FILE_PATH_POPUP_WINDOWS, std::ios::trunc); diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp index 383fb1779..a4948697d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp @@ -24,14 +24,14 @@ namespace OHOS SystemPresenter::SystemPresenter() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemPresenter::SystemPresenter"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemPresenter::SystemPresenter"); g_pSystemPresenter = this; systemModel = SystemModel::GetInstance(); } SystemPresenter::~SystemPresenter() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemPresenter::~SystemPresenter"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemPresenter::~SystemPresenter"); g_pSystemPresenter = nullptr; } @@ -133,16 +133,16 @@ namespace OHOS if (strcmp(view.GetViewId(), SYSTEMABOUTTHEWATCHVIEWID) == 0) // 连续点击进入产测模式 { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchTitle"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchTitle"); if (time == 0) { time = event.GetTimeStamp(); OnClick_num = 1; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "222 %d", time); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "222 %d", time); } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "111 %d", event.GetTimeStamp()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "111 %d", event.GetTimeStamp()); if (event.GetTimeStamp() - time < 2000) { OnClick_num++; diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemSuperviseView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemSuperviseView.cpp index f480bee18..79cbfc0ea 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemSuperviseView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemSuperviseView.cpp @@ -8,13 +8,13 @@ namespace OHOS SystemSuperviseView::SystemSuperviseView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemSuperviseView::SystemSuperviseView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemSuperviseView::SystemSuperviseView"); g_pSystemSuperviseView = this; } SystemSuperviseView::~SystemSuperviseView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemSuperviseView::~SystemSuperviseView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemSuperviseView::~SystemSuperviseView"); ClearAll(); g_pSystemSuperviseView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp index 246960cf2..a92489d17 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp @@ -12,13 +12,13 @@ namespace OHOS SystemView::SystemView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::SystemView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemView::SystemView"); g_pSystemView = this; } SystemView::~SystemView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::~SystemView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemView::~SystemView"); g_pSystemView = nullptr; } @@ -103,7 +103,7 @@ namespace OHOS { SystemScrollView[i] = nullptr; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ClearAll end!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemView::ClearAll end!!"); } UILabelButtonExt *SystemView::SystemViewLabelButtonInit(ButtonConfig &buttonconfig) @@ -143,7 +143,7 @@ namespace OHOS bool SystemView::CreateSystemViewLabel(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::CreateSystemViewLabel"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemView::CreateSystemViewLabel"); LabelConfig labelConfig = { .left = 83, .top = 50, @@ -208,7 +208,7 @@ namespace OHOS bool SystemView::CreateSystemViewLabelButton(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::CreateSystemViewLabelButton"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemView::CreateSystemViewLabelButton"); struct ButtonSetup { int y; @@ -249,7 +249,7 @@ namespace OHOS bool SystemView::CreateSystemScrollView(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::CreateSystemScrollView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemView::CreateSystemScrollView"); SystemScrollView[SYSTEMVIEW] = new UIScrollView(); if (SystemScrollView[SYSTEMVIEW] == nullptr) { @@ -296,7 +296,7 @@ namespace OHOS void SystemView::CreateSystemView(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::CreateSystemView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemView::CreateSystemView"); if (!CreateSystemScrollView() || !CreateSystemViewLabelButton() || !CreateSystemViewLabel()) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::CreateSystemView fail!!"); @@ -388,7 +388,7 @@ namespace OHOS { if (SystemScrollView[thisView] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemAboutView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemAboutView"); p_SystemAboutTheWatchView = new SystemAboutTheWatchView(); if (p_SystemAboutTheWatchView == nullptr) { @@ -406,7 +406,7 @@ namespace OHOS { if (SystemScrollView[thisView] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemFactoryResetView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemFactoryResetView"); p_SystemFactoryResetView = new SystemFactoryResetView(); if (p_SystemFactoryResetView == nullptr) { @@ -424,7 +424,7 @@ namespace OHOS { if (SystemScrollView[thisView] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemRestartView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemRestartView"); p_SystemRestart = new SystemRestart(); if (p_SystemRestart == nullptr) { @@ -442,7 +442,7 @@ namespace OHOS { if (SystemScrollView[thisView] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemShutdownView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemShutdownView"); p_SystemShutdown = new SystemShutdown(); if (p_SystemShutdown == nullptr) { @@ -460,7 +460,7 @@ namespace OHOS { if (SystemScrollView[thisView] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemShutdownAnimatorView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemView::ChangeToSystemShutdownAnimatorView"); p_ShutDownImageAnimatorView = new ShutDownImageAnimatorView(); if (p_ShutDownImageAnimatorView == nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp index fdcc17983..678c2b149 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp @@ -1,8 +1,8 @@ /* * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:26:25 - * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-07-06 14:25:30 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-11-05 14:47:26 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp */ #include "systemupdate/include/SystemUpdateModel.h" @@ -61,7 +61,7 @@ namespace OHOS falg=false; } } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"UPDATAREPORT IS OK!\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"UPDATAREPORT IS OK!\r\n"); } int start_report_timer(void) @@ -156,7 +156,7 @@ namespace OHOS return false; } fclose(fp); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "file open success fwpkg_is_ready"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "file open success fwpkg_is_ready"); return true; } return false; @@ -179,7 +179,7 @@ namespace OHOS char *buf=(char *)malloc(1024); memset((void*)buf,0,1024); int ret =fread(buf,1,1024,fp); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s\r\n",buf); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%s\r\n",buf); if(ret==0) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "fread %d",ret); @@ -214,7 +214,7 @@ namespace OHOS if(code==IOT_CODE_SUCCESS) { cJSON *data=cJSON_GetObjectItem(root, "data"); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, ""); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, ""); if(data!=NULL) { @@ -224,7 +224,7 @@ namespace OHOS { char *uri = cJSON_GetObjectItem(downloadFileVo, "url")->valuestring; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uri %s",uri); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "uri %s",uri); memset(uri_ota_package,0,UPDATAFWPKGPATHURL); sprintf((char *)uri_ota_package,"%s",uri); @@ -236,7 +236,7 @@ namespace OHOS char* targetVersion=cJSON_GetObjectItem(data,"targetVersion")->valuestring; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "fwpkg_size %d",fwpkg_size); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "fwpkg_size %d",fwpkg_size); memset(NEW_VISON,0,MSG_LEN); sprintf((char *)NEW_VISON,"%s",targetVersion); @@ -248,8 +248,8 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "code!=IOT_CODE_SUCCESS"); return false; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s",msg); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%s",msg); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); cJSON_Delete(root); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdatePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdatePresenter.cpp index f25e35472..550ef13bc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdatePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdatePresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:26:06 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-05-07 17:14:36 + * @LastEditTime: 2024-11-05 14:48:04 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdatePresenter.cpp */ @@ -69,11 +69,11 @@ namespace OHOS if (&view == systemUpdateView->GetUpdateNowButtton()) // 如果点击的是立即更新按钮 { systemUpdateView->UpdateNowbutton_back(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetUpdateNowButtton"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GetUpdateNowButtton"); } else if (&view == systemUpdateView->GetTryAgainLaterButton()) // 如果点击的是稍后再说按钮 { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetTryAgainLaterButton"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GetTryAgainLaterButton"); NativeAbility::GetInstance().Back(); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp index a5abdc641..14097df46 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp @@ -1,8 +1,8 @@ /* * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 - * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-07-06 14:25:05 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-11-05 14:48:11 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp */ @@ -87,14 +87,14 @@ namespace OHOS static err_t httpc_download_headers_done_ui(httpc_state_t *connection, void *arg, struct pbuf *hdr, u16_t hdr_len, u32_t content_len) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_headers_done_ui hdrlen %d, file len %d\r\n",hdr_len,content_len); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "httpc_download_headers_done_ui hdrlen %d, file len %d\r\n",hdr_len,content_len); file_total_len = content_len; return 0; } static err_t httpc_download_file_recv_ui(httpc_state_t *connection, u32_t rx_len,u32_t rx_total_len) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_file_recv_ui recv %d bytes total received %d filelen %d\r\n",rx_len,rx_total_len,file_total_len); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "httpc_download_file_recv_ui recv %d bytes total received %d filelen %d\r\n",rx_len,rx_total_len,file_total_len); SystemUpdateModel ::GetInstance().download_schedule_value= ((float)rx_total_len /(float)file_total_len) *100; if(SystemUpdateView::GetInstance()) @@ -107,8 +107,8 @@ namespace OHOS static void httpc_download_result_ui(void *arg, httpc_result_t httpc_result, u32_t rx_content_len, u32_t srv_res, err_t err) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", httpc_result,rx_content_len,srv_res,err); LCD_auto_timeout(true); SystemUpdateModel ::GetInstance().OTA_Update_msg_back(OTA_UPDATA_MSG_NEW_VER); @@ -118,8 +118,8 @@ namespace OHOS static void httpc_download_FWPKG_result_ui(void *arg, httpc_result_t httpc_result, u32_t rx_content_len, u32_t srv_res, err_t err) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", httpc_result,rx_content_len,srv_res,err); LCD_auto_timeout(true); @@ -130,8 +130,8 @@ namespace OHOS static void httpc_download_result_report_data(void *arg, httpc_result_t httpc_result, u32_t rx_content_len, u32_t srv_res, err_t err) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", httpc_result,rx_content_len,srv_res,err); return ; } @@ -143,7 +143,7 @@ namespace OHOS void upgrade_reported_data(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, ""); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, ""); FILE * fp = fopen(UPDATAREPORT,"rb+"); if(fp==NULL) { @@ -212,7 +212,7 @@ namespace OHOS buf = cJSON_PrintUnformatted(dataJSON); cJSON_Delete(dataJSON); cJSON_free(buf); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s",buf); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%s",buf); u16_t buf_len=strlen(buf); report_data_by_get_file(buf,buf_len); @@ -228,7 +228,7 @@ namespace OHOS uint8_t *otadatapath = (uint8_t*)Path; err_t rett; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"custom_start_ota_download %s to %s\r\n",uri_str,otadatapath); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"custom_start_ota_download %s to %s\r\n",uri_str,otadatapath); LCD_auto_timeout(false); FILE * fp= fopen((char *)Path,"rb"); @@ -236,7 +236,7 @@ namespace OHOS { fclose(fp); int ret= remove((char *)Path); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "file remove!!!!!!!!!!!!! %d ",ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "file remove!!!!!!!!!!!!! %d ",ret); } if(falg==OTA_BUTTON_GET_VISON) @@ -291,13 +291,13 @@ namespace OHOS SystemUpdateView::SystemUpdateView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::SystemUpdateView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::SystemUpdateView"); g_pSystemUpdateView = this; } SystemUpdateView::~SystemUpdateView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::~SystemUpdateView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SystemUpdateView::~SystemUpdateView"); ClearAll(); g_pSystemUpdateView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleModel.cpp index 25a5c07ed..2443b75f6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleModel.cpp @@ -8,7 +8,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-07 09:21:47 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-02 09:55:52 + * @LastEditTime: 2024-11-05 14:49:01 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/ThemeStyleModel.cpp */ @@ -60,7 +60,7 @@ namespace OHOS if (ThemeStyleMap.find(style) != ThemeStyleMap.end()) { const char *value = ThemeStyleMap.at(style).c_str(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "value:%s", value); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "value:%s", value); // 根据映射设置显示样式值 OHOS::ConfigModel::GetInstance()->set_condigData_String(OHOS::ConfigModel::CONFIGMODEL_ITEM_APPLIST_STYLE, value); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp index 5c1ceb27a..b37e912ab 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp @@ -15,13 +15,13 @@ namespace OHOS WatchQRCodeView::WatchQRCodeView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::WatchQRCodeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::WatchQRCodeView"); g_pWatchQRCodePresenter = this; } WatchQRCodeView::~WatchQRCodeView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::~WatchQRCodeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::~WatchQRCodeView"); g_pWatchQRCodePresenter = nullptr; } @@ -120,7 +120,7 @@ namespace OHOS uint8_t ble_name[30] = {0}; uint32_t ble_name_len = sizeof(ble_name); errcode_t ret = uapi_get_nv_btname(ble_name, &ble_name_len); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "get btname %s ,ret 0x%X\n", ble_name, ret); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "get btname %s ,ret 0x%X\n", ble_name, ret); TitleLabel->SetText((char *)ble_name); TitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 30); TitleLabel->SetRollSpeed(70); @@ -167,7 +167,7 @@ namespace OHOS void WatchQRCodeView::OnStart() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::OnStart"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::OnStart"); View::OnStart(); start_refresh_timer(); WatchQRCodeViewInit(); @@ -180,7 +180,7 @@ namespace OHOS void WatchQRCodeView::OnSetUpView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::OnSetUpView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::OnSetUpView"); View::OnSetUpView(); if (WatchQRCodeGroupView == nullptr) { @@ -193,14 +193,14 @@ namespace OHOS void WatchQRCodeView::OnTearDownView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::OnTearDownView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::OnTearDownView"); View::OnTearDownView(); return; } void WatchQRCodeView::OnStop() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::OnStop"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WatchQRCodeView::OnStop"); View::OnStop(); stop_refresh_timer(); RootView::GetInstance()->RemoveAll(); @@ -215,7 +215,7 @@ namespace OHOS float voltage = 0.0F; uint8_t value = 0; value = battery_get_voltage(&voltage); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "battery_get_voltage = %d", value); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "battery_get_voltage = %d", value); // 版本号： std::string temp = get_version_string(); @@ -243,7 +243,7 @@ namespace OHOS { if (uapi_get_screen_state() == 0) // 如果在亮屏状态 { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_get_screen_state() == 0"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "uapi_get_screen_state() == 0"); if (WatchQRCodeView::GetInstance()) { WatchQRCodeView::GetInstance()->update_label(); @@ -255,9 +255,9 @@ namespace OHOS } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_get_screen_state() == 1"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "uapi_get_screen_state() == 1"); WatchQRCodeView::refresh_time -= 2; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d", WatchQRCodeView::refresh_time); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%d", WatchQRCodeView::refresh_time); if (WatchQRCodeView::refresh_time <= 0) // 息屏状态下超时删除定时器 { if (WatchQRCodeView::GetInstance()) @@ -290,7 +290,7 @@ namespace OHOS */ void WatchQRCodeView::start_refresh_timer(uint32_t interval) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "start_refresh_timer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "start_refresh_timer"); /* -------------------------- 1.检查定时器是否已经存在，如果存在则返回 ------------------------- */ if (g_timer != nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherView.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherView.cpp index 2ad2c5c40..6922e8a4f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-01-29 15:37:44 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-12 11:26:06 + * @LastEditTime: 2024-11-05 14:50:42 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherView.cpp */ #include "weather/include/FutureWeatherView.h" @@ -17,7 +17,7 @@ namespace OHOS FutureWeatherView::FutureWeatherView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FutureWeatherView::FutureWeatherView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FutureWeatherView::FutureWeatherView"); SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); SetViewIndex(2); // 视图索引 g_pFutureWeatherView = this; @@ -25,7 +25,7 @@ namespace OHOS FutureWeatherView::~FutureWeatherView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FutureWeatherView::~FutureWeatherView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FutureWeatherView::~FutureWeatherView"); ClearAll(); g_pFutureWeatherView = nullptr; } @@ -55,7 +55,7 @@ namespace OHOS bool FutureWeatherView::InitPage(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FutureWeatherView::InitPage"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FutureWeatherView::InitPage"); /* -------------------------------------------------------------------------- */ Title = new UILabelExt(); if (Title == nullptr) @@ -132,7 +132,7 @@ namespace OHOS // 更新未来七天数据 bool FutureWeatherView::UpdateFutureWeatherListData(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FutureWeatherView::UpdateFutureWeatherListData"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FutureWeatherView::UpdateFutureWeatherListData"); if (futureWeatherListAdapter != nullptr) { delete futureWeatherListAdapter; diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorView.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorView.cpp index 2fcefe7c4..c2116553d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-01-29 15:37:44 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-27 20:49:01 + * @LastEditTime: 2024-11-05 14:50:56 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorView.cpp */ #include "weather/include/GetWeatherDataErrorView.h" @@ -18,13 +18,13 @@ namespace OHOS GetWeatherDataErrorView::GetWeatherDataErrorView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetWeatherDataErrorView::GetWeatherDataErrorView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GetWeatherDataErrorView::GetWeatherDataErrorView"); g_pGetWeatherDataErrorView = this; } GetWeatherDataErrorView::~GetWeatherDataErrorView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetWeatherDataErrorView::~GetWeatherDataErrorView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GetWeatherDataErrorView::~GetWeatherDataErrorView"); ClearAll(); g_pGetWeatherDataErrorView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherView.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherView.cpp index cacc5a8b3..28881781a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-01-29 15:37:44 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-11 18:12:42 + * @LastEditTime: 2024-11-05 14:51:07 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherView.cpp */ #include "weather/include/MainWeatherView.h" @@ -13,13 +13,13 @@ namespace OHOS static MainWeatherView *g_pMainWeatherView{nullptr}; MainWeatherView::MainWeatherView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainWeatherView::MainWeatherView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainWeatherView::MainWeatherView"); g_pMainWeatherView = this; } MainWeatherView::~MainWeatherView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainWeatherView::~MainWeatherView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainWeatherView::~MainWeatherView"); ClearAll(); g_pMainWeatherView = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherControlView.cpp index 4de132004..867efa38b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherControlView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-01-29 15:37:44 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-11 18:10:13 + * @LastEditTime: 2024-11-05 14:51:13 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherControlView.cpp */ #include "weather/include/WeatherControlView.h" @@ -40,13 +40,13 @@ namespace OHOS delete mainWeatherView; mainWeatherView = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WeatherControlView::ClearAll success!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WeatherControlView::ClearAll success!!"); } } bool WeatherControlView::CreateMainWeatherView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WeatherControlView::InitView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WeatherControlView::InitView"); if (mainWeatherView == nullptr) { mainWeatherView = new MainWeatherView(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp index 71c11c532..54e0ba08e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp @@ -35,7 +35,7 @@ namespace OHOS WeatherReportView::WeatherReportView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " WeatherReportView::WeatherReportView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " WeatherReportView::WeatherReportView"); SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); SetViewIndex(1); WeatherModel *p_WeatherModel = &WeatherModel::GetInstance(); @@ -48,7 +48,7 @@ namespace OHOS WeatherReportView::~WeatherReportView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " WeatherReportView::~WeatherReportView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " WeatherReportView::~WeatherReportView"); ClearAll(); g_pWeatherReportView = nullptr; } @@ -405,10 +405,10 @@ namespace OHOS void WeatherReportView::DumpWeatherInfo(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WeatherView::DumpWeatherInfo"); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UVData:%s", UVData.c_str()); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WindSpeedData:%s", WindSpeedData.c_str()); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HumidityData:%s", HumidityData.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WeatherView::DumpWeatherInfo"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UVData:%s", UVData.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WindSpeedData:%s", WindSpeedData.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HumidityData:%s", HumidityData.c_str()); } // 更新紫外线数据 @@ -445,7 +445,7 @@ namespace OHOS // 更新气象报告数据 bool WeatherReportView::UpdateWeatherReportViewData(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WeatherView::UpdateWeatherReportViewData"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WeatherView::UpdateWeatherReportViewData"); bool success = true; success &= UpdateUVData(); success &= UpdateWindSpeedData(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp index eb5f34b93..778a62f13 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-12 11:44:04 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-05 10:54:02 + * @LastEditTime: 2024-11-05 14:51:56 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp */ #include "weather/include/WeatherView.h" @@ -90,7 +90,7 @@ namespace OHOS static WeatherView *g_pWeatherView{nullptr}; WeatherView::WeatherView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WeatherView::WeatherView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WeatherView::WeatherView"); SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); SetViewIndex(0); // 视图索引 @@ -107,7 +107,7 @@ namespace OHOS WeatherView::~WeatherView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " WeatherView::~WeatherView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " WeatherView::~WeatherView"); ClearAll(); g_pWeatherView = nullptr; } @@ -357,13 +357,13 @@ namespace OHOS void WeatherView::DumpWeatherInfo() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WeatherView::DumpWeatherInfo"); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WeatherTime:%s", WeatherTime.c_str()); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WeatherImag:%s", WeatherImag.c_str()); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Temperature:%s", Temperature.c_str()); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WeatherDescription:%s", WeatherDescription.c_str()); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WeatherArea:%s", WeatherArea.c_str()); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MaxandMinTemperature:%s\n", MaxandMinTemperature.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WeatherView::DumpWeatherInfo"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WeatherTime:%s", WeatherTime.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WeatherImag:%s", WeatherImag.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Temperature:%s", Temperature.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WeatherDescription:%s", WeatherDescription.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WeatherArea:%s", WeatherArea.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MaxandMinTemperature:%s\n", MaxandMinTemperature.c_str()); } // 更新天气界面的当前时间 @@ -429,7 +429,7 @@ namespace OHOS // 更新天气视图数据 bool WeatherView::UpdateWeatherViewData(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WeatherView::UpdateWeatherViewData"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "WeatherView::UpdateWeatherViewData"); bool success = true; success &= UpdateWeatherTime(); success &= UpdateWeatherImag(); diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/alarm_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/alarm_notification.cpp index 1f1649c88..0abbaf0f8 100755 --- a/code/sdk/application/wearable/service/msg_center/src/notify/alarm_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/alarm_notification.cpp @@ -88,7 +88,7 @@ namespace OHOS void StopNotifyCallback() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "StopNotifyCallback"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StopNotifyCallback"); NotificationManager::GetInstance()->StopNotify(); } @@ -221,7 +221,7 @@ namespace OHOS UIViewGroup *CreateAlarmCloseView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CreateAlarmCloseView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CreateAlarmCloseView"); g_closeView = new UIViewGroup(); if (g_closeView == nullptr) { @@ -273,7 +273,7 @@ namespace OHOS { if (g_closeView != nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FreeAlarmCloseView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FreeAlarmCloseView"); DisableAlarmTimer(AlarmTimerType::NOTIFY_ALARM_CLOSE); g_closeView->RemoveAll(); delete g_imageClose; @@ -289,7 +289,7 @@ namespace OHOS /*创建一个响铃闹钟视图*/ UIViewGroup *CreateAlarmRingView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CreateAlarmRingView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CreateAlarmRingView"); if (g_ringView == nullptr) { g_ringView = new UIViewGroup(); @@ -364,14 +364,14 @@ namespace OHOS RootView::GetInstance()->Remove(g_ringView); delete g_ringView; g_ringView = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FreeAlarmRingView over!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FreeAlarmRingView over!!"); } } // 创建一个闹钟弹窗视图 UIViewGroup *CreateAlarmView(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CreateAlarmView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CreateAlarmView"); AlarmClockModel::GetInstance()->AlarmGetClockNum(); if (g_alarmView == nullptr) { @@ -542,7 +542,7 @@ namespace OHOS RootView::GetInstance()->Remove(g_alarmView); delete g_alarmView; g_alarmView = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FreeAlarmView over!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FreeAlarmView over!!"); } } @@ -626,7 +626,7 @@ namespace OHOS // return true; UNUSED(event); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlamNotify ClickListener %s", view.GetViewId()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlamNotify ClickListener %s", view.GetViewId()); if (strcmp(view.GetViewId(), ALARM_IMAGE_STOP) == 0) // 点击停止闹钟响铃 { // AlarmPopUpPresenter::GetInstance()->CancelAlarmRing(); diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/drinkReminder_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/drinkReminder_notification.cpp index 9ad8731ec..67a03a1e4 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/drinkReminder_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/drinkReminder_notification.cpp @@ -256,7 +256,7 @@ namespace OHOS ScreenTurnOn(10 * 1000); // 亮屏操作 10秒关闭 /* -------------------------------------------------------------------------- */ - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Create DrinkReminderView succeed!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Create DrinkReminderView succeed!!"); } NotificationManager::GetInstance()->RegisterNotifyCleanupFunction(FreeDrinkReminderView); diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp index a6481f7db..df5b339b2 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-25 17:33:47 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-22 10:23:38 + * @LastEditTime: 2024-11-05 14:55:10 * @FilePath: /FD230/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp * @details:实现查找手表的功能一般需要手表和智能手机之间的配合，通常是通过手机上的应用（App）或其他设备发送指令给手表，触发手表的查找功能。 * 以下是基本的实现步骤： @@ -186,7 +186,7 @@ namespace OHOS int FindWatchViewEventListener::FindWatchRingPlayerInit(const char *path) { // 本地播放文件路径和状态 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RingPlayerInit start!,%s", path); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RingPlayerInit start!,%s", path); uri = path; // 创建 AM playerCtr = std::make_shared(); @@ -201,7 +201,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; } @@ -228,7 +228,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "source new fail"); return OHOS_FAILURE; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FindWatchRing Player url:%s", uri.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FindWatchRing Player url:%s", uri.c_str()); playerCtr->SetSource(*source); /* --------------------------------- 4.配置播放器 -------------------------------- */ playerCtr->SetAudioStreamType(AUDIO_STREAM_NOTIFICATION_SYSTEM); // 设置播放器的音频流类型，支持混音 @@ -344,7 +344,7 @@ namespace OHOS /*开启定时器*/ void FindWatchViewEventListener::FindWatch_StartTimer(int interval) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "FindWatchViewEventListener::FindWatch_StartTimer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "FindWatchViewEventListener::FindWatch_StartTimer"); /* -------------------------- 1.检查定时器是否已经存在，如果存在则返回 ------------------------- */ if (g_timer != nullptr) { @@ -569,7 +569,7 @@ namespace OHOS /* --------------------- FindWatchRingPlayerCallbackImpl -------------------- */ void FindWatchRingPlayerCallbackImpl::OnPlaybackComplete(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnPlaybackComplete"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnPlaybackComplete"); // FindWatchViewEventListener::GetInstance().PopInterCancelMusic(); // const char *path = FindWatchViewEventListener::GetInstance().GetPath(); // FindWatchViewEventListener::GetInstance().PopInterPlayMusic((path != nullptr) ? path : nullptr); diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/motion_recognition_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/motion_recognition_notification.cpp index 4e8328f6f..e6885e2d8 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/motion_recognition_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/motion_recognition_notification.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-17 16:44:20 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-11-02 14:26:15 + * @LastEditTime: 2024-11-05 14:55:35 * @FilePath: /FD230/code/sdk/application/wearable/service/msg_center/src/notify/motion_recognition_notification.cpp */ #include "notification_manager.h" @@ -64,7 +64,7 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MotionRecognitionViewEventListener::OnRelease"); UNUSED(event); std::string viewId = view.GetViewId(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s onclick", viewId.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%s onclick", viewId.c_str()); if (viewId == MOTION_RECOGNITION_IGNORE_BUTTONVIEWID) { NotificationManager::GetInstance()->StopNotify(); @@ -182,7 +182,7 @@ namespace OHOS labelext->SetTextId(id); std::string text = labelext->GetText(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdateLabel:%s->%s\r\n", text.c_str(), newText.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdateLabel:%s->%s\r\n", text.c_str(), newText.c_str()); // 找到标志"XX"在字符串中的位置 size_t pos = text.find("XX"); @@ -190,12 +190,12 @@ namespace OHOS { // 替换标志"XX"为更新字符串 text.replace(pos, 2, newText); // 2 是标志"XX"的长度 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "newText:%s\r\n", text.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "newText:%s\r\n", text.c_str()); label->SetText(text.c_str()); } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "找不到变量标志位XX,请注意是否已经被修改！"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "找不到变量标志位XX,请注意是否已经被修改！"); } delete labelext; @@ -391,7 +391,7 @@ namespace OHOS RootView::GetInstance()->Remove(MotionRecognitionGroupView); delete MotionRecognitionGroupView; MotionRecognitionGroupView = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Free MotionRecognitionView succeed!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Free MotionRecognitionView succeed!!"); ScreenTurnOff(); } return; diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp index 8f3933242..2911e5d7a 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-22 10:04:36 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-12 11:31:08 + * @LastEditTime: 2024-11-05 14:57:06 * @FilePath: /FD230/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp */ #include "notification_manager.h" @@ -81,12 +81,12 @@ namespace OHOS PairingViewEventListener::PairingViewEventListener() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener::PairingViewEventListener"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener::PairingViewEventListener"); } PairingViewEventListener::~PairingViewEventListener() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener::~PairingViewEventListener"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener::~PairingViewEventListener"); } PairingViewEventListener &PairingViewEventListener::GetInstance(void) @@ -98,12 +98,12 @@ namespace OHOS bool PairingViewEventListener::OnClick(OHOS::UIView &view, const OHOS::ClickEvent &event) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener::OnClick"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener::OnClick"); UNUSED(event); if (&view == DeviceBindingButtonCancel) // 设备绑定取消按钮 { PairingViewEventListener::GetInstance().Pairing_StopTimer(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener:: DeviceBindingButtonCancel OnClick"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener:: DeviceBindingButtonCancel OnClick"); // 终止当前的绑定流程并关闭相关的通知界面。 #ifdef SUPPORT_BLE_SERVICE comfirmPaire(0); @@ -112,7 +112,7 @@ namespace OHOS } else if (&view == DeviceBindingButtonOK) // 设备绑定确认按钮 { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener:: DeviceBindingButtonOK OnClick"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener:: DeviceBindingButtonOK OnClick"); /* * 可能会执行的绑定流程： * 1.启动绑定过程. @@ -128,7 +128,7 @@ namespace OHOS } else if (&view == DeviceUnBindingButtonCancel) // 设备解绑取消按钮 { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener:: DeviceUnBindingButtonCancel OnClick"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener:: DeviceUnBindingButtonCancel OnClick"); // 不想执行解绑动作，并关闭解绑的通知界面。 #ifdef SUPPORT_BLE_SERVICE cleanUnbindInfor(0); @@ -137,7 +137,7 @@ namespace OHOS } else if (&view == DeviceUnBindingButtonOK) // 设备解绑确认按钮 { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener:: DeviceUnBindingButtonOK OnClick"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener:: DeviceUnBindingButtonOK OnClick"); // 切换到再次确认解绑弹窗 if (DeviceUnbindingRequestGroupView == nullptr) { @@ -147,7 +147,7 @@ namespace OHOS } else if (&view == DeviceUnbindingRequestButtonOK) // 设备解除绑定请求(与新设备连接)确认 { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener:: DeviceUnbindingRequestButtonOK OnClick"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener:: DeviceUnbindingRequestButtonOK OnClick"); if (p_ShutDownImageAnimatorView == nullptr) { p_ShutDownImageAnimatorView = new ShutDownImageAnimatorView(); @@ -173,7 +173,7 @@ namespace OHOS } else if (&view == DeviceUnbindingRequestButtonCancel) // 设备解除绑定请求(与新设备连接)取消 { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener:: DeviceUnbindingRequestButtonCancel OnClick"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener:: DeviceUnbindingRequestButtonCancel OnClick"); DeviceUnBindingViewIsVisible(true); } return true; @@ -238,7 +238,7 @@ namespace OHOS */ UIViewGroup *CreateDeviceBindingView(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[CreateDeviceBindingView]"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CreateDeviceBindingView]"); /* ---------------------------- DeviceBindingView --------------------------- */ if (DeviceBindingView == nullptr) { @@ -405,7 +405,7 @@ namespace OHOS */ UIViewGroup *CreateDeviceUnBindingView(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView]"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView]"); /* ---------------------------- DeviceUnBindingView --------------------------- */ if (DeviceUnBindingView == nullptr) { @@ -501,7 +501,7 @@ namespace OHOS DeviceUnBindingName->SetTextId(STR_EQUIPMENT_UNTYING_NOTE); // XX想要与你进行解绑 char *devanme = PairingViewEventListener::GetInstance().GetDeviceName(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView] DeviceUnBindingName devanme :%s", devanme); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView] DeviceUnBindingName devanme :%s", devanme); if (strlen(devanme)) { @@ -549,7 +549,7 @@ namespace OHOS DeviceUnBindingScrollView->Add(DeviceUnBindingButtonOK); DeviceUnBindingView->Add(DeviceUnBindingScrollView); } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView] DeviceUnBindingView new success!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView] DeviceUnBindingView new success!!"); /* -------------------------------------------------------------------------- */ if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get())) @@ -571,7 +571,7 @@ namespace OHOS */ UIViewGroup *CreateDeviceUnbindingRequestGroupView(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView]"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[CreateDeviceUnBindingView]"); if (nullptr == DeviceUnbindingRequestGroupView) { @@ -796,7 +796,7 @@ namespace OHOS RootView::GetInstance()->Remove(DeviceBindingView); delete DeviceBindingView; DeviceBindingView = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[FreeDeviceBindingView] success"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[FreeDeviceBindingView] success"); ScreenTurnOff(); } } @@ -849,7 +849,7 @@ namespace OHOS delete DeviceUnBindingView; DeviceUnBindingView = nullptr; FreeDeviceUnbindingRequestGroupView(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[FreeDeviceUnBindingView] success"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[FreeDeviceUnBindingView] success"); ScreenTurnOff(); } } @@ -901,7 +901,7 @@ namespace OHOS RootView::GetInstance()->Remove(DeviceUnbindingRequestGroupView); delete DeviceUnbindingRequestGroupView; DeviceUnbindingRequestGroupView = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[FreeDeviceUnbindingRequestGroupView] success"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[FreeDeviceUnbindingRequestGroupView] success"); } if (p_ShutDownImageAnimatorView != nullptr) { @@ -919,7 +919,7 @@ namespace OHOS /*定时器到期时的处理*/ static void Pairing_TimerCallbackProc(int data) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Pairing_TimerCallbackProc"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Pairing_TimerCallbackProc"); NotificationManager::GetInstance()->StopNotify(); } @@ -937,7 +937,7 @@ namespace OHOS */ void PairingViewEventListener::Pairing_StartTimer(uint32_t interval) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener::Pairing_StartTimer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener::Pairing_StartTimer"); /* -------------------------- 1.检查定时器是否已经存在，如果存在则返回 ------------------------- */ if (g_timer != NULL) { @@ -981,7 +981,7 @@ namespace OHOS // 检查定时器是否存在 if (g_timer != NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener::Pairing_StopTimer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PairingViewEventListener::Pairing_StopTimer"); osTimerStop(g_timer); // 删除定时器并置为 NULL osStatus_t ret = osTimerDelete(g_timer); diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/sedentaryReminder_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/sedentaryReminder_notification.cpp index d38c12cc3..3696552d4 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/sedentaryReminder_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/sedentaryReminder_notification.cpp @@ -38,12 +38,12 @@ namespace OHOS SedentaryReminderViewEventListener::SedentaryReminderViewEventListener() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SedentaryReminderViewEventListener::SedentaryReminderViewEventListener"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SedentaryReminderViewEventListener::SedentaryReminderViewEventListener"); } SedentaryReminderViewEventListener::~SedentaryReminderViewEventListener() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SedentaryReminderViewEventListener::~SedentaryReminderViewEventListener"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SedentaryReminderViewEventListener::~SedentaryReminderViewEventListener"); } SedentaryReminderViewEventListener &SedentaryReminderViewEventListener::GetInstance() @@ -113,7 +113,7 @@ namespace OHOS labelext->SetTextId(id); std::string text = labelext->GetText(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdateLabel:%s->%s\r\n", text.c_str(), newText.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdateLabel:%s->%s\r\n", text.c_str(), newText.c_str()); // 找到标志"XX"在字符串中的位置 size_t pos = text.find("XX"); @@ -121,12 +121,12 @@ namespace OHOS { // 替换标志"XX"为更新字符串 text.replace(pos, 2, newText); // 2 是标志"XX"的长度 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "newText:%s\r\n", text.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "newText:%s\r\n", text.c_str()); label->SetText(text.c_str()); } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "找不到变量标志位XX,请注意是否已经被修改！"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "找不到变量标志位XX,请注意是否已经被修改！"); } delete labelext; @@ -328,7 +328,7 @@ namespace OHOS RootView::GetInstance()->Remove(SedentaryReminderGroupView); delete SedentaryReminderGroupView; SedentaryReminderGroupView = nullptr; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Free SedentaryReminderView succeed!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Free SedentaryReminderView succeed!!"); ScreenTurnOff(); } return; -- 2.17.1