From b08b73e5099fb2f278b8bb8ca8803e9d3e81cdf5 Mon Sep 17 00:00:00 2001 From: Caisking Date: Wed, 18 Jun 2025 14:07:09 +0800 Subject: [PATCH] =?utf8?q?=E5=85=B3=E9=97=AD=E4=B8=8D=E5=BF=85=E8=A6=81?= =?utf8?q?=E7=9A=84=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../bloodpressure/src/BPCalPosReqView.cpp | 18 ++++++------ .../src/BPCalibrationErrorView.cpp | 6 ++-- .../src/BPCalibrationMindView.cpp | 6 ++-- .../src/BPCalibrationPassView.cpp | 6 ++-- .../src/BPLastCalibrationTimeView.cpp | 8 ++--- .../bloodpressure/src/BPMainPresenter.cpp | 14 ++++----- .../nativeui/bloodpressure/src/BPMainView.cpp | 12 ++++---- .../nativeui/bloodpressure/src/BPModel.cpp | 29 ++++--------------- .../src/BPResultAnalysisView.cpp | 6 ++-- .../src/BPSecUnderCalibrationView.cpp | 8 ++--- .../src/BPUnderCalibrationView.cpp | 14 ++++----- .../bloodpressure/src/BPValueView.cpp | 14 ++++----- .../src/detection/BPDetectEndView.cpp | 6 ++-- .../src/detection/BPDetectErrorView.cpp | 4 +-- .../src/detection/BPDetectFailView.cpp | 4 +-- .../src/detection/BPDetectFirstView.cpp | 6 ++-- .../src/detection/BPDetectSOSView.cpp | 6 ++-- .../src/detection/BPDetectionPresenter.cpp | 3 -- .../src/detection/BPDetectionView.cpp | 2 +- 19 files changed, 75 insertions(+), 97 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalPosReqView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalPosReqView.cpp index bb903d552..99d8badce 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalPosReqView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalPosReqView.cpp @@ -22,13 +22,13 @@ namespace OHOS static BPCalPosReqView *g_pBPCalPosReqView{nullptr}; BPCalPosReqView::BPCalPosReqView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPCalPosReqView::BPCalPosReqView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPCalPosReqView::BPCalPosReqView"); g_pBPCalPosReqView = this; } BPCalPosReqView::~BPCalPosReqView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPCalPosReqView::~BPCalPosReqView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPCalPosReqView::~BPCalPosReqView"); DeInit(); g_pBPCalPosReqView = nullptr; } @@ -91,7 +91,7 @@ namespace OHOS label[i] = new UILabelExt(); if (label[i] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label[i] null!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "label[i] null!"); return false; } if (i == 0) @@ -103,7 +103,7 @@ namespace OHOS int y = label[i - 1]->GetY() + label[i - 1]->GetHeight(); label[i]->SetPosition((HORIZONTAL_RESOLUTION - BPCALPOSREQVIEW_LABEL_W) / 2, y, BPCALPOSREQVIEW_LABEL_W, BPCALPOSREQVIEW_LABEL_LINE_HEIGHT); } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label[%d]->GetY() = %d", i, label[i]->GetY()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "label[%d]->GetY() = %d", i, label[i]->GetY()); label[i]->SetStyle(STYLE_TEXT_FONT, BPCALPOSREQVIEW_LABEL_TEXT_SIZE); label[i]->SetStyle(STYLE_LINE_HEIGHT, BPCALPOSREQVIEW_LABEL_LINE_HEIGHT); label[i]->SetText(str[i]); @@ -118,7 +118,7 @@ namespace OHOS label2 = new UILabelExt(); if (label2 == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label2 null!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "label2 null!"); return false; } } @@ -138,7 +138,7 @@ namespace OHOS image = new UIImageView(); if (image == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "image null!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "image null!"); return false; } } @@ -151,7 +151,7 @@ namespace OHOS label3 = new UILabelExt(); if (label3 == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label3 null!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "label3 null!"); return false; } } @@ -169,7 +169,7 @@ namespace OHOS UIViewGroup *BPCalPosReqView::InitBPCalPosReqView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPCalPosReqView::InitBPCalPosReqView start"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPCalPosReqView::InitBPCalPosReqView start"); if (group == nullptr) { group = new UIViewGroup(); @@ -258,7 +258,7 @@ namespace OHOS temp->SetPosition(43, startCalibrationButton->GetY() + startCalibrationButton->GetHeight(), 380, BPCALPOSREQVIEW_LABEL_GAP); temp->SetVisible(false); scrollview->Add(temp); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPCalPosReqView::InitBPCalPosReqView end"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPCalPosReqView::InitBPCalPosReqView end"); return group; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp index 1fc29a853..f79fec735 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationErrorView.cpp @@ -18,12 +18,12 @@ namespace OHOS BPCalibrationErrorView::BPCalibrationErrorView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPCalibrationErrorView::BPCalibrationErrorView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPCalibrationErrorView::BPCalibrationErrorView"); g_pBPCalibrationErrorView = this; } BPCalibrationErrorView::~BPCalibrationErrorView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPCalibrationErrorView::~BPCalibrationErrorView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPCalibrationErrorView::~BPCalibrationErrorView"); DeInit(); g_pBPCalibrationErrorView = nullptr; } @@ -113,7 +113,7 @@ namespace OHOS */ UIViewGroup *BPCalibrationErrorView::BPCalibrationErrorInit() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bool BPCalibrationErrorView::InitView()"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bool BPCalibrationErrorView::InitView()"); group = new UIViewGroup(); if (group == nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp index 0e7ab85e8..700f9ab1b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationMindView.cpp @@ -18,12 +18,12 @@ namespace OHOS static const char *MINDPATH = "/user/res/BPCalibration/Y.bin"; BPCalibrationMindView::BPCalibrationMindView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPCalibrationMindView::BPCalibrationMindView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPCalibrationMindView::BPCalibrationMindView"); g_pBPCalibrationMindView = this; } BPCalibrationMindView::~BPCalibrationMindView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPCalibrationMindView::~BPCalibrationMindView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPCalibrationMindView::~BPCalibrationMindView"); DeInit(); g_pBPCalibrationMindView = nullptr; } @@ -125,7 +125,7 @@ namespace OHOS */ UIViewGroup *BPCalibrationMindView::BPCalibrationMindInit() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bool BPCalibrationMindView::InitView()"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bool BPCalibrationMindView::InitView()"); group = new UIViewGroup(); if (group == nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationPassView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationPassView.cpp index a76edc7cb..fca6f4219 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationPassView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationPassView.cpp @@ -18,12 +18,12 @@ namespace OHOS BPCalibrationPassView::BPCalibrationPassView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPCalibrationPassView::BPCalibrationPassView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPCalibrationPassView::BPCalibrationPassView"); g_pBPCalibrationPassView = this; } BPCalibrationPassView::~BPCalibrationPassView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPCalibrationPassView::~BPCalibrationPassView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPCalibrationPassView::~BPCalibrationPassView"); DeInit(); g_pBPCalibrationPassView = nullptr; } @@ -113,7 +113,7 @@ namespace OHOS */ UIViewGroup *BPCalibrationPassView::BPCalibrationPassInit() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bool BPCalibrationPassView::InitView()"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bool BPCalibrationPassView::InitView()"); group = new UIViewGroup(); if (group == nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPLastCalibrationTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPLastCalibrationTimeView.cpp index 042d3952e..51cb657c4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPLastCalibrationTimeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPLastCalibrationTimeView.cpp @@ -7,12 +7,12 @@ namespace OHOS static BPLastCalibrationTimeView *g_pBPLastCalibrationTimeView{nullptr}; BPLastCalibrationTimeView::BPLastCalibrationTimeView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPLastCalibrationTimeView::BPLastCalibrationTimeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPLastCalibrationTimeView::BPLastCalibrationTimeView"); g_pBPLastCalibrationTimeView = this; } BPLastCalibrationTimeView::~BPLastCalibrationTimeView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPLastCalibrationTimeView::~BPLastCalibrationTimeView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPLastCalibrationTimeView::~BPLastCalibrationTimeView"); DeInit(); g_pBPLastCalibrationTimeView = nullptr; } @@ -50,7 +50,7 @@ namespace OHOS if (timeLabel != nullptr) { std::string str = time; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdateCalibrationTime: %s", str.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdateCalibrationTime: %s", str.c_str()); timeLabel->SetText(str.c_str()); timeLabel->Invalidate(); } @@ -63,7 +63,7 @@ namespace OHOS group = new UIViewGroup(); if (group == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "group null!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "group null!"); return nullptr; } } 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 bd72afab3..f285aad1a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp @@ -82,7 +82,11 @@ namespace OHOS void BPMainPresenter::OnResume(void) {} - void BPMainPresenter::OnStop(void) {} + void BPMainPresenter::OnStop(void) + { + //重置状态 + BPModel::GetInstance()->BP_Control(BPState::BP_NORMAL); + } bool BPMainPresenter::OnDrag(UIView &view, const DragEvent &event) { @@ -131,24 +135,18 @@ namespace OHOS else if (strcmp(view.GetViewId(), STARTCALIBRATIONBUTTON) == 0) { BPModel::GetInstance()->BP_Control(BPState::BP_CALIBRATING_FIRSTTIME); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "STARTCALIBRATIONBUTTON"); BPMainView::GetInstance()->ChangeView(BPCALPOSREQVIEW, BPUNDERCALIBRATIONVIEW); - BPModel::GetInstance()->BP_StartTimer(); // 开始计时器，计时结束后自动切换到主界面 } else if (strcmp(view.GetViewId(), STARTCALIBRATIONBUTTON) == 0) // 首界面到校准界面 第一步 { BPModel::GetInstance()->BP_Control(BPState::BP_CALIBRATING_FIRSTTIME); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "STARTCALIBRATIONBUTTON"); BPMainView::GetInstance()->ChangeView(BPCALPOSREQVIEW, BPUNDERCALIBRATIONVIEW); - BPModel::GetInstance()->BP_StartTimer(); // 开始计时器，计时结束后自动切换到主界面 } 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(); // 开始计时器，计时结束后自动切换到主界面 } else if (strcmp(view.GetViewId(), "SBPLeft") == 0) { @@ -184,7 +182,7 @@ namespace OHOS } else if (strcmp(view.GetViewId(), CALIBRATIONLATTERBUTTON) == 0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CALIBRATIONLATTERBUTTON"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CALIBRATIONLATTERBUTTON"); //退出 } return true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainView.cpp index 4a14bd56b..906b8f5b1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainView.cpp @@ -28,13 +28,13 @@ namespace OHOS BPMainView::BPMainView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPMainView::BPMainView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPMainView::BPMainView"); g_pBPMainView = this; } BPMainView::~BPMainView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPMainView::~BPMainView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPMainView::~BPMainView"); DeInit(); g_pBPMainView = nullptr; } @@ -95,7 +95,7 @@ namespace OHOS void BPMainView::OnStart() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPMainView::OnStart"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPMainView::OnStart"); View::OnStart(); SetContainerView(new UIViewGroup()); if (GetContainer() == nullptr) @@ -117,20 +117,20 @@ namespace OHOS } void BPMainView::OnSetUpView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPMainView::OnSetUpView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPMainView::OnSetUpView"); View::OnSetUpView(); Draw(); } void BPMainView::OnTearDownView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPMainView::OnTearDownView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPMainView::OnTearDownView"); View::OnTearDownView(); return; } void BPMainView::OnStop() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPMainView::OnStop"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPMainView::OnStop"); View::OnStop(); if (container_ != nullptr) { 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 f0d43b856..d0b7fe6bb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp @@ -114,6 +114,8 @@ namespace OHOS Time = BP_CHECK_TIME_MAX; break; } + case BPState::BP_CALIBRATING_FIRSTTIME: + case BPState::BP_CALIBRATING_SECONDTIME: case BPState::BP_DETECTING: { /* @@ -129,24 +131,6 @@ namespace OHOS break; } - case BPState::BP_CALIBRATING_FIRSTTIME: - { - BP_StartTimer(); - ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); // 后期 周期被动状态 需要做区别 - - if (Time != BP_CHECK_TIME_MAX) - Time = BP_CHECK_TIME_MAX; // 重置时间 - } - break; - case BPState::BP_CALIBRATING_SECONDTIME: - { - BP_StartTimer(); - ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); // 后期 周期被动状态 需要做区别 - - if (Time != BP_CHECK_TIME_MAX) - Time = BP_CHECK_TIME_MAX; // 重置时间 - } - break; default: /*未知状态，全部状态重置*/ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BP_Control: Invalid state"); @@ -211,16 +195,15 @@ namespace OHOS } else if (BPDetectionView::GetInstance()) { - //测试成功 -> 进入结果界面 - BPDetectionView::GetInstance()->ChangeView(CALIBRATION_BPVIEW, RESULT_BPVIEW); - //测试失败 -> 进入错误界面 - // BPDetectionView::GetInstance()->ChangeView(CALIBRATION_BPVIEW, ERROR_BPVIEW); + //测试成功 -> 进入结果界面 + BPDetectionView::GetInstance()->ChangeView(CALIBRATION_BPVIEW, RESULT_BPVIEW); + //测试失败 -> 进入错误界面 + // BPDetectionView::GetInstance()->ChangeView(CALIBRATION_BPVIEW, ERROR_BPVIEW); } return; } - BPState current_state_time = BPModel::GetInstance()->GetCurrentState(); // 根据状态处理 switch (current_state_time) diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPResultAnalysisView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPResultAnalysisView.cpp index 86fd47ca4..91ba2eb29 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPResultAnalysisView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPResultAnalysisView.cpp @@ -18,12 +18,12 @@ namespace OHOS static const char *BPLINEPATH = "/user/res/BPCalibration//Q.bin"; BPResultAnalysisView::BPResultAnalysisView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPResultAnalysisView::BPResultAnalysisView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPResultAnalysisView::BPResultAnalysisView"); g_pBPResultAnalysisView = this; } BPResultAnalysisView::~BPResultAnalysisView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPResultAnalysisView::~BPResultAnalysisView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPResultAnalysisView::~BPResultAnalysisView"); DeInit(); g_pBPResultAnalysisView = nullptr; } @@ -102,7 +102,7 @@ namespace OHOS */ UIViewGroup *BPResultAnalysisView::BPResultAnalysisInit() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bool BPResultAnalysisView::InitView()"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bool BPResultAnalysisView::InitView()"); group = new UIViewGroup(); if (group == nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPSecUnderCalibrationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPSecUnderCalibrationView.cpp index d1282ddd3..f187833be 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPSecUnderCalibrationView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPSecUnderCalibrationView.cpp @@ -20,12 +20,12 @@ namespace OHOS static const char *BPLINEPATH = "/user/res/BPCalibration//Q.bin"; BPSecUnderCalibrationView::BPSecUnderCalibrationView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPSecUnderCalibrationView::BPSecUnderCalibrationView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPSecUnderCalibrationView::BPSecUnderCalibrationView"); g_pBPSecUnderCalibrationView = this; } BPSecUnderCalibrationView::~BPSecUnderCalibrationView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPSecUnderCalibrationView::~BPSecUnderCalibrationView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPSecUnderCalibrationView::~BPSecUnderCalibrationView"); DeInit(); g_pBPSecUnderCalibrationView = nullptr; } @@ -126,7 +126,7 @@ namespace OHOS */ UIViewGroup *BPSecUnderCalibrationView::BPSecUnderCalibrationInit() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bool BPSecUnderCalibrationView::InitView()"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bool BPSecUnderCalibrationView::InitView()"); group = new UIViewGroup(); if (group == nullptr) { @@ -144,7 +144,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLable error!"); return nullptr; }; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bool BPSecUnderCalibrationView::InitView()"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bool BPSecUnderCalibrationView::InitView()"); return group; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPUnderCalibrationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPUnderCalibrationView.cpp index 6014982f7..50dd80a37 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPUnderCalibrationView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPUnderCalibrationView.cpp @@ -20,12 +20,12 @@ namespace OHOS static const char *BPLINEPATH = "/user/res/BPCalibration//Q.bin"; BPUnderCalibrationView::BPUnderCalibrationView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPUnderCalibrationView::BPUnderCalibrationView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPUnderCalibrationView::BPUnderCalibrationView"); g_pBPUnderCalibrationView = this; } BPUnderCalibrationView::~BPUnderCalibrationView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPUnderCalibrationView::~BPUnderCalibrationView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPUnderCalibrationView::~BPUnderCalibrationView"); DeInit(); g_pBPUnderCalibrationView = nullptr; } @@ -127,25 +127,25 @@ namespace OHOS */ UIViewGroup *BPUnderCalibrationView::BPUnderCalibrationInit() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bool BPUnderCalibrationView::InitView()"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bool BPUnderCalibrationView::InitView()"); group = new UIViewGroup(); if (group == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPopUpView::group null!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPopUpView::group null!"); return nullptr; } group->SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); if (!Initbackground()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Initbackground error!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Initbackground error!"); return nullptr; }; if (!InitLable()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLable error!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitLable error!"); return nullptr; }; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bool BPUnderCalibrationView::InitView()"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bool BPUnderCalibrationView::InitView()"); return group; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPValueView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPValueView.cpp index 2a698d094..2bb2fe5e7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPValueView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPValueView.cpp @@ -22,12 +22,12 @@ namespace OHOS BPValueView::BPValueView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPValueView::BPValueView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPValueView::BPValueView"); g_pBPValueView = this; } BPValueView::~BPValueView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPValueView::~BPValueView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPValueView::~BPValueView"); DeInit(); g_pBPValueView = nullptr; } @@ -221,27 +221,27 @@ namespace OHOS */ UIViewGroup *BPValueView::BPValueInit() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bool BPValueView::InitView()"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bool BPValueView::InitView()"); group = new UIViewGroup(); if (group == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPopUpView::group null!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPopUpView::group null!"); return nullptr; } group->SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); if (!Initbackground()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Initbackground error!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Initbackground error!"); return nullptr; }; if (!InitLable()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLable error!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitLable error!"); return nullptr; }; if (!AddButton()) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AddButton error!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddButton error!"); return nullptr; }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp index ae35bb79f..7e601e2cf 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp @@ -25,12 +25,12 @@ namespace OHOS BPDetectEndView::BPDetectEndView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPDetectEndView::BPDetectEndView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectEndView::BPDetectEndView"); g_pBPDetectEndView = this; } BPDetectEndView::~BPDetectEndView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPDetectEndView::~BPDetectEndView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectEndView::~BPDetectEndView"); if(group) { group->RemoveAll(); @@ -134,7 +134,7 @@ namespace OHOS group = new UIViewGroup(); group->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPDetectEndInit is begin"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectEndInit is begin"); /*初始化label*/ InitLabel(DBPTitleLabel, 20, 66, 200, 60, "calibration", "收缩压", DEFAULT_VECTOR_FONT_FILENAME, 30); InitLabel(SBPTitleText, 240, 66, 200, 60, "calibration", "舒张压", DEFAULT_VECTOR_FONT_FILENAME, 30); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectErrorView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectErrorView.cpp index 6b1ed91c8..2cfcb543a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectErrorView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectErrorView.cpp @@ -19,12 +19,12 @@ namespace OHOS BPDetectErrorView::BPDetectErrorView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPDetectErrorView::BPDetectErrorView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectErrorView::BPDetectErrorView"); g_pBPDetectErrorView = this; } BPDetectErrorView::~BPDetectErrorView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPDetectErrorView::~BPDetectErrorView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectErrorView::~BPDetectErrorView"); if(group) { group->RemoveAll(); 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 449064229..10fe6ce39 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFailView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFailView.cpp @@ -19,12 +19,12 @@ namespace OHOS BPDetectFailView::BPDetectFailView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPDetectFailView::BPDetectFailView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectFailView::BPDetectFailView"); g_pBPDetectFailView = this; } BPDetectFailView::~BPDetectFailView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPDetectFailView::~BPDetectFailView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectFailView::~BPDetectFailView"); if(group) { group->RemoveAll(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFirstView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFirstView.cpp index 64c725fb0..615c1a20d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFirstView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFirstView.cpp @@ -21,12 +21,12 @@ namespace OHOS BPDetectFirstView::BPDetectFirstView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPDetectFirstView::BPDetectFirstView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectFirstView::BPDetectFirstView"); g_pBPDetectFirstView = this; } BPDetectFirstView::~BPDetectFirstView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPDetectFirstView::~BPDetectFirstView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectFirstView::~BPDetectFirstView"); if(group) { group->RemoveAll(); @@ -110,7 +110,7 @@ namespace OHOS group = new UIViewGroup(); group->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPDetectionViewInit is begin"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectionViewInit is begin"); /*初始化label*/ InitLabel(DBPTitleLabel, 20, 66, 200, 60, "calibration", "收缩压", DEFAULT_VECTOR_FONT_FILENAME, 30); InitLabel(SBPTitleText, 240, 66, 200, 60, "calibration", "舒张压", DEFAULT_VECTOR_FONT_FILENAME, 30); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectSOSView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectSOSView.cpp index 47876a7d5..b40021368 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectSOSView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectSOSView.cpp @@ -58,12 +58,12 @@ namespace OHOS BPDetectSOSView::BPDetectSOSView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPDetectSOSView::BPDetectSOSView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectSOSView::BPDetectSOSView"); g_pBPDetectSOSView = this; } BPDetectSOSView::~BPDetectSOSView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPDetectSOSView::~BPDetectSOSView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectSOSView::~BPDetectSOSView"); if(group) { group->RemoveAll(); @@ -90,7 +90,7 @@ namespace OHOS */ UIViewGroup *BPDetectSOSView::BPDetectSOSInit() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bool BPDetectSOSView::InitView()"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bool BPDetectSOSView::InitView()"); group = new UIViewGroup(); group->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); 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 b518561b6..3da896580 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionPresenter.cpp @@ -85,7 +85,6 @@ namespace OHOS //设置状态为检测状态 BPModel::GetInstance()->BP_Control(BPState::BP_DETECTING); BPDetectionView::GetInstance()->ChangeView(MAIN_BPVIEW,CALIBRATION_BPVIEW); - BPModel::GetInstance()->BP_StartTimer();//开始计时器，计时结束后自动切换到主界面 } //界面结果->重新检测 else if (strcmp(view.GetViewId(), RE_CLICK_BLOOD_PRESSURE) == 0) @@ -93,7 +92,6 @@ namespace OHOS //设置状态为检测状态 BPModel::GetInstance()->BP_Control(BPState::BP_DETECTING); BPDetectionView::GetInstance()->ChangeView(RESULT_BPVIEW,CALIBRATION_BPVIEW); - BPModel::GetInstance()->BP_StartTimer();//开始计时器，计时结束后自动切换到主界面 } //预警界面->SOS else if (strcmp(view.GetViewId(), BP_SOS_CLICK) == 0) @@ -112,7 +110,6 @@ namespace OHOS //设置状态为检测状态 BPModel::GetInstance()->BP_Control(BPState::BP_DETECTING); BPDetectionView::GetInstance()->ChangeView(FAIL_BPVIEW,CALIBRATION_BPVIEW); - BPModel::GetInstance()->BP_StartTimer();//开始计时器，计时结束后自动切换到主界面 } return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionView.cpp index 02d92e722..44c15fce0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionView.cpp @@ -87,7 +87,7 @@ namespace OHOS void BPDetectionView::OnStart() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPDetectionView::OnStart"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BPDetectionView::OnStart"); View::OnStart(); SetContainerView(new UIViewGroup()); -- 2.17.1