修改校准流程

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp
index 8ae9e75..8bb7c24 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp
@@ -126,7 +126,6 @@ namespace OHOS
 
     bool BPMainPresenter::OnClick(UIView &view, const ClickEvent &event)
     {
-
         std::string viewId = view.GetViewId();
 
         std::map<std::string, std::pair<int16_t, int16_t>> viewIdMap = {
@@ -139,47 +138,36 @@ namespace OHOS
             BPMainView::GetInstance()->ChangeView(it->second.first, it->second.second);
             return true;
         }
-        else if (strcmp(view.GetViewId(), STARTCALIBRATIONBUTTON) == 0)
+        else if (strcmp(view.GetViewId(), STARTCALIBRATIONBUTTON) == 0) // 首界面到提醒界面  第一步
         {
-            BPModel::GetInstance()->BP_Control(BPState::BP_CALIBRATING_FIRSTTIME);
-            BPMainView::GetInstance()->ChangeView(BPCALPOSREQVIEW, BPUNDERCALIBRATIONVIEW);
+            BPMainView::GetInstance()->ChangeView(BPCALPOSREQVIEW, BPCALIBRATIONMINDVIEW);
         }
-        else if (strcmp(view.GetViewId(), STARTCALIBRATIONBUTTON) == 0) // 首界面到校准界面  第一步
+        else if (strcmp(view.GetViewId(), CALIBRATIONBUTTON) == 0) // 上次校准时间界面到提醒界面
         {
-            BPModel::GetInstance()->BP_Control(BPState::BP_CALIBRATING_FIRSTTIME);
-            BPMainView::GetInstance()->ChangeView(BPCALPOSREQVIEW, BPUNDERCALIBRATIONVIEW);
+            BPMainView::GetInstance()->ChangeView(BPLASTCALIBRATIONTIME, BPCALIBRATIONMINDVIEW);
         }
-        else if (strcmp(view.GetViewId(), CALIBRATIONBUTTON) == 0) // 上次校准时间界面到二次校准界面
+        else if (strcmp(view.GetViewId(), ERRORCHECKBUTTON) == 0) // 失败界面到提醒界面
         {
-            BPModel::GetInstance()->BP_Control(BPState::BP_CALIBRATING_SECONDTIME);
-            BPMainView::GetInstance()->ChangeView(BPLASTCALIBRATIONTIME, BPSECUNDERCALIBRATIONVIEW);
+             BPMainView::GetInstance()->ChangeView(BPCALIBRATIONMINDVIEW, BPRESULTANALYSISVIEW);
         }
-        else if (strcmp(view.GetViewId(), ERRORCHECKBUTTON) == 0) // 失败界面到校准界面
+        else if (strcmp(view.GetViewId(), VALUECHECKBUTTON) == 0) // 血压值界面到校准界面
         {
-            if (BPModel::GetInstance()->GetCalibrationFlag() == 1) // 第一次校准失败
+            if (BPModel::GetInstance()->GetCalibrationFlag() == 0) // 第一次校准
             {
                 BPModel::GetInstance()->BP_Control(BPState::BP_CALIBRATING_FIRSTTIME);
-                BPMainView::GetInstance()->ChangeView(BPCALIBRATIONERRORVIEW, BPUNDERCALIBRATIONVIEW);
+                BPMainView::GetInstance()->ChangeView(BPVALUEVIEW, BPUNDERCALIBRATIONVIEW);
             }
-            else if (BPModel::GetInstance()->GetCalibrationFlag() == 3) // 第二次校准失败
+            else if (BPModel::GetInstance()->GetCalibrationFlag() == 2) // 第二次校准
             {
                 BPModel::GetInstance()->BP_Control(BPState::BP_CALIBRATING_SECONDTIME);
-                BPMainView::GetInstance()->ChangeView(BPCALIBRATIONERRORVIEW, BPSECUNDERCALIBRATIONVIEW);
+                BPMainView::GetInstance()->ChangeView(BPVALUEVIEW, BPSECUNDERCALIBRATIONVIEW);
             }
         }
-        else if (strcmp(view.GetViewId(), VALUECHECKBUTTON) == 0) // 血压值界面到结果分析界面
-        {
-          
-            BPModel::GetInstance()->BP_CALIBTATION();
-            BPModel::GetInstance()->BP_Control(BPState::BP_CALIBRATING_ANGLYSIS);
-            BPMainView::GetInstance()->ChangeView(BPVALUEVIEW, BPRESULTANALYSISVIEW);
-        }
         else if (strcmp(view.GetViewId(), PASSCAECKBUTTON) == 0) // 校准成功界面
         {
-            if (passflag == 0)
+            if (BPModel::GetInstance()->GetCalibrationFlag() == 2)
             {
                 BPMainView::GetInstance()->ChangeView(BPCALIBRATIONPASSVIEW, BPLASTCALIBRATIONTIME);
-                passflag = 1;
             }
             else // 全部校准成功
             {
@@ -193,7 +181,6 @@ namespace OHOS
                 {
                     NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);
                 }
-                passflag = 0;
             }
         }
         else if (strcmp(view.GetViewId(), "SBPLeft") == 0)