增加视图宏定义

diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt
index f353a93..b60ad5c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/CMakeLists.txt
+++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt
@@ -225,10 +225,11 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp
 
     #BloodPressure
-    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPCalibrationView.cpp
+
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPUnderCalibrationView.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPValueView.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPCalibrationPassView.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPResultAnalysisView.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPCalibrationMindView.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPSecUnderCalibrationView.cpp

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index b9d63e7..8368d21 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
@@ -539,6 +539,8 @@ namespace OHOS
     static constexpr const char *PNG_APPLIST_CHANGEDIAL_IMAGE = APP_LIST_PATH "/changedial.bin";    // 切换表盘
     static constexpr const char *PNG_APPLIST_ALARM_IMAGE = APP_LIST_PATH "/alarm.bin";              // 闹钟
     static constexpr const char *PNG_APPLIST_SPO2_IMAGE = APP_LIST_PATH "/booldoxygen.bin";         // 血氧
+    static constexpr const char *PNG_APPLIST_BP_MESSURE_IMAGE = APP_LIST_PATH "/blood_pressure.bin";         // 血压测量
+    static constexpr const char *PNG_APPLIST_BP_IMAGE = APP_LIST_PATH "/bp_calibration.bin";         // 血压校准
     static constexpr const char *PNG_APPLIST_HEART_IMAGE = APP_LIST_PATH "/heart.bin";              // 心率
     static constexpr const char *PNG_APPLIST_SETTING_IMAGE = APP_LIST_PATH "/setting.bin";          // 设置
     static constexpr const char *PNG_APPLIST_CALLER_IMAGE = APP_LIST_PATH "/phone.bin";             // 打电话
@@ -575,6 +577,8 @@ namespace OHOS
     static constexpr const char *PNG_APPLIST_CHANGEDIAL_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/changedial.bin";    // 切换表盘
     static constexpr const char *PNG_APPLIST_ALARM_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/alarm.bin";              // 闹钟
     static constexpr const char *PNG_APPLIST_SPO2_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/booldoxygen.bin";         // 血氧
+    static constexpr const char *PNG_APPLIST_BP_MESSURE_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/blood_pressure.bin";   // 血压测量
+    static constexpr const char *PNG_APPLIST_BP_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/bp_calibration.bin";   // 血压校准
     static constexpr const char *PNG_APPLIST_HEART_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/heart.bin";              // 心率
     static constexpr const char *PNG_APPLIST_SETTING_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/setting.bin";          // 设置
     static constexpr const char *PNG_APPLIST_CALLER_IMAGE_BIG = APP_LIST_PATH "/applist_big_icon/phone.bin";             // 打电话

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationErrorView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationErrorView.h
index d6d4eed..bf9047d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationErrorView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationErrorView.h
@@ -11,6 +11,7 @@
 #include "components/ui_label_button_ext.h"
 namespace OHOS
 {
+    static constexpr const char *ERRORCHECKBUTTON = "errorcheckButton"; // 校准按钮
 
     class BPCalibrationErrorView
     {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationMindView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationMindView.h
index d7bd058..b2522f4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationMindView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationMindView.h
@@ -11,7 +11,7 @@
 #include "components/ui_label_button_ext.h"
 namespace OHOS
 {
-
+    static constexpr const char *MINDCHECKBUTTON = "mindcheckButton"; // 校准按钮
     class BPCalibrationMindView
     {
     public:

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationPassView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationPassView.h
index 0171aa4..de99f10 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationPassView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationPassView.h
@@ -11,7 +11,7 @@
 #include "components/ui_label_button_ext.h"
 namespace OHOS
 {
-
+    static constexpr char *PASSCAECKBUTTON = "passcheckButton"; // 确认按钮
     class BPCalibrationPassView
     {
     public:

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp
index c4a5ca3..1c5eb07 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp
@@ -73,7 +73,7 @@ namespace OHOS
     bool BPCalibrationErrorView::AddButton()
     {
          InitLabelButton(checkButton, 125, 365, 217, 63, "errorcheckButton", "重新校准", 35);
-        checkButton->SetViewId("errorcheckButton");
+        checkButton->SetViewId(ERRORCHECKBUTTON);
         checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); // 设置按键颜色
         checkButton->SetTextColor(Color::White());
         // 设置按键监听

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp
index bf13d01..b74f926 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp
@@ -77,7 +77,7 @@ namespace OHOS
     bool BPCalibrationMindView::AddButton()
     {
         InitLabelButton(checkButton, 125, 365, 217, 63, "mindcheckButton", "我已测完", 35);
-        checkButton->SetViewId("mindcheckButton");
+        checkButton->SetViewId(MINDCHECKBUTTON);
         checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); // 设置按键颜色
         checkButton->SetTextColor(Color::White());
         // 设置按键监听