From: Caisking <3449750381@qq.com>
Date: Wed, 31 Jul 2024 08:41:36 +0000 (+0800)
Subject: 心率添加异常管理
X-Git-Tag: release_V1.2.70_20241020_135402~727
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=2b04baabbb3a0b2666c62e1ed86e5bea9694faf0;p=mirrors%2FFD230.git

心率添加异常管理
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp
index 9743b4b72..ea61a6c5e 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp
@@ -79,7 +79,7 @@ namespace OHOS
         }
         if (strcmp(view.GetViewId(), CLICK_BLOOD_RE) == 0)
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_BLOODOXY_CHECK, TransitionType::TRANSITION_ZOOM);
+            NativeAbility::GetInstance().ChangeSlice(VIEW_BLOOD_CHECK, TransitionType::TRANSITION_ZOOM);
         }
         return true;
     }
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidPresenter.cpp
index c41338149..693baf7a8 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidPresenter.cpp
@@ -1,3 +1,9 @@
+/*** 
+ * @Date: 2024-07-30 11:22:44
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-07-31 15:22:17
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidPresenter.cpp
+ */
 /*
  * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.
  * Description: bloodOxygen view
@@ -73,7 +79,7 @@ namespace OHOS
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodPresenter::OnClick");
 
-        if (strcmp(view.GetViewId(), CLICK_BLOOD_KONW) == 0)
+        if (strcmp(view.GetViewId(), CLICK_HEALTH_KONW) == 0)
         {
             NativeAbility::GetInstance().Back(TransitionType::TRANSITION_ZOOM);
         }
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidPresenter.h
index 45606ba14..ef24ac107 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidPresenter.h
@@ -18,7 +18,7 @@
 
 namespace OHOS
 {
-    static constexpr const char *CLICK_BLOOD_KONW = "clickbloodkown";     // 血氧检测重新
+    static constexpr const char *CLICK_HEALTH_KONW = "clickbloodkown";     // 检测重新
 
     class CheckInvalidView;
     class CheckInvalidPresenter : public Presenter<CheckInvalidView>,
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp
index b78bdfede..a0a6bd970 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp
@@ -1,3 +1,9 @@
+/***
+ * @Date: 2024-07-30 11:20:16
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-07-31 15:16:05
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp
+ */
 /***
  * @Date: 2024-04-15 10:55:58
  * @LastEditors: Caisking 3449750381@qq.com
@@ -81,6 +87,12 @@ namespace OHOS
                 break;
             }
         }
+        else if (healthState.checkType == CHARGE)
+        {
+            titleLabel->SetTextId(STR_CHARGE);
+            noteLabel->SetTextId(STR_CHARGE_NOTE);
+            remindLabel->SetVisible(false);
+        }
     }
 
     void CheckInvalidView::SetNoteLabel(UIResourceTextId viewId, int checkResult)
@@ -96,7 +108,7 @@ namespace OHOS
     bool CheckInvalidView::AddButton()
     {
         /*初始化按键*/
-        InitButtonExt(kownButton, 0, 366, 466, 100, CLICK_BLOOD_KONW, STR_KONW, 30);
+        InitButtonExt(kownButton, 0, 366, 466, 100, CLICK_HEALTH_KONW, STR_KONW, 30);
         kownButton->SetImageSrc(PNG_466x100BUTTON_IMAGE, PNG_466x100BUTTON_IMAGE);
         kownButton->SetOnClickListener(presenter_);
 
@@ -203,7 +215,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CheckInvalidView::InitBloodView fail");
         }
         SetViewData();
-        
+
         custom_VibratorFunc(VibratorType::VIBRATOR_TYPE_TWO); // 震动提醒
 
         RootView::GetInstance()->Add(container_);
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h
index 13fd71823..a48df952a 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h
@@ -57,7 +57,8 @@ namespace OHOS
     typedef enum
     {
         BLOOD_CHECK,
-        HEART_CHECK
+        HEART_CHECK,
+        CHARGE,
     } CheckClass;
 
     // 检查结果