From: Caisking <3449750381@qq.com> Date: Tue, 5 Nov 2024 08:57:46 +0000 (+0800) Subject: 主界面：关闭主界面卡片部分打印 X-Git-Tag: fd230_release_V1.3.102~126^2^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=4aeca579952e1bafd14f6c91f564c49ae86f063c;p=mirrors%2FFD230.git 主界面：关闭主界面卡片部分打印 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp index 0c2e64ee4..fff202d09 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp @@ -101,7 +101,7 @@ namespace OHOS // 更新显示心率数据 if(HeartChartView::GetInstance() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartChartView::GetInstance()==nullptr"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartChartView::GetInstance()==nullptr"); return; } @@ -109,7 +109,7 @@ namespace OHOS if ((startTime != 0) && (current_time - startTime >= HEART_KEEP_TIME)) { // 超时处理 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果: 超时处理 HEART_KEEP_TIME: %lld", current_time - startTime); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "检测结果: 超时处理 HEART_KEEP_TIME: %lld", current_time - startTime); HeartModel::GetInstance()->SetResult(HeartResult::TIMEOUT); HeartModel::GetInstance()->Heart_Stop(); return; diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp index 7c832ae05..97ef649b4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp @@ -247,7 +247,7 @@ HeartChartView *HeartChartView::GetInstance(void) { return g_pHeartCheckView; } void HeartChartView::UpdateShowHeart() { if (displayheart_ == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartChartView::UpdateShowHeart is error"); return; } @@ -263,7 +263,7 @@ void HeartChartView::UpdateShowHeart() { } void HeartChartView::Update_data_Chart(int serialIndex) { if (heartchart == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Update_data_Chart fail %d", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Update_data_Chart fail %d", serialIndex); return; } @@ -292,7 +292,7 @@ void HeartChartView::Update_data_Chart(int serialIndex) { } void HeartChartView::CleanAllDataView() { if (heartchart == nullptr || maxheart_ == nullptr || minheart_ == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " CleanAllDataView fail"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " CleanAllDataView fail"); return; } for (int serialIndex = 0; serialIndex < 24; serialIndex++) { @@ -329,13 +329,13 @@ void HeartChartView::SetDataTopAndBottom() { : "--"); } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MaxHeart: %d, MinHeart: %d", MaxHeart, + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MaxHeart: %d, MinHeart: %d", MaxHeart, MinHeart); } /*设置曲线图数据*/ void HeartChartView::SetDataChart() { if (heartchart == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Init_data_Chart new chart fail"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Init_data_Chart new chart fail"); return; } heartSerial = new UIChartDataSerial(); @@ -366,7 +366,7 @@ void HeartChartView::SetDataChart() { void HeartChartView::HeartImageAnimator() { imageAnimator = new UIImageAnimatorView(); if (imageAnimator == nullptr) { - WEARABLE_LOGE( + WEARABLE_LOGD( WEARABLE_LOG_MODULE_APP, "HeartRateView::[HeartbeatImageAnimator] new imageAnimator fail"); return; @@ -579,7 +579,7 @@ bool HeartChartView::HeartViewInit() { //标签 InitChartLabel(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartChartViewInit is ok"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartChartViewInit is ok"); return true; } UIViewGroup *HeartChartView::GetchartGroup() { @@ -587,7 +587,7 @@ UIViewGroup *HeartChartView::GetchartGroup() { container_->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); if (!HeartViewInit()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartChartView::InitHeartView fail"); } HeartImageAnimator(); //暂时屏蔽 @@ -601,7 +601,7 @@ UIViewGroup *HeartChartView::GetchartGroup() { return container_; } void HeartChartView::OnStart() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartChartView::OnStart"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartChartView::OnStart"); View::OnStart(); SetContainerView(new UIViewGroup()); @@ -609,7 +609,7 @@ void HeartChartView::OnStart() { Screen::GetInstance().GetHeight()); if (!HeartViewInit()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartChartView::InitHeartView fail"); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateCardView.cpp index cbdacde97..38d09951b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateCardView.cpp @@ -33,7 +33,7 @@ void HeartRateCardView::ClearAll(void) { } bool HeartRateCardView::InitView(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartRateCardView::InitView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartRateCardView::InitView"); heartRateCardView = new HeartChartView(); if (heartRateCardView == nullptr) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, @@ -56,13 +56,13 @@ UIViewGroup *HeartRateCardView::GetHeartRateCardView() { return heartRateGroupView; } void HeartRateCardView::PreLoad(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartRateCardView::PreLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartRateCardView::PreLoad"); if (!viewiInitStatus) { InitView(); viewiInitStatus = true; } } void HeartRateCardView::UnLoad(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartRateCardView::UnLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartRateCardView::UnLoad"); } } // namespace OHOS \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultPresenter.cpp index 20ee45be2..665182554 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultPresenter.cpp @@ -55,7 +55,7 @@ namespace OHOS uint32_t time; if (uapi_get_timestampe_ss(&time) != ERRCODE_SUCC) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to get timestamp"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Failed to get timestamp"); return 0; } return time; @@ -142,7 +142,7 @@ namespace OHOS NativeAbility::GetInstance().EnterSlice(VIEW_HEART_CHECK, TransitionType::TRANSITION_BACK_TO_HEXAGONS); } } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartPresenter::OnClick"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartPresenter::OnClick"); return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp index c42386951..9532268f6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp @@ -430,7 +430,7 @@ namespace OHOS { char temp[DIAL_SETTING_VALUE_LEN] = {0}; // 创建一个临时字符数组用于存储拨号设置的字符串 int len = UtilsGetValue("dial_setting", temp, DIAL_SETTING_VALUE_LEN); - WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "Attempting to load dial settings from kvstore. Length: %d\r\n", len); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Attempting to load dial settings from kvstore. Length: %d\r\n", len); if (len < 0) { @@ -456,7 +456,7 @@ namespace OHOS if (setValue) { dialSetting.dialFlag = atoi(setValue); // 将字符串转换为整数 - WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "Dial flag loaded: %d\r\n", dialSetting.dialFlag); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Dial flag loaded: %d\r\n", dialSetting.dialFlag); } else { @@ -478,7 +478,7 @@ namespace OHOS if (setValue) { dialSetting.dialId = atoi(setValue); // 将字符串转换为整数 - WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "Dial ID loaded: %d\r\n", dialSetting.dialId); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Dial ID loaded: %d\r\n", dialSetting.dialId); } else { @@ -500,17 +500,17 @@ namespace OHOS if (setValue) { dialSetting.dialFullName = setValue; // 将完整名称赋值 - WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "Dial full name loaded: %s\r\n", dialSetting.dialFullName.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Dial full name loaded: %s\r\n", dialSetting.dialFullName.c_str()); if (dialSetting.dialFullName.empty() || access(dialSetting.dialFullName.c_str(), F_OK) != 0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Dial full name is invalid or file does not exist. Initializing to default settings.\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Error: Dial full name is invalid or file does not exist. Initializing to default settings.\r\n"); InitDialSettingDefault(dialSetting.dialId); } } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Third value is empty. Initializing to default settings.\r\n"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Error: Third value is empty. Initializing to default settings.\r\n"); InitDialSettingDefault(dialSetting.dialId); } } @@ -534,11 +534,11 @@ namespace OHOS void MainModel::InitDialState(void) { // 获取加锁状态 int lockstate = OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD_SWITCH); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "lockstate = %d", lockstate); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "lockstate = %d", lockstate); // 判断加锁状态 if (lockstate == 1) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Device is locked (lock state == 1)"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Device is locked (lock state == 1)"); uapi_dev_runtime_set_lock_status(1); // 上锁 dialstateInfo[static_cast(DialState::LOCK)].active = true; // 设置锁定状态为真 } @@ -560,17 +560,17 @@ namespace OHOS if (dialstateInfo[stateIndex].active != value) { dialstateInfo[stateIndex].active = value; // 使用转换后的索引 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Set dialstateInfo[%d].active = %d", stateIndex, value); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Set dialstateInfo[%d].active = %d", stateIndex, value); SendMsgToUIService(UI_UPDATE_DIALSTATE_DATA, 0, nullptr, 0); // 发送更新消息 } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "State %d is unchanged, no update needed.", stateIndex); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "State %d is unchanged, no update needed.", stateIndex); } } else { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "state %d is error", stateIndex); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "state %d is error", stateIndex); } } @@ -581,11 +581,11 @@ namespace OHOS { if (dialstateInfo[i].active) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "high dialstateInfo[%d].active", i); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "high dialstateInfo[%d].active", i); return dialstateInfo[i].state; // 返回活跃状态中优先级最高的 } } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "no have high dialstateInfo.active"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "no have high dialstateInfo.active"); return DialState::INVALID; // 如果没有找到活跃状态，返回无效状态 } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp index f796bcbae..3c163fffb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp @@ -127,7 +127,7 @@ namespace OHOS void DialViewGroup::PreLoad(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DialViewGroup::PreLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DialViewGroup::PreLoad"); uint32_t startTime_ = HALTick::GetInstance().GetTime(); if (!resPreloaded_) { @@ -148,12 +148,12 @@ namespace OHOS resLoadStatus = true; } uint32_t elapseTime = HALTick::GetInstance().GetElapseTime(startTime_); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DialViewGroup::GetElapseTime %d", elapseTime); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DialViewGroup::GetElapseTime %d", elapseTime); } void DialViewGroup::UnLoad(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DialViewGroup::UnLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DialViewGroup::UnLoad"); if (resLoadStatus) { resLoadStatus = false; diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp index 1da885c60..d95047a63 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp @@ -102,7 +102,7 @@ void MessageControlView::SetLackView(bool flag) { } void MessageControlView::PreLoad(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageControlView::PreLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MessageControlView::PreLoad"); if (!viewiInitStatus) { InitView(); viewiInitStatus = true; @@ -112,6 +112,6 @@ void MessageControlView::PreLoad(void) { void MessageControlView::UnLoad(void) { // Message's usage scenes is complicated, so we do not release it's resources // inner slice. - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageControlView::UnLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MessageControlView::UnLoad"); } } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp index 340abcb9d..b03fa2f2e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp @@ -100,7 +100,7 @@ void MessageView::PreLoad(void) { /*无数据界面*/ void MessageView::ShowLackView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowLackView start"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ShowLackView start"); if (lackView == nullptr) { lackView = new UIScrollView(); if (lackView == nullptr) { @@ -136,12 +136,12 @@ void MessageView::ShowLackView() { lackView->SetOnDragListener(presenter_); lackView->SetVisible(false); // 界面隐藏 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowLackView end"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ShowLackView end"); } /*数据界面*/ void MessageView::ShowMessageView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowmessageView start"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ShowmessageView start"); if (messageView == nullptr) { messageView = new UIScrollView(); if (messageView == nullptr) { @@ -180,16 +180,16 @@ void MessageView::ShowMessageView() { messageView->SetOnDragListener(presenter_); messageView->Add(MessageList); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageList is add"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MessageList is add"); container_->Add(messageView); messageView->SetVisible(false); // 隐藏界面 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowmessageView end"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ShowmessageView end"); } /*控制显示界面*/ void MessageView::SetPopupViewStatus(PopupMessage view, bool status) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetPopupViewStatus %d", view); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetPopupViewStatus %d", view); if (view == PopupMessage::LackPopup) { MessageModel::GetInstance().SetPopupViewState(false); // 设置状态为无消息 diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetMainView.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetMainView.cpp index f0eebf282..f40bd8130 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetMainView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetMainView.cpp @@ -36,14 +36,14 @@ namespace OHOS static constexpr const char *BUTTONENTER_IMAGE = "user/res/users/AddCard.bin"; SetMainView::SetMainView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetMainView::SetMainView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetMainView::SetMainView"); SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); g_pSetMainView = this; } SetMainView::~SetMainView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetMainView::~SetMainView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetMainView::~SetMainView"); DeInit(); g_pSetMainView = nullptr; } @@ -91,7 +91,7 @@ namespace OHOS /* -------------------------------------------------------------------------- */ void SetMainView::PreLoad(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetMainView::PreLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetMainView::PreLoad"); if (!viewiInitStatus) { InitView(); @@ -100,7 +100,7 @@ namespace OHOS } void SetMainView::UnLoad(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetMainView::UnLoad"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetMainView::UnLoad"); } /* -------------------------------------------------------------------------- */ }