From: xue <2144439972@qq.com> Date: Wed, 18 Jun 2025 01:58:05 +0000 (+0800) Subject: 删除多余界面 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ce66f5f6dc898d68b01456a910cf5cc3c70ad3d8;p=mirrors%2FFD230.git 删除多余界面 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationView.h deleted file mode 100644 index 736c836e3..000000000 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPCalibrationView.h +++ /dev/null @@ -1,37 +0,0 @@ - -#ifndef BP_CALIBRATION_VIEW_H -#define BP_CALIBRATION_VIEW_H - -#include "components/ui_label.h" -#include "components/ui_label_ext.h" -#include "components/ui_button.h" -#include "components/ui_label_button.h" -#include "components/ui_view_group.h" -#include "components/ui_scroll_view.h" -#include "components/ui_label_button_ext.h" -namespace OHOS -{ - - class BPCalibrationView - { - public: - BPCalibrationView(); - ~BPCalibrationView(); - static BPCalibrationView *GetInstance(); - UIViewGroup * BPCalibrationInit(); - void DeInit(); - bool AddButton(); - bool InitLable(); - bool Initbackground(); - - void UpSPO2Text(void); - - private: - UIImageView *background = nullptr; - UILabelExt *calibrationLabel = nullptr; - UILabelButtonExt *checkButton{nullptr}; - UIViewGroup *group{nullptr}; - }; -} - -#endif // 血压主界面 \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPMainView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPMainView.h index 174bd4a2b..c71405381 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPMainView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPMainView.h @@ -6,10 +6,10 @@ #include "View.h" #include "BaseView.h" #include "components/ui_view_group.h" -#include "bloodpressure/include/BPCalibrationView.h" #include "bloodpressure/include/BPCalibrationPassView.h" #include "bloodpressure/include/BPCalibrationMindView.h" #include "bloodpressure/include/BPCalibrationErrorView.h" +#include "bloodpressure/include/BPResultAnalysisView.h" #include "bloodpressure/include/BPUnderCalibrationView.h" #include "bloodpressure/include/BPSecUnderCalibrationView.h" #include "bloodpressure/include/BPValueView.h" @@ -19,15 +19,15 @@ namespace OHOS { typedef enum : uint8_t { - BPCALIBRATIONVIEW = 0, // 主界面 + BPCALPOSREQVIEW = 0, // 校准位置请求界面 BPUNDERCALIBRATIONVIEW, // BP校准界面 BPSECUNDERCALIBRATIONVIEW, // 二次校准界面 BPVALUEVIEW, // 血压输入界面 BPCALIBRATIONPASSVIEW, // 校准成功界面 BPCALIBRATIONERRORVIEW, // 校准失败界面 BPCALIBRATIONMINDVIEW, // 校准提醒界面 - BPCALPOSREQVIEW, // 校准位置请求界面 BPLASTCALIBRATIONTIME, // 上次校准时间界面 + BPRESULTANALYSISVIEW, // 结果分析界面 MAX_BPVIEW, } BPVIEWID; @@ -43,7 +43,6 @@ namespace OHOS void OnTearDownView() override; void OnStart() override; - bool ChangeBPCalibrationView(int16_t); bool ChangeBPUnderCalibrationView(int16_t); bool ChangeBPSecUnderCalibrationView(int16_t); bool ChangeBPValueView(int16_t); @@ -52,12 +51,12 @@ namespace OHOS bool ChangeBPCalibrationMindView(int16_t); bool ChangeBPCalPosReqView(int16_t); bool ChangeBPLastCalibrationTimeView(int16_t); + bool ChangeBPResultAnalysisView(int16_t); bool ClickFunc(int16_t interface); void ChangeView(int16_t hideView, int16_t showView); private: - BPCalibrationView *p_BPCalibrationView{nullptr}; BPUnderCalibrationView *p_BPUnderCalibrationView{nullptr}; BPSecUnderCalibrationView *g_pBPSecUnderCalibrationView{nullptr}; BPValueView *g_pBPValueView{nullptr}; @@ -66,6 +65,7 @@ namespace OHOS BPCalibrationMindView *g_pBPCalibrationMindView{nullptr}; BPCalPosReqView *p_BPCalPosReqView{nullptr}; BPLastCalibrationTimeView *p_BPLastCalibrationTimeView{nullptr}; + BPResultAnalysisView *g_pBPResultAnalysisView{nullptr}; private: void DeInit(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationView.cpp deleted file mode 100644 index dfef0246c..000000000 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPCalibrationView.cpp +++ /dev/null @@ -1,167 +0,0 @@ -/*** - * @Date: 2024-04-15 10:55:58 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-07-31 14:36:25 - * @FilePath: /FD230/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodpressure/src/BPCalibrationView.cpp - */ - -#include "ui_resource_image.h" -#include "UiConfig.h" -#include "wearable_log.h" -#include "uicomponents/UIComponents.h" -#include "bloodpressure/include/BPMainPresenter.h" -#include "bloodpressure/include/BPCalibrationView.h" -namespace OHOS -{ - static BPCalibrationView *g_pBPCalibrationView{nullptr}; - static const char *BPBACKPATH = "/user/res/BPCalibration/calibration_background.bin"; - BPCalibrationView::BPCalibrationView() - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPCalibrationView::BPCalibrationView"); - g_pBPCalibrationView = this; - } - BPCalibrationView::~BPCalibrationView() - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BPCalibrationView::~BPCalibrationView"); - DeInit(); - g_pBPCalibrationView = nullptr; - } - BPCalibrationView *BPCalibrationView::GetInstance() - { - return g_pBPCalibrationView; - } - void BPCalibrationView::DeInit() - { - if(group) - { - group->RemoveAll(); - delete group; - group = nullptr; - } - if (background != nullptr) - { - delete background; - background = nullptr; - } - if (calibrationLabel != nullptr) - { - delete calibrationLabel; - calibrationLabel = nullptr; - } - if (checkButton != nullptr) - { - delete checkButton; - checkButton = nullptr; - } - } - /* -------------------------------------------------------------------------- */ - void BPCalibrationView::UpSPO2Text() - { - // // if (bloodLabel == nullptr || timeLabel == nullptr) - // // return; - - // // 更新血氧数据 - // uint16_t spo2 = BPModel::GetInstance()->GetSPO2data(); - // if (spo2 != 0) // 判断是否为默认数据 - // { - // // 更新数据 - // std::string bloodpressureStr = std::to_string(spo2) + "%"; - // // bloodLabel->SetText(bloodpressureStr.c_str()); - - // // 获取时间差 - // uint32_t time = BPMainPresenter::GetInstance()->GetCurrentTime(); - // uint32_t check_time = BPModel::GetInstance()->GetCheckTime(); - // int time_diff = BPMainPresenter::GetInstance()->GetTDOA(time, check_time); - - // if (time_diff == 0) - // { - // timeLabel->SetTextId(STR_CHECKNEW); - // } - // else if (time_diff <= 60) - // { - // UpdateLabel(timeLabel, time_diff, STR_CHECKTIME); - // } - // else - // { - // timeLabel->SetTextId(STR_CHECKLONG); - // } - // } - // else - // { - // } - } - /* -------------------------------------------------------------------------- */ - /*** - * @description: - * @return 添加按键是否成功 - */ - bool BPCalibrationView::AddButton() - { - InitButtonExt(checkButton, 118, 336, 230, 80, "校准", STR_CHECK, 30); - checkButton->SetViewId(CLICK_BP); - checkButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffFF5A36); // 设置按键颜色 - // 设置按键监听 - UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::BPMainPresenter::GetInstance(); - checkButton->SetOnClickListener(clickListener); - - group->Add(checkButton); - return true; - } - /*** - * @description: - * @return 初始化标签是否成功 - */ - bool BPCalibrationView::InitLable() - { - - InitLabel(calibrationLabel, 83, 40, 300, 45, "calibration", "血压校准", DEFAULT_VECTOR_FONT_FILENAME, 40); - /*初始化检测时间*/ - group->Add(calibrationLabel); - - return true; - } - /*** - * @description: - * @return 初始化背景是否成功 - */ - bool BPCalibrationView::Initbackground() - { - background = new UIImageView(); - background->SetPosition(0, 0, 466, 466); - background->SetSrc(BPBACKPATH); - group->Add(background); - return true; - } - /*** - * @description: - * @return 是否初始化成功 - */ - UIViewGroup *BPCalibrationView::BPCalibrationInit() - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bool BPCalibrationView::InitView()"); - group = new UIViewGroup(); - if (group == nullptr) - { - WEARABLE_LOGE(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!"); - return nullptr; - }; - if (!InitLable()) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitLable error!"); - return nullptr; - }; - if (!AddButton()) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AddButton error!"); - return nullptr; - }; - return group; - } - -}