From: xue <2144439972@qq.com> Date: Tue, 17 Jun 2025 07:01:27 +0000 (+0800) Subject: Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ab3e4ab756b0cdcd879bbbdace2f0f559edc3ba2;p=mirrors%2FFD230.git Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 --- ab3e4ab756b0cdcd879bbbdace2f0f559edc3ba2 diff --cc code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp index 745ed4f98,1f6e398ee..c073cc438 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp @@@ -60,10 -60,9 +60,10 @@@ namespace OHO {VIEW_HEART_CHART, PNG_APPLIST_HEART_IMAGE_BIG, PNG_APPLIST_HEART_IMAGE, PNG_APPLIST_DEFAULT_IMG, "心率", STR_HEART_RATE, nullptr}, #endif {VIEW_BLOOD_RESULT, PNG_APPLIST_SPO2_IMAGE_BIG, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血氧", STR_BLOOD_OXYGEN, nullptr}, -#if defined(BOARD_W9) || defined(BOARD_N9) +#if defined(BOARD_W9) || defined(BOARD_N9)||1 /*W9与N9的Slice写宏里面*/ + {VIEW_BLOOD_PRESSURE_CALIBRATION, PNG_APPLIST_SPO2_IMAGE_BIG, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血压", STR_BP_CHECK, nullptr}, - {VIEW_BLOOD_PRESSURE_CHECK, PNG_APPLIST_SPO2_IMAGE_BIG, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血压", STR_BLOOD_OXYGEN, nullptr}, + {VIEW_BLOOD_PRESSURE_CHECK, PNG_APPLIST_SPO2_IMAGE_BIG, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_DEFAULT_IMG, "血压", STR_BP_CHECK, nullptr}, #endif {VIEW_SLEEP, PNG_APPLIST_SLEEP_IMAGE_BIG, PNG_APPLIST_SLEEP_IMAGE, PNG_APPLIST_DEFAULT_IMG, "睡眠", STR_SLEEP, nullptr}, {VIEW_TRAINING, PNG_APPLIST_TRAINING_IMAGE_BIG, PNG_APPLIST_TRAINING_IMAGE, PNG_APPLIST_DEFAULT_IMG, "运动", STR_TRAINING, nullptr}, diff --cc code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPMainView.h index 949824563,98227fb8e..b9eb71e4c --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPMainView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPMainView.h @@@ -7,22 -7,17 +7,23 @@@ #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/BPUnderCalibrationView.h" #include "bloodpressure/include/BPValueView.h" - //#include "BPMainPresenter.h" + #include "bloodpressure/include/BPCalPosReqView.h" namespace OHOS { typedef enum : uint8_t { - BPCALIBRATIONVIEW = 0, // 主界面 - BPUNDERCALIBRATIONVIEW, // BP校准界面 + BPCALIBRATIONVIEW = 0, // 主界面 + BPUNDERCALIBRATIONVIEW, // BP校准界面 + BPVALUEVIEW, // 血压输入界面 + BPCALIBRATIONPASSVIEW, //校准成功界面 + BPCALIBRATIONERRORVIEW, //校准失败界面 + BPCALIBRATIONMINDVIEW, //校准提醒界面 + BPCALPOSREQVIEW, // 校准位置请求界面 - BPVALUEVIEW, // 血压输入界面 MAX_BPVIEW, } BPVIEWID; @@@ -41,10 -36,7 +42,11 @@@ bool ChangeBPCalibrationView(int16_t); bool ChangeBPUnderCalibrationView(int16_t); bool ChangeBPValueView(int16_t); - bool ChangeBPCalibrationPassView(int16_t thisView); - bool ChangeBPCalibrationErrorView(int16_t thisView); - bool ChangeBPCalibrationMindView(int16_t thisView); ++ bool ChangeBPCalibrationPassView(int16_t); ++ bool ChangeBPCalibrationErrorView(int16_t); ++ bool ChangeBPCalibrationMindView(int16_t); + + bool ChangeBPCalPosReqView(int16_t); bool ClickFunc(int16_t interface); void ChangeView(int16_t hideView, int16_t showView); @@@ -53,10 -45,7 +55,10 @@@ BPCalibrationView *p_BPCalibrationView{nullptr}; BPUnderCalibrationView *p_BPUnderCalibrationView{nullptr}; BPValueView *g_pBPValueView{nullptr}; + BPCalibrationPassView *g_pBPCalibrationPassView{nullptr}; + BPCalibrationErrorView *g_pBPCalibrationErrorView{nullptr}; + BPCalibrationMindView *g_pBPCalibrationMindView{nullptr}; - + BPCalPosReqView *p_BPCalPosReqView{nullptr}; private: void DeInit(); diff --cc code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp index d111260f7,5172b4af6..40cecb354 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp @@@ -178,17 -176,9 +178,20 @@@ namespace OHO BPValueView::DBP++; } + if (strcmp(view.GetViewId(), "passcheckButton") == 0) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "passcheckButton"); + BPMainView::GetInstance()->ChangeView(BPCALIBRATIONPASSVIEW,BPCALIBRATIONERRORVIEW); + + } + if (strcmp(view.GetViewId(), "errorcheckButton") == 0) + { + 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; diff --cc code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainView.cpp index 75571d56f,eea53bad6..e62e0fc7a --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainView.cpp @@@ -61,20 -61,10 +61,24 @@@ namespace OHO delete g_pBPValueView; g_pBPValueView = nullptr; } + if (g_pBPCalibrationPassView) + { + delete g_pBPCalibrationPassView; + g_pBPCalibrationPassView = nullptr; + } + if (g_pBPCalibrationErrorView) + { + delete g_pBPCalibrationErrorView; + g_pBPCalibrationErrorView = nullptr; + } + if (g_pBPCalibrationMindView) + { + delete g_pBPCalibrationMindView; + g_pBPCalibrationMindView = nullptr; + if (p_BPCalPosReqView) + { + delete p_BPCalPosReqView; + p_BPCalPosReqView = nullptr; } } @@@ -184,65 -174,25 +188,83 @@@ } return true; } + bool BPMainView::ChangeBPCalPosReqView(int16_t thisView) + { + // 检查视图是否已初始化 + if (group[thisView] == nullptr) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BloodPressureView::ChangeUnderInitialCalibrationView"); + p_BPCalPosReqView = new BPCalPosReqView(); + if (p_BPCalPosReqView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodPressureView:: new scrollView[%d] fail", thisView); + return false; + } + // 初始化视图并添加到视图组 + group[thisView] = p_BPCalPosReqView->InitBPCalPosReqView(); + container_->Add(group[thisView]); + } + return true; + } + bool BPMainView::ChangeBPCalibrationPassView(int16_t thisView) + { + // 检查视图是否已初始化 + if (group[thisView] == nullptr) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BloodPressureView::ChangeBPCalibrationPassView"); + g_pBPCalibrationPassView = new BPCalibrationPassView(); + if (g_pBPCalibrationPassView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodPressureView:: new scrollView[%d] fail", thisView); + return false; + } + // 初始化视图并添加到视图组 + group[thisView] = g_pBPCalibrationPassView->BPCalibrationPassInit(); + container_->Add(group[thisView]); + } + return true; + } + + bool BPMainView::ChangeBPCalibrationErrorView(int16_t thisView) + { + // 检查视图是否已初始化 + if (group[thisView] == nullptr) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BloodPressureView::ChangeBPCalibrationErrorView"); + g_pBPCalibrationErrorView = new BPCalibrationErrorView(); + if (g_pBPCalibrationErrorView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodPressureView:: new scrollView[%d] fail", thisView); + return false; + } + // 初始化视图并添加到视图组 + group[thisView] = g_pBPCalibrationErrorView->BPCalibrationErrorInit(); + container_->Add(group[thisView]); + } + return true; + } + + bool BPMainView::ChangeBPCalibrationMindView(int16_t thisView) + { + // 检查视图是否已初始化 + if (group[thisView] == nullptr) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BloodPressureView::ChangeBPCalibrationMindView"); + g_pBPCalibrationMindView = new BPCalibrationMindView(); + if (g_pBPCalibrationMindView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodPressureView:: new scrollView[%d] fail", thisView); + return false; + } + // 初始化视图并添加到视图组 + group[thisView] = g_pBPCalibrationMindView->BPCalibrationMindInit(); + container_->Add(group[thisView]); + } + return true; + } + + /** * 视图映射结构体 - 将视图ID映射到对应的视图切换函数 */ @@@ -256,9 -206,7 +278,10 @@@ {BPCALIBRATIONVIEW, &BPMainView::ChangeBPCalibrationView}, {BPUNDERCALIBRATIONVIEW, &BPMainView::ChangeBPUnderCalibrationView}, {BPVALUEVIEW, &BPMainView::ChangeBPValueView}, + {BPCALIBRATIONPASSVIEW, &BPMainView::ChangeBPCalibrationPassView}, + {BPCALIBRATIONERRORVIEW, &BPMainView::ChangeBPCalibrationErrorView}, + {BPCALIBRATIONMINDVIEW, &BPMainView::ChangeBPCalibrationMindView}, + {BPCALPOSREQVIEW, &BPMainView::ChangeBPCalPosReqView}, }; bool BPMainView::ClickFunc(int16_t interface)