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

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
index 4d12f5b..317ee57 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,34 @@ typedef enum : uint16_t
     VIEW_SET_DIAL,       // 切换表盘
     VIEW_SET_HEART,      // 设置心率周期检测
     VIEW_CODED_LOCK,     // 密码锁
-    VIEW_BLOOD_PRESSURE, // 血压监测
+    //血压测量
+    VIEW_BLOOD_PRESSURE, 
+    //血压校准
+    VIEW_BLOOD_PRESSURE_CALIBRATION,
+    //压力
+    VIEW_PRESSURE,
+    //情绪
+    VIEW_EMOTION,
+    //ECG
+    VIEW_ECG,
+    //疲劳度
+    VIEW_FATIGUE,
+    /* -------------------------------------------------------------------------- */
+    VIEW_MAIN_SPORT, // 运动
+    VIEW_MAIN_HEALTH,// 健康
+    VIEW_MAIN_TOOLS, // 工具
+    VIEW_MAIN_CARD,  // 卡片
+    VIEW_MAIN_FIND,  // 查找
+    VIEW_MAIN_ME,    // 我
+    VIEW_MAIN_WATCHFACE, // 表盘
+    VIEW_MAIN_SETTING,   // 设置
+    VIEW_MAIN_MESSAGE,   // 信息通知
+    VIEW_MAIN_ALARM_CLOCK,//闹钟
+    VIEW_MAIN_BLUETOOTH, //蓝牙
+    VIEW_MAIN_CALLERLOG, //通话记录
+    VIEW
+
+
     /* ----------------------------------- 训练 ----------------------------------- */
     VIEW_TRAINING,        // 训练
     VIEW_TRAININGNOMAL,   // 正常训练开始界面（除骑行，健走，跑步外）

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index 581f39d..2c1c096 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -449,7 +449,7 @@ namespace OHOS
         {VIEW_BLOOD_CHECK, &NativeLauncher::InitBloodCheckSlice},
         {VIEW_BLOOD_RESULT, &NativeLauncher::InitBloodResultSlice},
          /*血压检测*/
-        {VIEW_BLOOD_PRESSURE, &NativeLauncher::InitBloodPressureSlice},
+        {VIEW_BLOOD_PRESSURE_CALIBRATION_CALIBRATION_CALIBRATION_CALIBRATION_CALIBRATION_CALIBRATION_CALIBRATION, &NativeLauncher::InitBloodPressureSlice},
         /*心率检测*/
         {VIEW_HEART_CHECK, &NativeLauncher::InitHeartCheckSlice},
         {VIEW_HEART_RESULT, &NativeLauncher::InitHeartResultSlice},
@@ -1336,7 +1336,7 @@ 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_CALIBRATION_CALIBRATION_CALIBRATION, bloodPressureView);
     }
     // 心率监测界面
     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..7c866be 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_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},