From 74d98c60b91484ed1344ba19b8dec8896d4f70ff Mon Sep 17 00:00:00 2001 From: Caisking Date: Wed, 16 Jul 2025 10:27:44 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E5=81=A5=E5=BA=B7=E6=9C=8D?= =?utf8?q?=E5=8A=A1=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../wearable/fd230/nativeapp/CMakeLists.txt | 2 +- .../{heart_blood => health}/BloodCardView.cpp | 2 +- .../{heart_blood => health}/BloodCardView.h | 4 ++-- .../CheckAbnormalPresenter.cpp | 10 +++++----- .../CheckAbnormalPresenter.h | 4 ++-- .../{heart_blood => health}/CheckAbnormalView.cpp | 4 ++-- .../{heart_blood => health}/CheckAbnormalView.h | 2 +- .../CheckInvalidPresenter.cpp | 6 +++--- .../CheckInvalidPresenter.h | 4 ++-- .../{heart_blood => health}/CheckInvalidView.cpp | 8 ++++---- .../{heart_blood => health}/CheckInvalidView.h | 4 ++-- .../health_service/defult_health.json | 0 .../health_service/health_service.cpp | 0 .../health_service/health_service.h | 2 +- .../set_heart/SetHeartModel.cpp | 0 .../set_heart/SetHeartModel.h | 0 .../set_heart/SetHeartPresenter.cpp | 0 .../set_heart/SetHeartPresenter.h | 0 .../set_heart/SetHeartView.cpp | 0 .../set_heart/SetHeartView.h | 0 .../nativeui/heartrate/src/HeartChartView.cpp | 2 +- .../nativeui/heartrate/src/HeartModel.cpp | 14 +++++--------- .../nativeui/heartrate/src/HeartRateView.cpp | 2 +- .../heartrate/src/HeartResultPresenter.cpp | 2 +- .../nativeui/main/include/MainViewSample.h | 2 +- .../nativeui/main/src/MainPresenterSample.cpp | 2 +- .../nativeapp/nativeui/sleep/src/SleepModel.cpp | 2 +- .../debug_output_notification.cpp | 2 +- .../services/ble_service/blemoder/CMakeLists.txt | 2 +- 29 files changed, 39 insertions(+), 43 deletions(-) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/BloodCardView.cpp (96%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/BloodCardView.h (93%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/CheckAbnormalPresenter.cpp (92%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/CheckAbnormalPresenter.h (93%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/CheckAbnormalView.cpp (98%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/CheckAbnormalView.h (96%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/CheckInvalidPresenter.cpp (94%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/CheckInvalidPresenter.h (93%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/CheckInvalidView.cpp (97%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/CheckInvalidView.h (95%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/health_service/defult_health.json (100%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/health_service/health_service.cpp (100%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/health_service/health_service.h (98%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/set_heart/SetHeartModel.cpp (100%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/set_heart/SetHeartModel.h (100%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/set_heart/SetHeartPresenter.cpp (100%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/set_heart/SetHeartPresenter.h (100%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/set_heart/SetHeartView.cpp (100%) rename code/sdk/application/wearable/fd230/nativeapp/nativeui/{heart_blood => health}/set_heart/SetHeartView.h (100%) diff --git a/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt b/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt index caf3b330d..d6452adc6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt @@ -47,7 +47,7 @@ set(PRIVATE_HEADER ${NativeApp}/nativeui/uisample/include ${NativeApp}/nativeui/uisample/uitest/framework/include ${NativeApp}/nativeui/aod_view/include - ${NativeApp}/nativeui/heart_blood/ + ${NativeApp}/nativeui/health/ ${NativeApp}/nativeui/alipay/include ${NativeApp}/nativeui/alipay/include/AlipayList diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/BloodCardView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/BloodCardView.cpp similarity index 96% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/BloodCardView.cpp rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/BloodCardView.cpp index 12aee59c7..c14293ecc 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/BloodCardView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/BloodCardView.cpp @@ -1,5 +1,5 @@ -#include "heart_blood/BloodCardView.h" +#include "health/BloodCardView.h" #include "common/image_cache_manager.h" #include "UiConfig.h" #include "ui_resource_image.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/BloodCardView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/BloodCardView.h similarity index 93% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/BloodCardView.h rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/BloodCardView.h index d0c6f34d8..48c4540a2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/BloodCardView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/BloodCardView.h @@ -2,13 +2,13 @@ * @Date: 2024-06-28 16:08:09 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-07-29 11:48:50 - * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.h + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/health/BloodCardView.h */ /*** * @Date: 2024-06-26 16:13:19 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-06-26 16:52:01 - * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/heart_blood/BloodCardView.h + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/health/BloodCardView.h */ #ifndef _Blood_CARD_VIEW_H diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.cpp similarity index 92% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalPresenter.cpp rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.cpp index f87ea472a..8a38efc34 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.cpp @@ -2,7 +2,7 @@ * @Date: 2024-07-30 11:22:00 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-08-16 15:59:09 - * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/health/CheckAbnormalPresenter.cpp */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. @@ -11,12 +11,12 @@ * Create: 2021-08-01 */ -#include "heart_blood/CheckAbnormalPresenter.h" +#include "health/CheckAbnormalPresenter.h" #include "common/task_manager.h" #include "BloodOxygenModel.h" #include "bloodoxygen/include/BloodDetectionView.h" -#include "heart_blood/CheckAbnormalView.h" +#include "health/CheckAbnormalView.h" #include "components/ui_label.h" #include "components/ui_label_ext.h" @@ -51,7 +51,7 @@ #endif #include "MainModel.h" -#include "heart_blood/health_service/health_service.h" +#include "health/health_service/health_service.h" // #include "battery_hal.h" @@ -60,7 +60,7 @@ namespace OHOS { - REGIST_SLICE(VIEW_CODED_LOCK, CheckAbnormalView, CheckAbnormalPresenter); + REGIST_SLICE(VIEW_CHECK_ABNORMAL, CheckAbnormalView, CheckAbnormalPresenter); static CheckAbnormalPresenter *g_pCheckAbnormalPresenter; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.h similarity index 93% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalPresenter.h rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.h index a420c9bc6..19a57588d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.h @@ -2,7 +2,7 @@ * @Date: 2024-07-30 11:22:09 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-07-30 16:39:17 - * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.h + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/health/CheckAbnormalPresenter.h */ #ifndef CHECK_ABNORMAL_PRESENTER_H @@ -14,7 +14,7 @@ #include "ohos_types.h" #include "KeyInputListener.h" #include "common/key_code.h" -#include "heart_blood/CheckAbnormalView.h" +#include "health/CheckAbnormalView.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalView.cpp similarity index 98% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalView.cpp rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalView.cpp index 3dd0294cb..c90712767 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalView.cpp @@ -19,8 +19,8 @@ #include "uicomponents/UIComponents.h" #include "MainPresenterSample.h" -#include "heart_blood/CheckAbnormalPresenter.h" -#include "heart_blood/CheckAbnormalView.h" +#include "health/CheckAbnormalPresenter.h" +#include "health/CheckAbnormalView.h" #include "vibrator_service.h" #include "custom_runtime.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalView.h similarity index 96% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalView.h rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalView.h index 7f6246df9..a6e7e77d8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckAbnormalView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalView.h @@ -31,7 +31,7 @@ #include "components/ui_image_animator.h" #include "components/ui_circle_progress.h" #include "components/ui_view_group.h" -#include "heart_blood/CheckAbnormalPresenter.h" +#include "health/CheckAbnormalPresenter.h" #include "components/ui_scroll_view.h" #include "components/ui_label_button_ext.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidPresenter.cpp similarity index 94% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidPresenter.cpp rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidPresenter.cpp index 29b86d1b0..cb1536123 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidPresenter.cpp @@ -2,7 +2,7 @@ * @Date: 2024-07-30 11:22:44 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-07-31 15:22:17 - * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidPresenter.cpp + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/health/CheckInvalidPresenter.cpp */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. @@ -11,12 +11,12 @@ * Create: 2021-08-01 */ -#include "heart_blood/CheckInvalidPresenter.h" +#include "health/CheckInvalidPresenter.h" #include "common/task_manager.h" #include "BloodOxygenModel.h" #include "bloodoxygen/include/BloodDetectionView.h" -#include "heart_blood/CheckInvalidView.h" +#include "health/CheckInvalidView.h" #include "components/ui_label.h" #include "components/ui_label_ext.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidPresenter.h similarity index 93% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidPresenter.h rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidPresenter.h index ef24ac107..b3a5f35ba 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidPresenter.h @@ -2,7 +2,7 @@ * @Date: 2024-07-30 11:22:09 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-07-30 16:39:17 - * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidPresenter.h + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/health/CheckInvalidPresenter.h */ #ifndef CHECK_Invalid_PRESENTER_H @@ -14,7 +14,7 @@ #include "ohos_types.h" #include "KeyInputListener.h" #include "common/key_code.h" -#include "heart_blood/CheckInvalidView.h" +#include "health/CheckInvalidView.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidView.cpp similarity index 97% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidView.cpp rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidView.cpp index 37bfee7e5..51a37cbd6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidView.cpp @@ -2,7 +2,7 @@ * @Date: 2024-07-30 11:20:16 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-07-31 15:16:05 - * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.cpp + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/health/CheckInvalidView.cpp */ /*** * @Date: 2024-04-15 10:55:58 @@ -25,10 +25,10 @@ #include "uicomponents/UIComponents.h" #include "MainPresenterSample.h" -#include "heart_blood/CheckInvalidPresenter.h" -#include "heart_blood/CheckInvalidView.h" +#include "health/CheckInvalidPresenter.h" +#include "health/CheckInvalidView.h" -#include "heart_blood/health_service/health_service.h" +#include "health/health_service/health_service.h" #include "vibrator_service.h" #include "custom_runtime.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidView.h similarity index 95% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidView.h rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidView.h index f3b2b6a6b..5ebce1205 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidView.h @@ -2,7 +2,7 @@ * @Date: 2024-07-30 11:22:29 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-07-30 17:39:46 - * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckInvalidView.h + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/health/CheckInvalidView.h */ /*** * @Date: 2024-04-15 10:55:58 @@ -40,7 +40,7 @@ #include "components/ui_image_animator.h" #include "components/ui_circle_progress.h" #include "components/ui_view_group.h" -#include "heart_blood/CheckInvalidPresenter.h" +#include "health/CheckInvalidPresenter.h" #include "components/ui_scroll_view.h" #include "components/ui_label_button_ext.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/health_service/defult_health.json b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/health_service/defult_health.json similarity index 100% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/health_service/defult_health.json rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/health_service/defult_health.json diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/health_service/health_service.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/health_service/health_service.cpp similarity index 100% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/health_service/health_service.cpp rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/health_service/health_service.cpp diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/health_service/health_service.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/health_service/health_service.h similarity index 98% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/health_service/health_service.h rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/health_service/health_service.h index 84e61041a..c83b4cd56 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/health_service/health_service.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/health_service/health_service.h @@ -2,7 +2,7 @@ * @Date: 2024-06-14 11:34:19 * @LastEditors: Caisking 3449750381@qq.com * @LastEditTime: 2024-07-30 17:45:59 - * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/health/health_service/health_service.h */ #ifndef HEART_SERVICE_H diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/set_heart/SetHeartModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/set_heart/SetHeartModel.cpp similarity index 100% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/set_heart/SetHeartModel.cpp rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/set_heart/SetHeartModel.cpp diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/set_heart/SetHeartModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/set_heart/SetHeartModel.h similarity index 100% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/set_heart/SetHeartModel.h rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/set_heart/SetHeartModel.h diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/set_heart/SetHeartPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/set_heart/SetHeartPresenter.cpp similarity index 100% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/set_heart/SetHeartPresenter.cpp rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/set_heart/SetHeartPresenter.cpp diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/set_heart/SetHeartPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/set_heart/SetHeartPresenter.h similarity index 100% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/set_heart/SetHeartPresenter.h rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/set_heart/SetHeartPresenter.h diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/set_heart/SetHeartView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/set_heart/SetHeartView.cpp similarity index 100% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/set_heart/SetHeartView.cpp rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/set_heart/SetHeartView.cpp diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/set_heart/SetHeartView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/set_heart/SetHeartView.h similarity index 100% rename from code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/set_heart/SetHeartView.h rename to code/sdk/application/wearable/fd230/nativeapp/nativeui/health/set_heart/SetHeartView.h diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartView.cpp index 94015313a..7bbd2eb49 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartView.cpp @@ -15,7 +15,7 @@ #include "HeartChartView.h" #include "HeartModel.h" #include "UiConfig.h" -#include "heart_blood/health_service/health_service.h" +#include "health/health_service/health_service.h" #include "power_display_service.h" #include "ui_image_animator.h" #include "ui_resource_string.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp index 7672ae955..b40370bfe 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp @@ -16,13 +16,12 @@ #include "custom_runtime.h" #include "custom_utils.h" -#include "heart_blood/health_service/health_service.h" +#include "health/health_service/health_service.h" #include #ifdef SUPPORT_PPG_SERVICE #include "ppg_hal.h" #include "ppg_service.h" - #endif #include "settings/include/SettingModel.h" @@ -1038,8 +1037,8 @@ static void heart_data_callbackProc(int data) { uint8_t wear = 1; #ifdef SUPPORT_PPG_SERVICE wear = ppg_get_wear_status(); + printf("heart_data_callbackProc::wear = %d\n", wear); wear = 1; //暂时屏蔽 - // printf("heart_data_callbackProc::wear = %d\n", wear); #endif if (wear == 0) { OHOS::HeartModel::GetInstance()->SetWearStatus(); @@ -1057,14 +1056,12 @@ static void heart_data_timer_callback(int data) { std::bind(heart_data_callbackProc, data)); } void HeartModel::heart_data_timer(uint32_t interval) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, - "HeartModel::heart_start_screen60s_timer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartModel::heart_start_screen60s_timer"); if (g_data_timer != nullptr) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Timer already exists!!"); return; } - g_data_timer = osTimerNew((osTimerFunc_t)heart_data_timer_callback, - osTimerPeriodic, nullptr, nullptr); + g_data_timer = osTimerNew((osTimerFunc_t)heart_data_timer_callback, osTimerPeriodic, nullptr, nullptr); if (g_data_timer == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Timer create failed!!"); return; @@ -1072,8 +1069,7 @@ void HeartModel::heart_data_timer(uint32_t interval) { int tick = osMs2Tick(interval); osStatus_t ret = osTimerStart(g_data_timer, tick); if (ret != osOK) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "osTimerDelete failed, ret = %lx!!", - ret); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "osTimerDelete failed, ret = %lx!!", ret); if (g_data_timer != nullptr) { ret = osTimerDelete(g_data_timer); } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartRateView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartRateView.cpp index 0c8d3fc01..2932eb509 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartRateView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartRateView.cpp @@ -12,7 +12,7 @@ #include "ScreenModels.h" #include "ui_resource_image.h" #include "common/image_cache_manager.h" -#include "heart_blood/health_service/health_service.h" +#include "health/health_service/health_service.h" #include "string.h" #define HEART_DATA_TEST 0 namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp index d5c91695c..78a32f05d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultPresenter.cpp @@ -45,7 +45,7 @@ // #include "battery_hal.h" -#include "heart_blood/health_service/health_service.h" +#include "health/health_service/health_service.h" #include "NativeRegisterManager.h" #define BLOODKEYABLE 1 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainViewSample.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainViewSample.h index 6043be78e..a25464833 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainViewSample.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainViewSample.h @@ -31,7 +31,7 @@ #include "uicomponents/UIComponents.h" #include "SetCardModel.h" -#include "heart_blood/BloodCardView.h" +#include "health/BloodCardView.h" #include "traing/training_card/include/Training_CardView.h" // #include "ApplistCardView.h" #include "weather/include/WeatherControlView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp index 7a36adf41..e0466d506 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainPresenterSample.cpp @@ -30,7 +30,7 @@ // #include "traing/training_card/include/Training_CardView.h" // #include "dnotdisturb/include/DnotDisturbModel.h" #include "weather/include/WeatherModel.h" -#include "heart_blood/health_service/health_service.h" +#include "health/health_service/health_service.h" #include "sleep/include/SleepControlView.h" #include "sleep/include/SleepCardView.h" #include "sleep/include/SleepModel.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp index 954c9b76b..5ab70e54a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp @@ -14,7 +14,7 @@ #include "ConfigModel.h" #include "UiConfig.h" #include "custom_utils.h" -#include "heart_blood/health_service/health_service.h" +#include "health/health_service/health_service.h" #include "kv_store.h" #include "samgr_lite.h" #include "securec.h" diff --git a/code/sdk/application/wearable/fd230/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp b/code/sdk/application/wearable/fd230/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp index ddf2f183e..5588afcba 100644 --- a/code/sdk/application/wearable/fd230/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp +++ b/code/sdk/application/wearable/fd230/service/msg_center/src/notify/debug_output_notification/debug_output_notification.cpp @@ -44,7 +44,7 @@ // #ifdef FD230_650 #include "heartrate/include/HeartModel.h" // #endif -#include "heart_blood/health_service/health_service.h" +#include "health/health_service/health_service.h" #include "displaybrightness/include/DisplayBrightnessModel.h" #include "bluetooth/include/BluetoothModel.h" #ifdef SUPPORT_CYWEE_SERVICE diff --git a/code/sdk/zhihui/services/ble_service/blemoder/CMakeLists.txt b/code/sdk/zhihui/services/ble_service/blemoder/CMakeLists.txt index 18af463ad..f86dee053 100644 --- a/code/sdk/zhihui/services/ble_service/blemoder/CMakeLists.txt +++ b/code/sdk/zhihui/services/ble_service/blemoder/CMakeLists.txt @@ -15,7 +15,7 @@ set(PRIVATE_HEADER ${ROOT_DIR}/application/wearable/nativeapp/nativeui/heartrate/include ${ROOT_DIR}/application/wearable/fd230/service/app_store/ ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/weather/include - ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/heart_blood/health_service + ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/health/health_service ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/sleep/include/ ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/phone/include ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/languagecode/ -- 2.17.1