Merge #1831 into sdk602patch0911 from refs/changes/1831/head

增加血压测量/血压校准/情绪/压力/疲倦度/ECG VIEW_ID

* refs/changes/1831/head: (2 commits squashed)

  - 增加血压测量/血压校准/情绪/压力/疲倦度/ECG VIEW_ID

  - 修改血压测量VIEW_ID

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1831

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
index 4d12f5b..bbda615 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
@@ -91,7 +91,19 @@ typedef enum : uint16_t
     VIEW_SET_DIAL,       // 切换表盘
     VIEW_SET_HEART,      // 设置心率周期检测
     VIEW_CODED_LOCK,     // 密码锁
-    VIEW_BLOOD_PRESSURE, // 血压监测
+    //血压测量
+    VIEW_BLOOD_PRESSURE_CHECK, 
+    //血压校准
+    VIEW_BLOOD_PRESSURE_CALIBRATION,
+    //压力
+    VIEW_PRESSURE,
+    //情绪
+    VIEW_EMOTION,
+    //ECG
+    VIEW_ECG,
+    //疲劳度
+    VIEW_FATIGUE,
+    /* -------------------------------------------------------------------------- */
     /* ----------------------------------- 训练 ----------------------------------- */
     VIEW_TRAINING,        // 训练
     VIEW_TRAININGNOMAL,   // 正常训练开始界面（除骑行，健走，跑步外）

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
index 92e808e..210e90c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
@@ -135,6 +135,8 @@ namespace OHOS
         void InitSleepModeSlice(void);
         void InittestSlice(void);
 
+        void InitBloodPressureCheckSlice(void);
+
     private:
         void InitAllNativeSlices(void);
 

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index 581f39d..ed405c8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -108,9 +108,12 @@
 #include "bloodoxygen/include/BloodDetectionPresenter.h"
 #include "bloodoxygen/include/BloodResultView.h"
 #include "bloodoxygen/include/BloodResultPresenter.h"
-/*è¡\80å\8e\8bæ£\80æµ\8b*/
+/*è¡\80å\8e\8bæ ¡å\87\86*/
 #include "bloodpressure/include/BPMainView.h"
 #include "bloodpressure/include/BPMainPresenter.h"
+/*血压校准*/
+#include "bloodpressure/include/BPDetectionPresenter.h"
+#include "bloodpressure/include/BPDetectionView.h"
 /*心率监测*/
 #include "heartrate/include/HeartDetectionView.h"
 #include "heartrate/include/HeartDetectionPresenter.h"
@@ -448,8 +451,10 @@ namespace OHOS
         /*血氧检测*/
         {VIEW_BLOOD_CHECK, &NativeLauncher::InitBloodCheckSlice},
         {VIEW_BLOOD_RESULT, &NativeLauncher::InitBloodResultSlice},
-         /*血压检测*/
-        {VIEW_BLOOD_PRESSURE, &NativeLauncher::InitBloodPressureSlice},
+        /*血压校准*/
+        {VIEW_BLOOD_PRESSURE_CALIBRATION, &NativeLauncher::InitBloodPressureSlice},
+        /*血压监测*/
+        {VIEW_BLOOD_PRESSURE_CHECK, &NativeLauncher::InitBloodPressureCheckSlice},
         /*心率检测*/
         {VIEW_HEART_CHECK, &NativeLauncher::InitHeartCheckSlice},
         {VIEW_HEART_RESULT, &NativeLauncher::InitHeartResultSlice},
@@ -1326,7 +1331,7 @@ namespace OHOS
         }
         NativeAbility::GetInstance().AddSliceProxy(VIEW_BLOOD_RESULT, bloodResultView);
     }
-    // 血压监测界面
+    // 血压校准界面
     void NativeLauncher::InitBloodPressureSlice(void)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitBloodPressureSlice");
@@ -1336,7 +1341,19 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bloodPressureView is nullptr");
             return;
         }
-        NativeAbility::GetInstance().AddSliceProxy(VIEW_BLOOD_PRESSURE, bloodPressureView);
+        NativeAbility::GetInstance().AddSliceProxy(VIEW_BLOOD_PRESSURE_CALIBRATION, bloodPressureView);
+    }
+    // 血压监测界面
+    void NativeLauncher::InitBloodPressureCheckSlice(void)
+    {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitBloodPressureCheckSlice");
+        SliceProxy *bloodPressureCheckView = new AbilitySliceProxy<BPDetectionView, BPDetectionPresenter>;
+        if (bloodPressureCheckView == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bloodPressureCheckView is nullptr");
+            return;
+        }
+        NativeAbility::GetInstance().AddSliceProxy(VIEW_BLOOD_PRESSURE_CHECK, bloodPressureCheckView);
     }
     // 心率监测界面
     void NativeLauncher::InitHeartCheckSlice(void)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
index 70499b6..8794798 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
@@ -60,7 +60,7 @@ namespace OHOS
         {VIEW_HEART_CHART, PNG_APPLIST_HEART_IMAGE_BIG, PNG_APPLIST_HEART_IMAGE, PNG_APPLIST_DEFAULT_IMG, "心率", STR_HEART_RATE, nullptr},
 #endif
         {VIEW_BLOOD_RESULT, PNG_APPLIST_SPO2_IMAGE_BIG, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血氧", STR_BLOOD_OXYGEN, nullptr},
-        {VIEW_BLOOD_PRESSURE, PNG_APPLIST_SPO2_IMAGE_BIG, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血压", STR_BLOOD_OXYGEN, nullptr},
+        {VIEW_BLOOD_PRESSURE_CALIBRATION, PNG_APPLIST_SPO2_IMAGE_BIG, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血压", STR_BLOOD_OXYGEN, nullptr},
         {VIEW_SLEEP, PNG_APPLIST_SLEEP_IMAGE_BIG, PNG_APPLIST_SLEEP_IMAGE, PNG_APPLIST_DEFAULT_IMG, "睡眠", STR_SLEEP, nullptr},
         {VIEW_TRAINING, PNG_APPLIST_TRAINING_IMAGE_BIG, PNG_APPLIST_TRAINING_IMAGE, PNG_APPLIST_DEFAULT_IMG, "运动", STR_TRAINING, nullptr},
         {VIEW_TRAINING_RECORD, PNG_APPLIST_TRAINING_RECORD_IMAGE_BIG, PNG_APPLIST_TRAINING_RECORD_IMAGE, PNG_APPLIST_DEFAULT_IMG, "运动记录", STR_TRAINING_RECORD, nullptr},