主界面:关闭主界面卡片部分打印
authorCaisking <3449750381@qq.com>
Tue, 5 Nov 2024 08:57:46 +0000 (16:57 +0800)
committerCaisking <3449750381@qq.com>
Tue, 5 Nov 2024 08:57:46 +0000 (16:57 +0800)
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateCardView.cpp
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartResultPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialViewGroup.cpp
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageControlView.cpp
code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp
code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetMainView.cpp

index 0c2e64e..fff202d 100644 (file)
@@ -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;
index 7c832ae..97ef649 100644 (file)
@@ -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<HeartChartPresenter>::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");
   }
 
index cbdacde..38d0995 100644 (file)
@@ -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
index 20ee45b..6651825 100644 (file)
@@ -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;
     }
 
index c423869..9532268 100644 (file)
@@ -430,7 +430,7 @@ namespace OHOS
     {\r
         char temp[DIAL_SETTING_VALUE_LEN] = {0}; // 创建一个临时字符数组用于存储拨号设置的字符串\r
         int len = UtilsGetValue("dial_setting", temp, DIAL_SETTING_VALUE_LEN);\r
-        WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "Attempting to load dial settings from kvstore. Length: %d\r\n", len);\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Attempting to load dial settings from kvstore. Length: %d\r\n", len);\r
 \r
         if (len < 0)\r
         {\r
@@ -456,7 +456,7 @@ namespace OHOS
         if (setValue)\r
         {\r
             dialSetting.dialFlag = atoi(setValue); // 将字符串转换为整数\r
-            WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "Dial flag loaded: %d\r\n", dialSetting.dialFlag);\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Dial flag loaded: %d\r\n", dialSetting.dialFlag);\r
         }\r
         else\r
         {\r
@@ -478,7 +478,7 @@ namespace OHOS
         if (setValue)\r
         {\r
             dialSetting.dialId = atoi(setValue); // 将字符串转换为整数\r
-            WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "Dial ID loaded: %d\r\n", dialSetting.dialId);\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Dial ID loaded: %d\r\n", dialSetting.dialId);\r
         }\r
         else\r
         {\r
@@ -500,17 +500,17 @@ namespace OHOS
         if (setValue)\r
         {\r
             dialSetting.dialFullName = setValue; // 将完整名称赋值\r
-            WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "Dial full name loaded: %s\r\n", dialSetting.dialFullName.c_str());\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Dial full name loaded: %s\r\n", dialSetting.dialFullName.c_str());\r
 \r
             if (dialSetting.dialFullName.empty() || access(dialSetting.dialFullName.c_str(), F_OK) != 0)\r
             {\r
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Dial full name is invalid or file does not exist. Initializing to default settings.\r\n");\r
+                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Error: Dial full name is invalid or file does not exist. Initializing to default settings.\r\n");\r
                 InitDialSettingDefault(dialSetting.dialId);\r
             }\r
         }\r
         else\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Error: Third value is empty. Initializing to default settings.\r\n");\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Error: Third value is empty. Initializing to default settings.\r\n");\r
             InitDialSettingDefault(dialSetting.dialId);\r
         }\r
     }\r
@@ -534,11 +534,11 @@ namespace OHOS
     void MainModel::InitDialState(void) {  \r
         // 获取加锁状态  \r
         int lockstate = OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_PASSWORD_SWITCH);  \r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "lockstate = %d", lockstate);  \r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "lockstate = %d", lockstate);  \r
 \r
         // 判断加锁状态  \r
         if (lockstate == 1) {  \r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Device is locked (lock state == 1)");  \r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Device is locked (lock state == 1)");  \r
             uapi_dev_runtime_set_lock_status(1); // 上锁  \r
             dialstateInfo[static_cast<int>(DialState::LOCK)].active = true; // 设置锁定状态为真  \r
         }  \r
@@ -560,17 +560,17 @@ namespace OHOS
             if (dialstateInfo[stateIndex].active != value)\r
             {\r
                 dialstateInfo[stateIndex].active = value; // 使用转换后的索引\r
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Set dialstateInfo[%d].active = %d", stateIndex, value);\r
+                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Set dialstateInfo[%d].active = %d", stateIndex, value);\r
                 SendMsgToUIService(UI_UPDATE_DIALSTATE_DATA, 0, nullptr, 0); // 发送更新消息\r
             }\r
             else\r
             {\r
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "State %d is unchanged, no update needed.", stateIndex);\r
+                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "State %d is unchanged, no update needed.", stateIndex);\r
             }\r
         }\r
         else\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "state %d is error", stateIndex);\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "state %d is error", stateIndex);\r
         }\r
     }\r
 \r
@@ -581,11 +581,11 @@ namespace OHOS
         {\r
             if (dialstateInfo[i].active)\r
             {\r
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "high dialstateInfo[%d].active", i);\r
+                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "high dialstateInfo[%d].active", i);\r
                 return dialstateInfo[i].state; // 返回活跃状态中优先级最高的\r
             }\r
         }\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "no have high dialstateInfo.active");\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "no have high dialstateInfo.active");\r
         return DialState::INVALID; // 如果没有找到活跃状态,返回无效状态\r
     }\r
 \r
index f796bcb..3c163ff 100644 (file)
@@ -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;
index 1da885c..d95047a 100644 (file)
@@ -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
index 340abcb..b03fa2f 100644 (file)
@@ -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); // 设置状态为无消息
index f0eebf2..f40bd81 100644 (file)
@@ -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");
     }
     /* -------------------------------------------------------------------------- */
 }