Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...

diff --cc code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPValueView.h
index 837933e,7b4cd80..83a627d
--- 1/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPValueView.h
--- 2/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPValueView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPValueView.h
@@@ -11,12 -10,9 +11,12 @@@
  #include "components/ui_scroll_view.h"
  #include "components/ui_label_button_ext.h"
  
 +#include "bloodpressure/include/BPModel.h"
 +
 +
  namespace OHOS
  {
- 
+     static constexpr const char *VALUECHECKBUTTON = "valuecheckButton"; // 校准按钮
      class BPValueView
      {
      public:

diff --cc code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp
index a02ff16,71b2357..391d5df
--- 1/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp
@@@ -134,61 -159,36 +135,64 @@@ namespace OHO
              BPModel::GetInstance()->BP_StartTimer(); // 开始计时器，计时结束后自动切换到主界面
          }
  
 -        if (strcmp(view.GetViewId(),CALIBRATIONBUTTON) == 0)  // 上次校准时间界面到二次校准界面
 +        else if (strcmp(view.GetViewId(), "value_check") == 0 && flag == 0)
 +        {
 +            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "value_check");
 +            BPMainView::GetInstance()->ChangeView(BPVALUEVIEW, BPSECUNDERCALIBRATIONVIEW);
 +            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");
+             BPModel::GetInstance()->BP_Control(BPState::BP_CALIBRATING_SECONDTIME);
+             BPMainView::GetInstance()->ChangeView(BPLASTCALIBRATIONTIME, BPSECUNDERCALIBRATIONVIEW);
+             BPModel::GetInstance()->BP_StartTimer(); // 开始计时器，计时结束后自动切换到主界面
          }
 -        if (strcmp(view.GetViewId(), "SBPLeft") == 0)
 +        else if (strcmp(view.GetViewId(), "SBPLeft") == 0)
          {
 -            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SBPLeft_BP");
 +            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SBPLeft_BP");
 +            BPModel::GetInstance()->BP_SetValue(BP_VALUE_TYPE::SBP,false);
 +            if(BPValueView::GetInstance()){
 +             BPValueView::GetInstance()->UpDateVauleText(BP_VALUE_TYPE::SBP);
 +            }
          }
 -        if (strcmp(view.GetViewId(), "SBPRight") == 0)
 +        else if (strcmp(view.GetViewId(), "SBPRight") == 0)
          {
 -            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SBPRight");
 +            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SBPRight");
 +            BPModel::GetInstance()->BP_SetValue(BP_VALUE_TYPE::SBP,true);
 +            if(BPValueView::GetInstance()){
 +             BPValueView::GetInstance()->UpDateVauleText(BP_VALUE_TYPE::SBP);
 +            }
          }
 -        if (strcmp(view.GetViewId(), "DBPLeft") == 0)
 +        else if (strcmp(view.GetViewId(), "DBPLeft") == 0)
          {
 -            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DBPLeft");
 +            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DBPLeft");
 +            BPModel::GetInstance()->BP_SetValue(BP_VALUE_TYPE::DBP,false);
 +            if(BPValueView::GetInstance()){
 +             BPValueView::GetInstance()->UpDateVauleText(BP_VALUE_TYPE::DBP);
 +            }
          }
 -        if (strcmp(view.GetViewId(), "DBPRight") == 0)
 +        else if (strcmp(view.GetViewId(), "DBPRight") == 0)
          {
 -            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DBPRight");
 +            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DBPRight");
 +            BPModel::GetInstance()->BP_SetValue(BP_VALUE_TYPE::DBP,true);
 +            if(BPValueView::GetInstance()){
 +             BPValueView::GetInstance()->UpDateVauleText(BP_VALUE_TYPE::DBP);
 +            }
          }
          else if (strcmp(view.GetViewId(), CALIBRATIONLATTERBUTTON) == 0)
          {
-             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CALIBRATIONLATTERBUTTON");
-         }
-         else if (strcmp(view.GetViewId(), CALIBRATIONBUTTON) == 0)
-         {
-             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CALIBRATIONBUTTON");
+             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CALIBRATIONLATTERBUTTON");
+             //退出
          }
          return true;
 -        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPPresenter::OnClick");
 +        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPPresenter::OnClick");
      }
  
  }

diff --cc code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPValueView.cpp
index 6eb415e,3e86196..2a698d0
--- 1/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPValueView.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPValueView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPValueView.cpp
@@@ -84,24 -88,9 +84,22 @@@ namespace OHO
              delete DBPRight;
              DBPRight = nullptr;
          }
 +        if (SBPValue != nullptr)
 +        {
 +            delete SBPValue;
 +            SBPValue = nullptr;
 +        }
 +        if (DBPValue != nullptr)
 +        {
 +            delete DBPValue;
 +            DBPValue = nullptr;
 +        }
 +            group->RemoveAll();
 +            delete group;
 +            group = nullptr;
 +        }
      }
-     /* -------------------------------------------------------------------------- */
  
--    /* -------------------------------------------------------------------------- */
      /***
       * @description:
       * @return 添加按键是否成功