From 9721702d25fe8601f65fbd12299dc36e64c22ac0 Mon Sep 17 00:00:00 2001 From: Caisking Date: Fri, 13 Jun 2025 17:35:43 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E8=A1=80=E5=8E=8B=E6=B5=8B?= =?utf8?q?=E9=87=8FVIEW=5FID?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativelauncher/include/AppViewIDs.h | 17 +----------- .../nativelauncher/include/NativeLauncher.h | 2 ++ .../nativelauncher/src/NativeLauncher.cpp | 27 +++++++++++++++---- .../nativeui/applist/src/ApplistModel.cpp | 2 +- 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h index 317ee5792..bbda615ba 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h @@ -92,7 +92,7 @@ typedef enum : uint16_t VIEW_SET_HEART, // 设置心率周期检测 VIEW_CODED_LOCK, // 密码锁 //血压测量 - VIEW_BLOOD_PRESSURE, + VIEW_BLOOD_PRESSURE_CHECK, //血压校准 VIEW_BLOOD_PRESSURE_CALIBRATION, //压力 @@ -104,21 +104,6 @@ typedef enum : uint16_t //疲劳度 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/include/NativeLauncher.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h index 92e808e97..210e90cd7 100644 --- 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 2c1c096b0..ed405c8a0 100644 --- 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" -/*血压检测*/ +/*血压校准*/ #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_CALIBRATION_CALIBRATION_CALIBRATION_CALIBRATION_CALIBRATION_CALIBRATION_CALIBRATION, &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_CALIBRATION_CALIBRATION_CALIBRATION_CALIBRATION, 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; + 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 7c866bed6..879479886 100644 --- 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_CALIBRATION_CALIBRATION, 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}, -- 2.17.1