修改检测失败退出逻辑

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectionView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectionView.h
index d0e19fd..640d754 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectionView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectionView.h
@@ -41,6 +41,7 @@
 #define RE_CLICK_BLOOD_PRESSURE "re_click_bloodpressure"
 #define BP_SOS_CLICK "sos_click"
 #define EXIE_CLICK "exit_click"
+#define RE_CLICK_FAIL "re_click_fail"
 
 namespace OHOS {
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFailView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFailView.cpp
index d7c612a..4490642 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFailView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFailView.cpp
@@ -69,9 +69,9 @@ namespace OHOS
    
         InitImageView(icon_fail, 131, 131, 100, 100, "image_bp", image_bp);
 
-        InitLabel(titlefail, 133, 57, 230, 80, "titlefail","测量失败", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(titlefail, 133, 57, 200, 50, "titlefail","测量失败", DEFAULT_VECTOR_FONT_FILENAME, 30);
 
-        InitButtonExt(ReCheckButton, 118, 360, 230, 80,  RE_CLICK_BLOOD_PRESSURE,STR_RECHECK, 30);
+        InitButtonExt(ReCheckButton, 118, 360, 230, 80,  RE_CLICK_FAIL,STR_RECHECK, 30);
         ReCheckButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffFF8A36); // 设置按键颜色
         UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::BPDetectionPresenter::GetInstance();
         ReCheckButton->SetOnClickListener(clickListener);//设置按键监听

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionPresenter.cpp
index 43f080e..b518561 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionPresenter.cpp
@@ -103,8 +103,16 @@ namespace OHOS
         //预警界面->退出
         else if (strcmp(view.GetViewId(), EXIE_CLICK) == 0)
         {
-            // NavigateBack();
-            BPDetectionView::GetInstance()->ChangeView(ERROR_BPVIEW,FAIL_BPVIEW);//test
+            NavigateBack();
+            // BPDetectionView::GetInstance()->ChangeView(ERROR_BPVIEW,FAIL_BPVIEW);//test
+        }
+        //检测失败界面->重新检测
+        else if (strcmp(view.GetViewId(), RE_CLICK_FAIL) == 0)
+        {
+            //设置状态为检测状态
+            BPModel::GetInstance()->BP_Control(BPState::BP_DETECTING);
+            BPDetectionView::GetInstance()->ChangeView(FAIL_BPVIEW,CALIBRATION_BPVIEW);
+            BPModel::GetInstance()->BP_StartTimer();//开始计时器，计时结束后自动切换到主界面
         }
         return true;
     }