From 164adfc1062278fe8e2d3b427853fd6286e12020 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Wed, 26 Jun 2024 16:38:27 +0800
Subject: [PATCH] =?utf8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86=E6=96=87?=
 =?utf8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../wearable/fd230app/nativelauncher/src/NativeLauncher.cpp  | 4 +++-
 .../nativeui/heart_blood/{src => }/BloodCardView.cpp         | 5 +----
 .../nativeui/heart_blood/{include => }/BloodCardView.h       | 0
 .../nativeui/heart_blood/health_service/health_service.cpp   | 2 +-
 .../fd230app/nativeui/heart_blood/include/HeartCardView.h    | 0
 .../nativeui/heart_blood/include/HeartControlPresenter.h     | 0
 .../fd230app/nativeui/heart_blood/include/HeartControlView.h | 0
 .../nativeui/heart_blood/include/HeartFrequencyView.h        | 0
 .../fd230app/nativeui/heart_blood/include/HeartUnusualView.h | 0
 .../fd230app/nativeui/heart_blood/src/HeartCardView.cpp      | 0
 .../nativeui/heart_blood/src/HeartControlPresenter.cpp       | 0
 .../fd230app/nativeui/heart_blood/src/HeartControlView.cpp   | 0
 .../fd230app/nativeui/heart_blood/src/HeartFrequencyView.cpp | 0
 .../fd230app/nativeui/heart_blood/src/HeartUnusualView.cpp   | 0
 .../wearable/fd230app/nativeui/main/include/MainViewSample.h | 2 +-
 15 files changed, 6 insertions(+), 7 deletions(-)
 rename code/sdk/application/wearable/fd230app/nativeui/heart_blood/{src => }/BloodCardView.cpp (96%)
 rename code/sdk/application/wearable/fd230app/nativeui/heart_blood/{include => }/BloodCardView.h (100%)
 delete mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartCardView.h
 delete mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartControlPresenter.h
 delete mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartControlView.h
 delete mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartFrequencyView.h
 delete mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartUnusualView.h
 delete mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartCardView.cpp
 delete mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartControlPresenter.cpp
 delete mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartControlView.cpp
 delete mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartFrequencyView.cpp
 delete mode 100644 code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartUnusualView.cpp

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index 17ffb62a8..df0e44944 100644
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -64,7 +64,7 @@
 #include "UISampleView.h"
 #include "UISamplePresenter.h"
 
-#include "heart_blood/include/BloodCardView.h"
+#include "heart_blood/BloodCardView.h"
 
 #include "weather/include/MainWeatherPresenter.h"
 #include "weather/include/MainWeatherView.h"
@@ -357,6 +357,8 @@ namespace OHOS
         {VIEW_SET_DIAL, &NativeLauncher::InitSetDialSlice},
         /*睡眠界面*/
         {VIEW_SLEEP, &NativeLauncher::InitSleepSlice},
+    /*心率周期检测*/
+    //{VIEW_SET_HEART, &NativeLauncher::InitSetHeartSlice},
     /* -------------------------------------------------------------------------- */
 
 #ifdef SUPPORT_ALIPAY_SEC
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/BloodCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp
similarity index 96%
rename from code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/BloodCardView.cpp
rename to code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp
index 0bf068761..843989e31 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/BloodCardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.cpp
@@ -1,5 +1,5 @@
 
-#include "heart_blood/include/BloodCardView.h"
+#include "heart_blood/BloodCardView.h"
 #include "common/image_cache_manager.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
@@ -26,7 +26,6 @@ namespace OHOS
     BloodCardView::~BloodCardView()
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView::~BloodCardView");
-        RemoveAll();
         DeInit();
         g_pBloodCardView = nullptr;
     }
@@ -259,7 +258,6 @@ namespace OHOS
 
     void BloodCardView::UnLoad(void)
     {
-#if 0
         if (resLoadStatus)
         {
             ImageInfo *img = nullptr;
@@ -267,7 +265,6 @@ namespace OHOS
             ImageCacheManager::GetInstance().UnloadOneInMultiRes(BLOODOXYGEN_BACKGOUND, BLOOD_IAMGES);
             resLoadStatus = false;
         }
-#endif
     }
     /* -------------------------------------------------------------------------- */
 }
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/BloodCardView.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.h
similarity index 100%
rename from code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/BloodCardView.h
rename to code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.h
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
index 250a49e2c..a0ce16690 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
@@ -220,7 +220,7 @@ namespace OHOS
         }
 
         cJSON *SPO2 = cJSON_GetObjectItemCaseSensitive(latestData, "value");
-        if (SPO2 == nullptr && cJSON_IsNumber(SPO2))
+        if (SPO2 == nullptr && !cJSON_IsNumber(SPO2))
         {
             // Add spo2_latest_data
             cJSON_AddItemToObject(latestData, "value", cJSON_CreateNumber(data.SPO2));
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartCardView.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartCardView.h
deleted file mode 100644
index e69de29bb..000000000
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartControlPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartControlPresenter.h
deleted file mode 100644
index e69de29bb..000000000
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartControlView.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartControlView.h
deleted file mode 100644
index e69de29bb..000000000
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartFrequencyView.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartFrequencyView.h
deleted file mode 100644
index e69de29bb..000000000
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartUnusualView.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/include/HeartUnusualView.h
deleted file mode 100644
index e69de29bb..000000000
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartCardView.cpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartControlPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartControlPresenter.cpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartControlView.cpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartFrequencyView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartFrequencyView.cpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartUnusualView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/HeartUnusualView.cpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
index 39faea926..df7632166 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
@@ -32,7 +32,7 @@
 #include "uicomponents/UIComponents.h"
 
 #include "SetCardModel.h"
-#include "heart_blood/include/BloodCardView.h"
+#include "heart_blood/BloodCardView.h"
 #include "traing/training_card/include/Training_CardView.h"
 // #include "ApplistCardView.h"
 #include "weather/include/WeatherControlView.h"
-- 
2.17.1