增加血压设置区间

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp
index 6c37bc6..5dc522b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp
@@ -45,7 +45,7 @@ namespace OHOS
 #define MAX_UNWARE_COUNT 10
 #define MAX_VALID_SPO2_COUNT 30
 #define MAX_DISVALID_SPO2_COUNT 100
-static uint16 CalibrationFlag = 0;
+  static uint16 CalibrationFlag = 0;
 
   // 声明定时器变量
   static osTimerId_t g_timer = nullptr;
@@ -58,9 +58,9 @@ static uint16 CalibrationFlag = 0;
     static BPModel instance;
     return &instance;
   }
-   int16_t BPModel::GetCalibrationFlag()
+  int16_t BPModel::GetCalibrationFlag()
   {
-    
+
     return CalibrationFlag;
   }
 
@@ -163,16 +163,18 @@ static uint16 CalibrationFlag = 0;
     if (set_value)
     {
       if (type == BP_VALUE_TYPE::SBP)
-        custom_sbp++;
-      else
-        custom_dbp++;
+        if (custom_sbp < 250)
+          custom_sbp++;
+        else if (custom_dbp < 150)
+          custom_dbp++;
     }
     else
     {
       if (type == BP_VALUE_TYPE::SBP)
-        custom_sbp--;
-      else
-        custom_dbp--;
+        if (custom_sbp > 50)
+          custom_sbp--;
+        else if (custom_dbp > 30)
+          custom_dbp--;
     }
   }
   int16_t BPModel::GetValue(BP_VALUE_TYPE type)
@@ -187,7 +189,6 @@ static uint16 CalibrationFlag = 0;
   /*定时器到期时的处理*/
   static void BP_TimerCallbackProc(int data)
   {
-    
 
     // 倒计时
     Time--;
@@ -201,7 +202,7 @@ static uint16 CalibrationFlag = 0;
         BPMainView::GetInstance()->ChangeView(BPUNDERCALIBRATIONVIEW, BPCALIBRATIONMINDVIEW);
         CalibrationFlag++;
       }
-      else if (BPMainView::GetInstance() && ( CalibrationFlag == 1 || CalibrationFlag == 3)) // 分析完
+      else if (BPMainView::GetInstance() && (CalibrationFlag == 1 || CalibrationFlag == 3)) // 分析完
       {
         // 校准成功
         BPMainView::GetInstance()->ChangeView(BPRESULTANALYSISVIEW, BPCALIBRATIONPASSVIEW);