其他适配性修改

diff --git a/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt b/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt
index dc7b0a0..813dd07 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt
+++ b/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt
@@ -45,6 +45,7 @@ set(PRIVATE_HEADER
     ${NativeApp}/nativeui/uisample/include
     ${NativeApp}/nativeui/uisample/uitest/framework/include
     ${NativeApp}/nativeui/aod_view/include
+    ${NativeApp}/nativeui/heart_blood/
 
     ${NativeApp}/nativeui/alipay/include
     ${NativeApp}/nativeui/alipay/include/AlipayList

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityModel.cpp
index a27974a..962895d 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityModel.cpp
@@ -22,7 +22,12 @@
 #include "cmsis_os.h"
 #include "custom_runtime.h"
 #include "custom_utils.h"
-// #include "cywee_service.h"
+
+
+#ifdef ENABLE_CYWEE
+#include "cywee_service.h"
+#endif
+
 #include "goal/include/goalmodel.h"
 #include "goal/include/goalother.h"
 #include "goal/include/goalview.h"

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp
index 4fc4685..8c8ca90 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp
@@ -35,6 +35,7 @@
  #include <sys/stat.h>
  #include <time.h>
  #include <unistd.h>
+ 
 //  extern uint8_t battery_get_voltage(float *voltage);
  
  #define TIMEVIEW_UP 0

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainViewSample.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainViewSample.h
index e2af5d7..3442b80 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainViewSample.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainViewSample.h
@@ -31,7 +31,7 @@
 #include "uicomponents/UIComponents.h"
 
 #include "SetCardModel.h"
-// #include "heart_blood/BloodCardView.h"
+#include "heart_blood/BloodCardView.h"
 // #include "traing/training_card/include/Training_CardView.h"
 // #include "ApplistCardView.h"
 #include "weather/include/WeatherControlView.h"
@@ -40,7 +40,7 @@
 #include "message/include/MessageControlView.h"
 // #include "sleep/include/SleepCardView.h"
 #include "set_card/include/SetMainView.h"
-// #include "heartrate/include/HeartRateCardView.h"
+#include "heartrate/include/HeartRateCardView.h"
 namespace OHOS
 {
     class MainPresenterSample;
@@ -107,8 +107,8 @@ namespace OHOS
         PlayersView *playersView{nullptr};
         CompassControlView *compassControlView{nullptr};
 
-        // HeartRateCardView *heartRateView{nullptr};
-        // BloodCardView *bloodView{nullptr};
+        HeartRateCardView *heartRateView{nullptr};
+        BloodCardView *bloodView{nullptr};
         // SleepCardView *sleepView{nullptr};
         // Training_CardView *traingView{nullptr};
         MessageControlView *messageView{nullptr};

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/PullUpDownView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/PullUpDownView.h
index e48d328..569891c 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/PullUpDownView.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/PullUpDownView.h
@@ -25,7 +25,7 @@
 #include "main/include/dropdown/DropDownCardPage1.h"
 #include "main/include/dropdown/DropDownCardPage2.h"
 
-extern uint8_t battery_get_voltage(float *voltage);
+// extern uint8_t battery_get_voltage(float *voltage);
 
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp
index dc9e257..c6bc0ef 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp
@@ -35,16 +35,15 @@ namespace OHOS
     // 严格按照Id对应
     static const MainViewMapper CardMapper[] = {
         {WATCH_FACE, &MainViewSample::InitWatchFacePage},
-        // {HEART_RATE, &MainViewSample::InitHeartRatePage},
-        {TRAINING, &MainViewSample::InitTrainingPage},
+        {HEART_RATE, &MainViewSample::InitHeartRatePage},
+        // {TRAINING, &MainViewSample::InitTrainingPage},
         {COMPASS, &MainViewSample::InitCompassPage},
         // {SLEEP, &MainViewSample::InitSleepPage},
-        // {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage},
+        {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage},
         {GOAL, &MainViewSample::InitGoalPage},
         {WEATHER, &MainViewSample::InitWeatherPage},
         {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},
         {SETCARD, &MainViewSample::InitSetMainPage},
-
 #if 0
         {ACTIVITY, &MainViewSample::InitActivityPage},
 #endif
@@ -79,12 +78,12 @@ namespace OHOS
             playersView = nullptr;
         }
 
-        // if (heartRateView != nullptr)
-        // {
-        //     heartRateView->RemoveAll();
-        //     delete heartRateView;
-        //     heartRateView = nullptr;
-        // }
+        if (heartRateView != nullptr)
+        {
+            heartRateView->RemoveAll();
+            delete heartRateView;
+            heartRateView = nullptr;
+        }
         if (dropDownView != nullptr)
         {
             dropDownView->ClearBackgroundBlur();
@@ -118,12 +117,12 @@ namespace OHOS
             delete mainClockView;
             mainClockView = nullptr;
         }
-        // if (bloodView != nullptr)
-        // {
-        //     bloodView->RemoveAll();
-        //     delete bloodView;
-        //     bloodView = nullptr;
-        // }
+        if (bloodView != nullptr)
+        {
+            bloodView->RemoveAll();
+            delete bloodView;
+            bloodView = nullptr;
+        }
         if (setmainView != nullptr)
         {
             setmainView->RemoveAll();
@@ -433,15 +432,14 @@ namespace OHOS
     // 主界面血氧卡片
     UICardPage *MainViewSample::InitBloodOxygenPage(void)
     {
-        // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitBloodOxygenPage");
-        // bloodView = new BloodCardView();
-        // if (bloodView == nullptr)
-        // {
-        //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodView new fail");
-        //     return nullptr;
-        // }
-        // return bloodView;
-        return nullptr;
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitBloodOxygenPage");
+        bloodView = new BloodCardView();
+        if (bloodView == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodView new fail");
+            return nullptr;
+        }
+        return bloodView;
     }
 
     // 主界面训练卡片
@@ -486,16 +484,14 @@ namespace OHOS
 
     // 主界面心率卡片
     UICardPage *MainViewSample::InitHeartRatePage(void){
-    // {
-    //     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitHeartRatePage");
-    //     heartRateView = new HeartRateCardView();
-    //     if (heartRateView == nullptr)
-    //     {
-    //         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateView new fail");
-    //         return nullptr;
-    //     }
-    //     return heartRateView;
-           return nullptr;
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitHeartRatePage");
+        heartRateView = new HeartRateCardView();
+        if (heartRateView == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateView new fail");
+            return nullptr;
+        }
+        return heartRateView;
     }
 
     // 主界面运动卡片

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageShowView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageShowView.h
index f94e746..186bd5d 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageShowView.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageShowView.h
@@ -3,7 +3,7 @@
 #ifndef MessageShow_VIEW_H
 #define MessageShow_VIEW_H
 
-// #include "BaseView.h"
+// 
 #include "View.h"
 #include "components/ui_view_group.h"
 #include "components/ui_scroll_view.h"

diff --git a/code/sdk/zhihui/utils/custom_fileoperate_service.c b/code/sdk/zhihui/utils/custom_fileoperate_service.c
index dfa485b..2daeb32 100644 (file)
--- a/code/sdk/zhihui/utils/custom_fileoperate_service.c
+++ b/code/sdk/zhihui/utils/custom_fileoperate_service.c
@@ -51,9 +51,9 @@ void repair_file_start(void){}
 //进行运动存储
 void store_sport_data(void){}
 //进行心率存储
-void save_heart_rate_data(void){}
+// void save_heart_rate_data(void){}
 //进行血氧存储
-void save_blood_oxygen_data(void){}
+// void save_blood_oxygen_data(void){}
 //进行心率列表存储
 void custom_save_sleep_data(void){}
 void custom_save_nap_data(void){}