删除部分文件

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index 17ffb62..df0e449 100644 (file)
--- 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 0bf0687..843989e 100644 (file)
--- 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 @@
 \r
-#include "heart_blood/include/BloodCardView.h"\r
+#include "heart_blood/BloodCardView.h"\r
 #include "common/image_cache_manager.h"\r
 #include "UiConfig.h"\r
 #include "ui_resource_image.h"\r
@@ -26,7 +26,6 @@ namespace OHOS
     BloodCardView::~BloodCardView()\r
     {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView::~BloodCardView");\r
-        RemoveAll();\r
         DeInit();\r
         g_pBloodCardView = nullptr;\r
     }\r
@@ -259,7 +258,6 @@ namespace OHOS
 \r
     void BloodCardView::UnLoad(void)\r
     {\r
-#if 0\r
         if (resLoadStatus)\r
         {\r
             ImageInfo *img = nullptr;\r
@@ -267,7 +265,6 @@ namespace OHOS
             ImageCacheManager::GetInstance().UnloadOneInMultiRes(BLOODOXYGEN_BACKGOUND, BLOOD_IAMGES);\r
             resLoadStatus = false;\r
         }\r
-#endif\r
     }\r
     /* -------------------------------------------------------------------------- */\r
 }\r

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 250a49e..a0ce166 100644 (file)
--- 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 (file)
index e69de29..0000000

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 (file)
index e69de29..0000000

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 (file)
index e69de29..0000000

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 (file)
index e69de29..0000000

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 (file)
index e69de29..0000000

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 (file)
index e69de29..0000000

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 (file)
index e69de29..0000000

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 (file)
index e69de29..0000000

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 (file)
index e69de29..0000000

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 (file)
index e69de29..0000000

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 39faea9..df76321 100644 (file)
--- 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"