修复编译问题

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 391d5df..bd72afa 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp
@@ -115,6 +115,7 @@ 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 = {
             {MINDCHECKBUTTON, {BPCALIBRATIONMINDVIEW, BPVALUEVIEW}},              // 提醒界面到血压值界面
             {ERRORCHECKBUTTON, {BPCALIBRATIONERRORVIEW, BPUNDERCALIBRATIONVIEW}}, // 失败界面到校准界面
@@ -134,19 +135,14 @@ namespace OHOS
             BPMainView::GetInstance()->ChangeView(BPCALPOSREQVIEW, BPUNDERCALIBRATIONVIEW);
             BPModel::GetInstance()->BP_StartTimer(); // 开始计时器，计时结束后自动切换到主界面
         }
-
-        else if (strcmp(view.GetViewId(), "value_check") == 0 && flag == 0)
+        else if (strcmp(view.GetViewId(), STARTCALIBRATIONBUTTON) == 0) // 首界面到校准界面  第一步
         {
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "value_check");
-            BPMainView::GetInstance()->ChangeView(BPVALUEVIEW, BPSECUNDERCALIBRATIONVIEW);
+            BPModel::GetInstance()->BP_Control(BPState::BP_CALIBRATING_FIRSTTIME);
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "STARTCALIBRATIONBUTTON");
+            BPMainView::GetInstance()->ChangeView(BPCALPOSREQVIEW, BPUNDERCALIBRATIONVIEW);
             BPModel::GetInstance()->BP_StartTimer(); // 开始计时器，计时结束后自动切换到主界面
-            flag++;
         }
-        else if (strcmp(view.GetViewId(), "value_check") == 0 && flag == 1)
-        {
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "value_check");
-            BPMainView::GetInstance()->ChangeView(BPVALUEVIEW, BPRESULTANALYSISVIEW);
-            flag = 0;
+
         else if (strcmp(view.GetViewId(),CALIBRATIONBUTTON) == 0)  // 上次校准时间界面到二次校准界面
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CALIBRATIONBUTTON");

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 9a165e0..f0d43b8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp
@@ -158,6 +158,7 @@ namespace OHOS
     // 更新状态
     BP_SetState(state);
   }
+  /////////////////////////////////////////////////////////
   // 机器校准收缩压与舒张压的数值
   void  BPModel::BP_SetValue(BP_VALUE_TYPE type, bool set_value)
   {