From 547fc265a625dd6b3764f31148a885b0a1eb2da1 Mon Sep 17 00:00:00 2001 From: Caisking Date: Tue, 17 Jun 2025 16:31:24 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E8=A1=80=E5=8E=8B=E6=A3=80?= =?utf8?q?=E6=B5=8BSlice=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../application/wearable/fd230app/CMakeLists.txt | 14 ++++++++------ .../fd230app/nativelauncher/src/NativeLauncher.cpp | 4 ++-- .../include/{ => detection}/BPDetectBeginView.h | 0 .../include/{ => detection}/BPDetectEndView.h | 0 .../include/{ => detection}/BPDetectErrorView.h | 0 .../include/{ => detection}/BPDetectFirstView.h | 0 .../include/{ => detection}/BPDetectSOSView.h | 0 .../include/{ => detection}/BPDetectionPresenter.h | 2 +- .../include/{ => detection}/BPDetectionView.h | 12 ++++++------ .../nativeui/bloodpressure/src/BPMainPresenter.cpp | 1 - .../nativeui/bloodpressure/src/BPModel.cpp | 10 +++++----- .../src/{ => detection}/BPDetectBeginView.cpp | 4 ++-- .../src/{ => detection}/BPDetectEndView.cpp | 6 +++--- .../src/{ => detection}/BPDetectFirstView.cpp | 4 ++-- .../src/{ => detection}/BPDetectSOSView.cpp | 4 ++-- .../src/{ => detection}/BPDetectionPresenter.cpp | 4 ++-- .../src/{ => detection}/BPDetectionView.cpp | 5 ++--- .../w9/fs/user/res/BPCalibration/error_bg.bin | 3 +++ 18 files changed, 38 insertions(+), 35 deletions(-) rename code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/{ => detection}/BPDetectBeginView.h (100%) rename code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/{ => detection}/BPDetectEndView.h (100%) rename code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/{ => detection}/BPDetectErrorView.h (100%) rename code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/{ => detection}/BPDetectFirstView.h (100%) rename code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/{ => detection}/BPDetectSOSView.h (100%) rename code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/{ => detection}/BPDetectionPresenter.h (92%) rename code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/{ => detection}/BPDetectionView.h (85%) rename code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/{ => detection}/BPDetectBeginView.cpp (97%) rename code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/{ => detection}/BPDetectEndView.cpp (97%) rename code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/{ => detection}/BPDetectFirstView.cpp (97%) rename code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/{ => detection}/BPDetectSOSView.cpp (97%) rename code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/{ => detection}/BPDetectionPresenter.cpp (96%) rename code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/{ => detection}/BPDetectionView.cpp (98%) create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/BPCalibration/error_bg.bin diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index 099ef22ea..1d221d3e2 100644 --- a/code/sdk/application/wearable/fd230app/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt @@ -235,12 +235,14 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPMainView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPMainPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPModel.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPDetectionView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPDetectionPresenter.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPDetectFirstView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPDetectSOSView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPDetectBeginView.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPDetectEndView.cpp + + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/detection/BPDetectionView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/detection/BPDetectionPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/detection/BPDetectFirstView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/detection/BPDetectSOSView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/detection/BPDetectBeginView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bloodpressure/src/BPCalPosReqView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/bluetooth/src/BluetoothDeviceCaseListAdapter.cpp diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp index 84c8c5c5b..a7905dde6 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp @@ -112,8 +112,8 @@ #include "bloodpressure/include/BPMainView.h" #include "bloodpressure/include/BPMainPresenter.h" /*血压检测*/ -#include "bloodpressure/include/BPDetectionPresenter.h" -#include "bloodpressure/include/BPDetectionView.h" +#include "bloodpressure/include/detection/BPDetectionPresenter.h" +#include "bloodpressure/include/detection/BPDetectionView.h" /*心率监测*/ #include "heartrate/include/HeartDetectionView.h" #include "heartrate/include/HeartDetectionPresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectBeginView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectBeginView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectBeginView.h rename to code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectBeginView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectEndView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectEndView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectEndView.h rename to code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectEndView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectErrorView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectErrorView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectErrorView.h rename to code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectErrorView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectFirstView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectFirstView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectFirstView.h rename to code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectFirstView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectSOSView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectSOSView.h similarity index 100% rename from code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectSOSView.h rename to code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectSOSView.h diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectionPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectionPresenter.h similarity index 92% rename from code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectionPresenter.h rename to code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectionPresenter.h index 7d74b72f2..99468f5b6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectionPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectionPresenter.h @@ -8,7 +8,7 @@ #include "components/ui_view.h" #include "KeyInputListener.h" #include "ModelListenerSample.h" -#include "bloodpressure/include/BPDetectionView.h" +#include "bloodpressure/include/detection/BPDetectionView.h" #include "power_display_service.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectionView.h b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectionView.h similarity index 85% rename from code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectionView.h rename to code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectionView.h index e182fd609..469a4b818 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/BPDetectionView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/include/detection/BPDetectionView.h @@ -3,7 +3,7 @@ * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-07-29 15:42:12 * @FilePath: - * /FD230/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodpressure/include/BPDetectionView.cpp + * /FD230/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodpressure/include/detection/BPDetectionView.cpp */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. @@ -29,11 +29,11 @@ #include "components/ui_view_group.h" #include "wearable_log.h" -#include "bloodpressure/include/BPDetectionPresenter.h" -#include "bloodpressure/include/BPDetectFirstView.h" -#include "bloodpressure/include/BPDetectSOSView.h" -#include "bloodpressure/include/BPDetectBeginView.h" -#include "bloodpressure/include/BPDetectEndView.h" +#include "bloodpressure/include/detection/BPDetectionPresenter.h" +#include "bloodpressure/include/detection/BPDetectFirstView.h" +#include "bloodpressure/include/detection/BPDetectSOSView.h" +#include "bloodpressure/include/detection/BPDetectBeginView.h" +#include "bloodpressure/include/detection/BPDetectEndView.h" #define CLICK_BLOOD_PRESSURE "click_bloodpressure" #define RE_CLICK_BLOOD_PRESSURE "re_click_bloodpressure" 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 61753c995..68e9633b4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPMainPresenter.cpp @@ -9,7 +9,6 @@ #include "common/task_manager.h" #include "BPModel.h" -#include "bloodpressure/include/BPDetectionView.h" #include "bloodpressure/include/BPUnderCalibrationView.h" #include "bloodpressure/include/BPValueView.h" #include "bloodpressure/include/BPCalibrationPassView.h" 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 f7541d4aa..d78783ed4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPModel.cpp @@ -2,11 +2,11 @@ #include "bloodpressure/include/BPMainPresenter.h" #include "bloodpressure/include/BPMainView.h" -#include "bloodpressure/include/BPDetectionPresenter.h" -#include "bloodpressure/include/BPDetectionView.h" -#include "bloodpressure/include/BPDetectFirstView.h" -#include "bloodpressure/include/BPDetectSOSView.h" -#include "bloodpressure/include/BPDetectBeginView.h" +#include "bloodpressure/include/detection/BPDetectionPresenter.h" +#include "bloodpressure/include/detection/BPDetectionView.h" +#include "bloodpressure/include/detection/BPDetectFirstView.h" +#include "bloodpressure/include/detection/BPDetectSOSView.h" +#include "bloodpressure/include/detection/BPDetectBeginView.h" // #include "bloodpressure/include/BPDetectResultView.h" // #include "bloodpressure/include/BPDetectEndView.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectBeginView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectBeginView.cpp similarity index 97% rename from code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectBeginView.cpp rename to code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectBeginView.cpp index 096ae0a57..aac6c2905 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectBeginView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectBeginView.cpp @@ -9,8 +9,8 @@ #include "UiConfig.h" #include "wearable_log.h" #include "uicomponents/UIComponents.h" -#include "bloodpressure/include/BPDetectionPresenter.h" -#include "bloodpressure/include/BPDetectBeginView.h" +#include "bloodpressure/include/detection/BPDetectionPresenter.h" +#include "bloodpressure/include/detection/BPDetectBeginView.h" #include "bloodpressure/include/BPModel.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectEndView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp similarity index 97% rename from code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectEndView.cpp rename to code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp index 0b72e6da1..ae35bb79f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectEndView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectEndView.cpp @@ -9,9 +9,9 @@ #include "UiConfig.h" #include "wearable_log.h" #include "uicomponents/UIComponents.h" -#include "bloodpressure/include/BPDetectionPresenter.h" -#include "bloodpressure/include/BPDetectionView.h" -#include "bloodpressure/include/BPDetectEndView.h" +#include "bloodpressure/include/detection/BPDetectionPresenter.h" +#include "bloodpressure/include/detection/BPDetectionView.h" +#include "bloodpressure/include/detection/BPDetectEndView.h" #include "bloodpressure/include/BPModel.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectFirstView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFirstView.cpp similarity index 97% rename from code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectFirstView.cpp rename to code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFirstView.cpp index 53b85df14..64c725fb0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectFirstView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectFirstView.cpp @@ -9,8 +9,8 @@ #include "UiConfig.h" #include "wearable_log.h" #include "uicomponents/UIComponents.h" -#include "bloodpressure/include/BPDetectionPresenter.h" -#include "bloodpressure/include/BPDetectFirstView.h" +#include "bloodpressure/include/detection/BPDetectionPresenter.h" +#include "bloodpressure/include/detection/BPDetectFirstView.h" #include "bloodpressure/include/BPModel.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectSOSView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectSOSView.cpp similarity index 97% rename from code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectSOSView.cpp rename to code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectSOSView.cpp index 5a023810b..47876a7d5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectSOSView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectSOSView.cpp @@ -9,8 +9,8 @@ #include "UiConfig.h" #include "wearable_log.h" #include "uicomponents/UIComponents.h" -#include "bloodpressure/include/BPDetectionPresenter.h" -#include "bloodpressure/include/BPDetectSOSView.h" +#include "bloodpressure/include/detection/BPDetectionPresenter.h" +#include "bloodpressure/include/detection/BPDetectSOSView.h" #include "bloodpressure/include/BPModel.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectionPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionPresenter.cpp similarity index 96% rename from code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectionPresenter.cpp rename to code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionPresenter.cpp index 11027d571..59a83a181 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectionPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionPresenter.cpp @@ -5,8 +5,8 @@ * Create: 2021-11-23 */ -#include "bloodpressure/include/BPDetectionView.h" -#include "bloodpressure/include/BPDetectionPresenter.h" +#include "bloodpressure/include/detection/BPDetectionView.h" +#include "bloodpressure/include/detection/BPDetectionPresenter.h" #include "bloodpressure/include/BPModel.h" #include "AppViewIDs.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectionView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionView.cpp similarity index 98% rename from code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectionView.cpp rename to code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionView.cpp index c1dd0bb95..623187863 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/BPDetectionView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodpressure/src/detection/BPDetectionView.cpp @@ -7,12 +7,11 @@ #include "UiConfig.h" #include "wearable_log.h" -#include "bloodpressure/include/BPDetectionView.h" +#include "bloodpressure/include/detection/BPDetectionView.h" #include "bloodpressure/include/BPModel.h" -#include "bloodpressure/include/BPDetectionPresenter.h" +#include "bloodpressure/include/detection/BPDetectionPresenter.h" #include "ui_image_animator.h" -#include "BPDetectionView.h" #include "ui_resource_string.h" #include "power_display_service.h" #include "uicomponents/UIComponents.h" diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/BPCalibration/error_bg.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/BPCalibration/error_bg.bin new file mode 100644 index 000000000..f230f355b --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/w9/fs/user/res/BPCalibration/error_bg.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:edb1f8c3c9757f3b641a093546590f196d71be60522acdf8039b75b2aa7d5e41 +size 146040 -- 2.17.1