private:
BPCalibrationView *p_BPCalibrationView{nullptr};
BPUnderCalibrationView *p_BPUnderCalibrationView{nullptr};
- BPSecUnderCalibrationView *p_SecBPUnderCalibrationView{nullptr};
+ BPSecUnderCalibrationView *g_pBPSecUnderCalibrationView{nullptr};
BPValueView *g_pBPValueView{nullptr};
BPCalibrationPassView *g_pBPCalibrationPassView{nullptr};
BPCalibrationErrorView *g_pBPCalibrationErrorView{nullptr};
{
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "errorcheckButton");
BPMainView::GetInstance()->ChangeView(BPCALIBRATIONERRORVIEW,BPCALIBRATIONMINDVIEW);
-
+
+ }
if(strcmp(view.GetViewId(),STARTCALIBRATIONBUTTON) == 0)
{
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "STARTCALIBRATIONBUTTON");
}
- WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPPresenter::OnClick");
return true;
+ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPPresenter::OnClick");
}
+
+
}
\ No newline at end of file
}
return true;
}
- bool BPMainView::ChangeSecBPUnderCalibrationView(int16_t thisView)
+ bool BPMainView::ChangeBPSecUnderCalibrationView(int16_t thisView)
{
// 检查视图是否已初始化
if (group[thisView] == nullptr)
{
WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BloodPressureView::ChangeSecUnderInitialCalibrationView");
- p_SecBPUnderCalibrationView = new SecBPUnderCalibrationView();
- if (p_SecBPUnderCalibrationView == nullptr)
+ g_pBPSecUnderCalibrationView = new BPSecUnderCalibrationView();
+ if (g_pBPSecUnderCalibrationView == nullptr)
{
WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodPressureView:: new scrollView[%d] fail", thisView);
return false;
}
// 初始化视图并添加到视图组
- group[thisView] = p_SecBPUnderCalibrationView->SecBPUnderCalibrationInit();
+ group[thisView] = g_pBPSecUnderCalibrationView->BPSecUnderCalibrationInit();
container_->Add(group[thisView]);
}
return true;
static const BPViewMapper ViewMapper[] = {
{BPCALIBRATIONVIEW, &BPMainView::ChangeBPCalibrationView},
{BPUNDERCALIBRATIONVIEW, &BPMainView::ChangeBPUnderCalibrationView},
- {SECBPUNDERCALIBRATIONVIEW, &BPMainView::ChangeSecBPUnderCalibrationView},
+ {BPSECUNDERCALIBRATIONVIEW, &BPMainView::ChangeBPSecUnderCalibrationView},
{BPVALUEVIEW, &BPMainView::ChangeBPValueView},
{BPCALIBRATIONPASSVIEW, &BPMainView::ChangeBPCalibrationPassView},
{BPCALIBRATIONERRORVIEW, &BPMainView::ChangeBPCalibrationErrorView},