From: luozheng <1732036298@qq.com> Date: Wed, 30 Jul 2025 07:08:59 +0000 (+0800) Subject: 650_0723 application文件夹合并 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~211 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=59fa6c40cf9254fdf5e0263871033070e6bb4d8f;p=mirrors%2FFD230.git 650_0723 application文件夹合并 --- diff --git a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c index c394f7ccf..2d59dcadb 100644 --- a/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c +++ b/code/sdk/application/wearable/alipay/service/alipay_bluetooth.c @@ -17,7 +17,7 @@ #include "securec.h" #include "cmsis_os2.h" #ifdef SUPPORT_OHOSFWK -#include "bluetooth/BluetoothWrapper.h" +#include "bluetooth/include/BluetoothWrapper.h" #endif /* Gatt service UUID */ diff --git a/code/sdk/application/wearable/fd230/nativeabilityfwk/CMakeLists.txt b/code/sdk/application/wearable/fd230/nativeabilityfwk/CMakeLists.txt index 63e56e84a..b59c59744 100644 --- a/code/sdk/application/wearable/fd230/nativeabilityfwk/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230/nativeabilityfwk/CMakeLists.txt @@ -20,6 +20,8 @@ set(PRIVATE_HEADER ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/innerkits ${ROOT_DIR}/middleware/services/gui/uikit/ui/frameworks ${ROOT_DIR}/open_source/openharmony/drivers/peripheral/display/interfaces/include + ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/kits/events + ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/kits/ ) set(SOURCES diff --git a/code/sdk/application/wearable/fd230/nativeabilityfwk/src/Ability.cpp b/code/sdk/application/wearable/fd230/nativeabilityfwk/src/Ability.cpp index a28bd30e1..8c03756cd 100644 --- a/code/sdk/application/wearable/fd230/nativeabilityfwk/src/Ability.cpp +++ b/code/sdk/application/wearable/fd230/nativeabilityfwk/src/Ability.cpp @@ -155,12 +155,12 @@ void Ability::SwitchSlice(uint16_t sliceId, uint16_t pageId, TransitionType type #endif #ifdef FD230 // showsStackSliceId(); - if (targetSliceId == VIEW_MAIN) + if (sliceId == VIEW_MAIN) { ClearSliceIdStack(); /*凡是回到主界面都要清空栈*/ } - if (targetSliceId == VIEW_INCOMING_CALL) + if (sliceId == VIEW_INCOMING_CALL) { uint16_t id=GetCurSliceId(); if(id==VIEW_REBOOTANDSHUTDOWN && VIEW_INCOMING_CALL==GettopSliceId() ) diff --git a/code/sdk/application/wearable/fd230/nativeabilityfwk/src/AbilitySlice.cpp b/code/sdk/application/wearable/fd230/nativeabilityfwk/src/AbilitySlice.cpp index 37810c795..4133b66e9 100644 --- a/code/sdk/application/wearable/fd230/nativeabilityfwk/src/AbilitySlice.cpp +++ b/code/sdk/application/wearable/fd230/nativeabilityfwk/src/AbilitySlice.cpp @@ -13,7 +13,7 @@ #include "NativeAbility.h" #include "View.h" #include "Presenter.h" -#include "key/KeyInputListener.h" +#include "key/include/KeyInputListener.h" namespace OHOS { const uint16_t SLICE_MASK = 0xFFFF; diff --git a/code/sdk/application/wearable/fd230/nativeabilityfwk/src/transition/BackToHexagonsTransition.cpp b/code/sdk/application/wearable/fd230/nativeabilityfwk/src/transition/BackToHexagonsTransition.cpp index da9c42185..1544233b5 100644 --- a/code/sdk/application/wearable/fd230/nativeabilityfwk/src/transition/BackToHexagonsTransition.cpp +++ b/code/sdk/application/wearable/fd230/nativeabilityfwk/src/transition/BackToHexagonsTransition.cpp @@ -9,7 +9,7 @@ #include "TransitionManager.h" #include "NativeAbility.h" #include "components/root_view.h" -#include "applist/AppItemView.h" +#include "applist/include/AppItemView.h" #include "hal_tick.h" #include "wearable_log.h" #ifdef JS_ENABLE diff --git a/code/sdk/application/wearable/fd230/nativeabilityfwk/src/transition/BackToWaterfallTransition.cpp b/code/sdk/application/wearable/fd230/nativeabilityfwk/src/transition/BackToWaterfallTransition.cpp index a5bb73077..7defcd439 100644 --- a/code/sdk/application/wearable/fd230/nativeabilityfwk/src/transition/BackToWaterfallTransition.cpp +++ b/code/sdk/application/wearable/fd230/nativeabilityfwk/src/transition/BackToWaterfallTransition.cpp @@ -9,7 +9,7 @@ #include "TransitionManager.h" #include "NativeAbility.h" #include "components/root_view.h" -#include "applist/AppItemView.h" +#include "applist/include/AppItemView.h" #include "hal_tick.h" #include "wearable_log.h" #ifdef JS_ENABLE diff --git a/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt b/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt index 371208b6c..025be94cb 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230/nativeapp/CMakeLists.txt @@ -8,6 +8,7 @@ set(UI_SAMPLE_ROOT ${ROOT_DIR}/middleware/services/gui/uikit/sample/uitest) set(PUBLIC_HEADER ${NativeApp}/nativelauncher/include ${NativeApp}/nativeui/include + ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/ ) set(PRIVATE_HEADER @@ -67,6 +68,7 @@ set(PRIVATE_HEADER ${ROOT_DIR}/zhihui/drivers/ ${ROOT_DIR}/zhihui/UI/CustomUIComponentTool/ ${ROOT_DIR}/zhihui/UI/producttest/include/ + ${UIKIT_ROOT_DIR}/proprietary/include/ ) diff --git a/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-fd230/libuikit_fwk.a b/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-fd230/libuikit_fwk.a index b1ab9d2d0..e3ce469ad 100644 Binary files a/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-fd230/libuikit_fwk.a and b/code/sdk/application/wearable/fd230/nativeapp/brandy-native-js-fd230/libuikit_fwk.a differ diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/NativeRegisterManager.h b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/NativeRegisterManager.h index 67c840055..0a7158e89 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/NativeRegisterManager.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/NativeRegisterManager.h @@ -13,7 +13,7 @@ #include "NativeRegisterType.h" #include "SliceProxy.h" #include "AbilitySliceProxy.h" -#include "applist/ApplistModel.h" +#include "applist/include/ApplistModel.h" #include "NativeAbility.h" #include "wearable_log.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/UiConfig.h index 9f5e3a5b5..920e99ae6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/UiConfig.h @@ -742,7 +742,6 @@ static constexpr const char *PNG_APPLIST_PHONE_IMAGE = APP_RES_PATH "/phone.bin"; // 电话 static constexpr const char *PNG_APPLIST_STOPWATCH_LOGO = APP_RES_PATH"/STOPWATCH_LOGO.bin"; - static constexpr const char *PNG_APPLIST_STOPWATCH_IMAGE = APP_RES_PATH"/STOPWATCH.bin"; static constexpr const char *WEATHER_IMAGE = APP_RES_PATH"/WEATHER.bin"; static constexpr const char *WEATHER_MAIN_ICON = APP_RES_PATH"/WEATHER_LOGO.bin"; static constexpr const char *TIMER_IMAGE = APP_RES_PATH"/TIMER.bin"; @@ -752,7 +751,6 @@ static constexpr const char *FLASHLIGHT_IMAGE = APP_RES_PATH"/FLASHLIGHT.bin"; static constexpr const char *FLASHLIGHT_MAIN_ICON = APP_RES_PATH"/FLASHLIGHT_LOGO.bin"; static constexpr const char *SLEEP_IMAGE = APP_RES_PATH"/SLEEP.bin"; - static constexpr const char *SLEEP_ICON = APP_RES_PATH"/SLEEP_ICON.bin"; static constexpr const char *BREATH_IMAGE = APP_RES_PATH"/BREATH.bin"; static constexpr const char *BREATH_MAIN_ICON = APP_RES_PATH"/BREATH_ICON.bin"; static constexpr const char *FINDPHONE_IMAGE = APP_RES_PATH"/FINDPHONE.bin"; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h index 67ca8c2be..c9d8f2006 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/include/ui_resource_string.h @@ -1,15 +1,15 @@ -/* -* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved. -* Description: language -* Author: Graphic develop team -* Create: 2021-07-06 -*/ - -#ifndef UI_RESOURCE_STRING_H -#define UI_RESOURCE_STRING_H -#include -namespace OHOS { -enum UIResourceTextId : uint16_t { +/* +* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved. +* Description: language +* Author: Graphic develop team +* Create: 2021-07-06 +*/ + +#ifndef UI_RESOURCE_STRING_H +#define UI_RESOURCE_STRING_H +#include +namespace OHOS { +enum UIResourceTextId : uint16_t { STR_EXERCISE_OUTDOORWALKING = 0, STR_EXERCISE_OUTDOORRUNNING = 1, STR_EXERCISE_OUTDOORBIKING = 2, @@ -659,8 +659,8 @@ enum UIResourceTextId : uint16_t { STR_AOD_REMIND = 646, STR_MAX_ID = 647, }; // UIResourceTextId - -enum FontLanguageId : uint8_t { + +enum FontLanguageId : uint8_t { LANGUAGE_ID_AR, LANGUAGE_ID_AZ, LANGUAGE_ID_CS, diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp index 7542e8227..ba3a83e2a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativelauncher/src/NativeLauncher.cpp @@ -18,15 +18,15 @@ #include "SliceProxy.h" #include "AbilitySliceProxy.h" #include "wearable_log.h" -#include "callerlog/CallerLogModel.h" -#include "activity/ActivityModel.h" -#include "heartrate/HeartModel.h" -#include "player/PlayersModel.h" -#include "main/HealthModel.h" -#include "sports/SportsModel.h" -#include "offlinevoice/VocassistModel.h" -#include "screensetting/ScreenModels.h" -#include "bluetooth/BluetoothHeadsetEvent.h" +#include "callerlog/include/CallerLogModel.h" +#include "activity/include/ActivityModel.h" +#include "heartrate/include/HeartModel.h" +#include "player/include/PlayersModel.h" +#include "main/include/HealthModel.h" +// #include "sports/SportsModel.h" +#include "offlinevoice/include/VocassistModel.h" +#include "screensetting/include/ScreenModels.h" +#include "bluetooth/include/BluetoothHeadsetEvent.h" #include "graphic_hardware_config.h" #include "graphic_service.h" #include "common/graphic_startup.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/ActivityModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/ActivityModel.h index db661a35e..dc46b15dd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/ActivityModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/ActivityModel.h @@ -13,7 +13,7 @@ #include #include #include "ohos_types.h" -#include "RtcService.h" +#include "rtcservice/include/RtcService.h" #include "samgr_lite.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/ActivityPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/ActivityPresenter.h index 7ff632eec..b69a51788 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/ActivityPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/ActivityPresenter.h @@ -9,6 +9,7 @@ #define ACTIVITY_PRESENTER_H #include +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "MainActivityView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/ActivityWeekView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/ActivityWeekView.h index 06a8c755b..bce288ccc 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/ActivityWeekView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/ActivityWeekView.h @@ -17,7 +17,7 @@ #include "UiConfig.h" #include "wearable_log.h" #include "components/ui_card_page.h" -#include "ActivityModel.h" +#include "activity/include/ActivityModel.h" namespace OHOS { #define DAYS 7 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/MainActivityView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/MainActivityView.h index ff024061d..778074d70 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/MainActivityView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/include/MainActivityView.h @@ -20,7 +20,7 @@ #include "font/ui_font.h" #include "graphic_config.h" #include "ModelListenerSample.h" -#include "ActivityModel.h" +#include "activity/include/ActivityModel.h" #include "ActivityPresenter.h" #include "ActivityWeekView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityModel.cpp index b0b6d0209..83939eab1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityModel.cpp @@ -5,19 +5,20 @@ * Create: 2022-03-02 */ -#include "ActivityModel.h" -#include "ActivityWeekView.h" +#include "activity/include/ActivityModel.h" +#include "activity/include/ActivityWeekView.h" // #include "DialModelCalorie.h" // #include "DialModelDistance.h" // #include "DialModelStepgoal.h" // #include "DialModelSteps.h" -// #include "DialModelKcalgoalStr.h" +// #include "main/include/dial/DialModelKcalgoalStr.h" // #include "DialModelKcalgoalValue.h" // #include "DialModelStepgoalStr.h" // #include "DialModelStepgoalValue.h" -#include "IndoorWalkPresenter.h" -#include "MainClockView.h" +#include "indoorwalk/include/IndoorWalkModel.h" +#include "indoorwalk/include/IndoorWalkPresenter.h" +#include "clock/include/MainClockView.h" #include "broadcast_service.h" #include "cmsis_os.h" #include "custom_runtime.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityPresenter.cpp index c381e72e9..e1b35076a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityPresenter.cpp @@ -9,7 +9,7 @@ #include "gfx_utils/graphic_types.h" #include "components/ui_checkbox.h" #include "UiConfig.h" -#include "ActivityPresenter.h" +#include "activity/include/ActivityPresenter.h" #include "NativeRegisterManager.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityWeekView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityWeekView.cpp index abf06b5a6..757be332e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityWeekView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/ActivityWeekView.cpp @@ -5,8 +5,8 @@ * Create: 2021-10-18 */ -#include "ActivityWeekView.h" -#include "ActivityPresenter.h" +#include "activity/include/ActivityWeekView.h" +#include "activity/include/ActivityPresenter.h" #include "common/image_cache_manager.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/MainActivityView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/MainActivityView.cpp index d9f307527..9da37aa23 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/MainActivityView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/activity/src/MainActivityView.cpp @@ -6,7 +6,7 @@ */ #include "components/ui_label.h" -#include "MainActivityView.h" +#include "activity/include/MainActivityView.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardAdapter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardAdapter.h index 8f18d42be..61191e6b4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardAdapter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardAdapter.h @@ -17,7 +17,7 @@ #include "components/abstract_adapter.h" #include "UiConfig.h" #include "wearable_log.h" -#include "AddCardItem.h" +#include "add_card/include/AddCardItem.h" namespace OHOS { class AddCardAdapter : public AbstractAdapter { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardModel.h index 22a24908d..a590d4cf5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardModel.h @@ -18,8 +18,8 @@ #include #include "AppViewIDs.h" #include "UiConfig.h" -#include "AddCardPresenter.h" -#include "MainModel.h" +#include "add_card/include/AddCardPresenter.h" +#include "main/include/MainModel.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardPresenter.h index 212efc284..f5802cdfe 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardPresenter.h @@ -20,11 +20,12 @@ #ifndef ADD_CARD_PRESENTER_H #define ADD_CARD_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "components/ui_list.h" #include "components/ui_view.h" -#include "KeyInputListener.h" -#include "ModelListenerSample.h" +#include "key/include/KeyInputListener.h" +#include "main/include/ModelListenerSample.h" #define TOAST_KEEP_TIME 1000 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardView.h index 2b6c1a2f4..e82b8cd85 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/include/AddCardView.h @@ -17,8 +17,8 @@ #include "ChangeSliceListener.h" #include "UiConfig.h" -#include "AddCardAdapter.h" -#include "AddCardModel.h" +#include "add_card/include/AddCardAdapter.h" +#include "add_card/include/AddCardModel.h" namespace OHOS { class AddCardPresenter; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardAdapter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardAdapter.cpp index d92f38ddb..d3420b526 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardAdapter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardAdapter.cpp @@ -5,7 +5,7 @@ * Create: 2021-09-18 */ -#include "AddCardAdapter.h" +#include "add_card/include/AddCardAdapter.h" namespace OHOS { AddCardAdapter::AddCardAdapter() {} diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardItem.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardItem.cpp index 6e68bcab9..31d9c239e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardItem.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardItem.cpp @@ -5,8 +5,8 @@ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp */ -#include "AddCardItem.h" -#include "AddCardPresenter.h" +#include "add_card/include/AddCardItem.h" +#include "add_card/include/AddCardPresenter.h" #include "wearable_log.h" #include "components/ui_canvas_ext.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardModel.cpp index fd0c9d609..db2daf3a1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardModel.cpp @@ -11,7 +11,7 @@ * Create: 2021-11-23 */ -#include "AddCardModel.h" +#include "add_card/include/AddCardModel.h" #include "kv_store.h" #include "securec.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardPresenter.cpp index f71866e9d..ec70283c0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardPresenter.cpp @@ -5,13 +5,13 @@ * Create: 2021-11-23 */ -#include "AddCardView.h" -#include "AddCardModel.h" -#include "AddCardPresenter.h" +#include "add_card/include/AddCardView.h" +#include "add_card/include/AddCardModel.h" +#include "add_card/include/AddCardPresenter.h" #include "hal_tick.h" #include "NativeRegisterManager.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardView.cpp index 62fe5ba0d..0da9759ef 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/add_card/src/AddCardView.cpp @@ -6,8 +6,8 @@ */ #include -#include "AddCardView.h" -#include "AddCardPresenter.h" +#include "add_card/include/AddCardView.h" +#include "add_card/include/AddCardPresenter.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/include/AiVoicePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/include/AiVoicePresenter.h index 2b162eae9..d432da20d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/include/AiVoicePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aivoice/include/AiVoicePresenter.h @@ -8,6 +8,7 @@ #ifndef AI_VOICE_PRESENTER_H #define AI_VOICE_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "ui_resource_string.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModel.h index 16631fbc9..88bd1bc6d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmClockModel.h @@ -9,7 +9,7 @@ #include "ohos_types.h" #include "list.h" -#include "AlmmgrAlarmClockManage.h" +#include "alarmclockmanage/include/AlarmClockManage.h" #include "player.h" #include "source.h" #include "broadcast_feature.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmCloseRingView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmCloseRingView.h index c5cfb0019..440013ad3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmCloseRingView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmCloseRingView.h @@ -14,7 +14,7 @@ #include "components/ui_button.h" #include "components/ui_label_button.h" #include "UiConfig.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "ChangeSliceListener.h" #include "components/ui_label_ext.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmConfigView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmConfigView.h index 3982b029e..59d846349 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmConfigView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmConfigView.h @@ -18,7 +18,7 @@ #include "font/ui_font.h" #include "common/screen.h" #include "gfx_utils/graphic_log.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "components/ui_label_button_ext.h" #include "components/ui_label_ext.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmJudgeView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmJudgeView.h index e13d6e6d7..66be07f26 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmJudgeView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmJudgeView.h @@ -8,6 +8,7 @@ #ifndef ALARM_JUDGE_VIEW_H #define ALARM_JUDGE_VIEW_H +#include "common/screen.h" #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_button.h" @@ -21,7 +22,7 @@ #include "font/ui_font.h" #include "common/screen.h" #include "AlarmPresenter.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "components/ui_label_ext.h" #include "components/ui_label_button_ext.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmMaxClock.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmMaxClock.h index fb1eef049..07881b7f9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmMaxClock.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmMaxClock.h @@ -21,7 +21,7 @@ #include "font/ui_font.h" #include "common/screen.h" #include "AlarmPresenter.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "components/ui_label_ext.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmNewTimeView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmNewTimeView.h index 9aac650dd..19a1a3bf4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmNewTimeView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmNewTimeView.h @@ -14,7 +14,7 @@ #include "components/ui_time_picker.h" #include "View.h" #include "AlarmPresenter.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "components/ui_label_button_ext.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPopUpPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPopUpPresenter.h index 632c010cc..7010d073d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPopUpPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPopUpPresenter.h @@ -10,6 +10,7 @@ #include #include "View.h" +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "ChangeSliceListener.h" #include "UiConfig.h" @@ -27,10 +28,10 @@ #include "components/ui_digital_clock.h" #include "gfx_utils/graphic_log.h" #include "ModelListenerSample.h" -#include "AlarmCloseRingView.h" +#include "alarm/include/AlarmCloseRingView.h" #include "AlarmRingView.h" #include "AlarmPopUpView.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "wearable_log.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPopUpView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPopUpView.h index 107c4a6e4..ef2421b9c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPopUpView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPopUpView.h @@ -17,9 +17,9 @@ #include "ChangeSliceListener.h" #include "components/ui_digital_clock.h" #include "AlarmSetTimeView.h" -#include "AlarmCloseRingView.h" +#include "alarm/include/AlarmCloseRingView.h" #include "AlarmRingView.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "UiConfig.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPresenter.h index c28a0c152..e7e028746 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmPresenter.h @@ -8,6 +8,7 @@ #ifndef ALARM_PRESENTER_H #define ALARM_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "ChangeSliceListener.h" #include "UiConfig.h" @@ -24,7 +25,7 @@ #include "components/ui_time_picker.h" #include "components/ui_digital_clock.h" #include "gfx_utils/graphic_log.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "wearable_log.h" #include "color.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmRingView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmRingView.h index b79eb123b..399bdcee9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmRingView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmRingView.h @@ -17,7 +17,7 @@ #include "ChangeSliceListener.h" #include "components/ui_digital_clock.h" #include "UiConfig.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "ChangeSliceListener.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetTimeView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetTimeView.h index a21cc54d7..ac084355c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetTimeView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetTimeView.h @@ -14,7 +14,7 @@ #include "components/ui_time_picker.h" #include "View.h" #include "AlarmPresenter.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "wearable_log.h" #include "components/ui_label_button_ext.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetWeekView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetWeekView.h index 04d3719a1..4df0bbea7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetWeekView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/AlarmSetWeekView.h @@ -18,7 +18,7 @@ #include "components/root_view.h" #include "components/ui_time_picker.h" #include "AlarmPresenter.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "components/ui_label_ext.h" #include "components/ui_label_button_ext.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/MainAlarmView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/MainAlarmView.h index 13ac3db54..c6c1e3879 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/MainAlarmView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/include/MainAlarmView.h @@ -26,7 +26,7 @@ #include "AlarmConfigView.h" #include "AlarmNewTimeView.h" #include "AlarmMaxClock.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "components/ui_swipe_view.h" #include "components/ui_label_button_ext.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmClockModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmClockModel.cpp index 22b1cf779..7169f7565 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmClockModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmClockModel.cpp @@ -17,11 +17,13 @@ #include "graphic_service.h" #include "player/include/PlayersModel.h" #include "phoneservice/include/PhoneService.h" -#include "ui_service.h" +#include "uiservice/include/ui_service.h" #include "notification_manager.h" #include "ConfigModel.h" #include "custom_runtime.h" #include "alarm/include/AlarmClockModelC.h" +#include "alarmclockmanage/include/AlmmgrAlarmClockManage.h" + #ifdef __cplusplus extern "C" { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmCloseRingView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmCloseRingView.cpp index 16813e109..51dfccec7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmCloseRingView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmCloseRingView.cpp @@ -5,7 +5,7 @@ * Create: 2021-09-11 */ -#include "AlarmCloseRingView.h" +#include "alarm/include/AlarmCloseRingView.h" #include "common/screen.h" #include "components/ui_label.h" #include "components/ui_label_button.h" @@ -13,7 +13,7 @@ #include "ohos_timer.h" #include "graphic_timer.h" -#include "AlarmPopUpPresenter.h" +#include "alarm/include/AlarmPopUpPresenter.h" namespace OHOS { #define CLOSE "关闭" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmConfigView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmConfigView.cpp index 320be4745..c3fae04c9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmConfigView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmConfigView.cpp @@ -5,10 +5,10 @@ * Create: 2021-09-11 */ -#include "AlarmConfigView.h" +#include "alarm/include/AlarmConfigView.h" #include "UiConfig.h" #include -#include "AlarmPresenter.h" +#include "alarm/include/AlarmPresenter.h" #include #include "color.h" #include "ConfigModel.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmMaxClock.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmMaxClock.cpp index 570da742e..5567d7409 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmMaxClock.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmMaxClock.cpp @@ -5,14 +5,14 @@ * Create: 2021-09-11 */ -#include "AlarmMaxClock.h" +#include "alarm/include/AlarmMaxClock.h" #include "UiConfig.h" #include #include "ohos_timer.h" #include "graphic_timer.h" -#include "AlarmPresenter.h" -#include "MainAlarmView.h" +#include "alarm/include/AlarmPresenter.h" +#include "alarm/include/MainAlarmView.h" #include "ui_resource_string.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmNewTimeView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmNewTimeView.cpp index e514488ea..1253b9ae9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmNewTimeView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmNewTimeView.cpp @@ -5,7 +5,7 @@ * Create: 2021-09-11 */ -#include "AlarmNewTimeView.h" +#include "alarm/include/AlarmNewTimeView.h" #include "common/screen.h" #include "components/ui_label.h" #include "components/ui_label_button.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPopUpPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPopUpPresenter.cpp index 2ae51d223..86b24ac46 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPopUpPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPopUpPresenter.cpp @@ -6,11 +6,11 @@ */ -#include "AlarmPopUpPresenter.h" -#include "MainAlarmView.h" +#include "alarm/include/AlarmPopUpPresenter.h" +#include "alarm/include/MainAlarmView.h" #include "ChangeSliceListener.h" -#include "PhoneService.h" -#include "PlayersModel.h" +#include "phoneservice/include/PhoneService.h" +#include "player/include/PlayersModel.h" #include "NativeRegisterManager.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPopUpView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPopUpView.cpp index 29ad7f6fb..a28f43e4e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPopUpView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmPopUpView.cpp @@ -5,8 +5,8 @@ * Create: 2021-09-11 */ -#include "AlarmPopUpView.h" -#include "AlarmPopUpPresenter.h" +#include "alarm/include/AlarmPopUpView.h" +#include "alarm/include/AlarmPopUpPresenter.h" #include "common/screen.h" #include "components/ui_label.h" #include "components/ui_label_button.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmRingView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmRingView.cpp index bb449321c..feadd1e46 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmRingView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmRingView.cpp @@ -5,15 +5,15 @@ * Create: 2021-09-11 */ -#include "AlarmRingView.h" +#include "alarm/include/AlarmRingView.h" #include "common/screen.h" #include "components/ui_label.h" #include "components/ui_label_button.h" #include -#include "AlarmPopUpPresenter.h" +#include "alarm/include/AlarmPopUpPresenter.h" #include "ohos_timer.h" #include "graphic_timer.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" namespace OHOS { #define RING_AGAIN "响铃将在十分钟后再次响起" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetTimeView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetTimeView.cpp index 90923c173..febc742aa 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetTimeView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetTimeView.cpp @@ -5,7 +5,7 @@ * Create: 2021-09-11 */ -#include "AlarmSetTimeView.h" +#include "alarm/include/AlarmSetTimeView.h" #include "common/screen.h" #include "components/ui_label.h" #include "components/ui_label_button.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetWeekView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetWeekView.cpp index 28436580b..bfbb8abb3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetWeekView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/AlarmSetWeekView.cpp @@ -5,7 +5,7 @@ * Create: 2021-09-11 */ -#include "AlarmSetWeekView.h" +#include "alarm/include/AlarmSetWeekView.h" #include "common/screen.h" #include "components/ui_digital_clock.h" #include "ui_resource_string.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/MainAlarmView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/MainAlarmView.cpp index e836e06f1..037f7c344 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/MainAlarmView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarm/src/MainAlarmView.cpp @@ -8,7 +8,7 @@ #include "alarm/include/MainAlarmView.h" #include "UiConfig.h" #include "ui_label_button.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #include "ui_resource_string.h" #include "ConfigModel.h" #include "languagecode/LanguageInit.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclockmanage/include/AlarmClockManage.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclockmanage/include/AlarmClockManage.h index 869857e5e..46023c4b4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclockmanage/include/AlarmClockManage.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclockmanage/include/AlarmClockManage.h @@ -13,7 +13,7 @@ #include #include "ohos_types.h" -#include "AlarmClockTimerConfig.h" +#include "alarmclocktimerconfig/include/AlarmClockTimerConfig.h" #ifdef __cplusplus extern "C" { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclockmanage/src/AlarmClockManage.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclockmanage/src/AlarmClockManage.cpp index 6d91ca907..10b89af46 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclockmanage/src/AlarmClockManage.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclockmanage/src/AlarmClockManage.cpp @@ -19,9 +19,9 @@ #include "broadcast_service.h" #include "samgr_lite.h" -#include "RtcService.h" +#include "rtcservice/include/RtcService.h" #include "alarmclocktimerconfig/include/AlarmClockTimerConfig.h" -#include "AlarmClockManage.h" +#include "alarmclockmanage/include/AlarmClockManage.h" #ifdef __cplusplus extern "C" { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp index 22d65b3b7..eace02944 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp @@ -16,7 +16,7 @@ #include "thread_adapter.h" #include "graphic_service.h" -#include "AlarmClockTimerConfig.h" +#include "alarmclocktimerconfig/include/AlarmClockTimerConfig.h" #include "ConfigModelC.h" #include "ConfigModel.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBarCode.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBarCode.h index 12426d62e..55e5c8613 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBarCode.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBarCode.h @@ -12,7 +12,7 @@ #include "components/ui_label.h" #include "components/ui_label_button.h" #include "components/ui_barcode.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" namespace OHOS { class AlipayBarCode : public UIViewGroup { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBind.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBind.h index bfe2153e8..135714948 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBind.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBind.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_button.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" #include "components/ui_qrcode.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBindAni.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBindAni.h index d8c0cf65a..2ef321d2a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBindAni.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBindAni.h @@ -12,7 +12,7 @@ #include "components/ui_label.h" #include "components/ui_label_button.h" #include "components/ui_image_animator.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" #define ALIPAY_BIND_SEARCH_IMAGE_NUM 8 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBindRes.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBindRes.h index 5b7f9a6a0..4102c99f2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBindRes.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayBindRes.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_button.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" namespace OHOS { class AlipayBindRes : public UIViewGroup { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayExitBind.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayExitBind.h index 95ae61c7e..72489ddc0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayExitBind.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayExitBind.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_button.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" namespace OHOS { class AlipayExitBind : public UIViewGroup { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayHelp.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayHelp.h index 350da2143..a759ae36c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayHelp.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayHelp.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_button.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" #include "components/ui_qrcode.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h index 60442a8e2..5b8dbfc0f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h @@ -16,11 +16,11 @@ #include "components/ui_scroll_view.h" #include "components/ui_list.h" #include "components/icon_adapter.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" #include "AppViewIDs.h" #include "UiConfig.h" -#include "AlipayListAdapter.h" -#include "AlipayListItem.h" +#include "alipay/include/AlipayList/AlipayListAdapter.h" +#include "alipay/include/AlipayList/AlipayListItem.h" namespace OHOS { class AlipayListAdapter; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayMainView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayMainView.h index a5ffbd85c..4ca06dc65 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayMainView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayMainView.h @@ -13,27 +13,27 @@ #include "components/ui_view_group.h" #include "ChangeSliceListener.h" #include "components/ui_swipe_view.h" -#include "AlipayPresenter.h" -#include "AlipayModel.h" -#include "AlipayBind.h" -#include "AlipayExitBind.h" -#include "AlipayBindRes.h" -#include "AlipayBindAni.h" -#include "AlipayListView.h" -#include "AlipayBarCode.h" -#include "AlipayPayCode.h" -#include "AlipaySetting.h" -#include "AlipayHelp.h" -#include "AlipayUnbindFinish.h" -#include "AlipayUnbind.h" +#include "alipay/include/AlipayPresenter.h" +#include "alipay/include/AlipayModel.h" +#include "alipay/include/AlipayBind.h" +#include "alipay/include/AlipayExitBind.h" +#include "alipay/include/AlipayBindRes.h" +#include "alipay/include/AlipayBindAni.h" +#include "alipay/include/AlipayList/AlipayListView.h" +#include "alipay/include/AlipayBarCode.h" +#include "alipay/include/AlipayPayCode.h" +#include "alipay/include/AlipaySetting.h" +#include "alipay/include/AlipayHelp.h" +#include "alipay/include/AlipayUnbindFinish.h" +#include "alipay/include/AlipayUnbind.h" -#include "AlipayGetTransList.h" -#include "AlipayTransTips.h" -#include "AlipayTransCode.h" -#include "AlipayTransEnable.h" -#include "AlipayTransRes.h" -#include "AlipayTransListView.h" -#include "AlipayTransAni.h" +#include "alipay/include/AlipayTrans/AlipayGetTransList.h" +#include "alipay/include/AlipayTrans/AlipayTransTips.h" +#include "alipay/include/AlipayTrans/AlipayTransCode.h" +#include "alipay/include/AlipayTrans/AlipayTransEnable.h" +#include "alipay/include/AlipayTrans/AlipayTransRes.h" +#include "alipay/include/AlipayTrans/AlipayTransListView.h" +#include "alipay/include/AlipayTrans/AlipayTransAni.h" namespace OHOS { class AlipayMainView; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayPayCode.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayPayCode.h index 6ef24cb3a..ae5964f99 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayPayCode.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayPayCode.h @@ -12,7 +12,7 @@ #include "components/ui_label_button.h" #include "components/ui_button.h" #include "components/ui_qrcode.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" namespace OHOS { class AlipayPayCode : public UIViewGroup { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayPresenter.h index 1c038b948..eda67f78f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayPresenter.h @@ -8,13 +8,14 @@ #ifndef ALIPAY_PRESENTER_H #define ALIPAY_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "UiConfig.h" #include "wearable_log.h" #include "color.h" -#include "AlipayModel.h" +#include "alipay/include/AlipayModel.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "common/key_code.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayRefreshBindCode.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayRefreshBindCode.h index fe03e3035..c69792dd4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayRefreshBindCode.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayRefreshBindCode.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_button.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" #include "components/ui_qrcode.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipaySetting.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipaySetting.h index 0f9d31445..16c310ee2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipaySetting.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipaySetting.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_button.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" #include "components/ui_qrcode.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayGetTransList.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayGetTransList.h index a5c671432..755fbedb6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayGetTransList.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayGetTransList.h @@ -11,7 +11,8 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_button.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" + namespace OHOS { class AlipayGetTransList : public UIViewGroup { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransAni.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransAni.h index fc577b8b8..af8179174 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransAni.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransAni.h @@ -12,7 +12,7 @@ #include "components/ui_label.h" #include "components/ui_label_button.h" #include "components/ui_image_animator.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" #define ALIPAY_TRANS_SEARCH_IMAGE_NUM 8 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransCode.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransCode.h index d4ba75077..303ffe9e9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransCode.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransCode.h @@ -12,7 +12,7 @@ #include "components/ui_label_button.h" #include "components/ui_button.h" #include "components/ui_qrcode.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" namespace OHOS { class AlipayTransCode : public UIViewGroup { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransEnable.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransEnable.h index e2af18b71..f23798318 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransEnable.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransEnable.h @@ -12,7 +12,7 @@ #include "components/ui_label_button.h" #include "components/ui_button.h" #include "components/ui_qrcode.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" namespace OHOS { class AlipayTransEnable : public UIViewGroup { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListAdapter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListAdapter.h index 233193063..13dffb7b6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListAdapter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListAdapter.h @@ -17,7 +17,7 @@ #include "components/abstract_adapter.h" #include "wearable_log.h" #include "UiConfig.h" -#include "AlipayTransListItem.h" +#include "alipay/include/AlipayTrans/AlipayTransListItem.h" namespace OHOS { class AlipayTransListAdapter : public AbstractAdapter { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h index ca6886b97..fe0f6b903 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListItemView.h @@ -13,8 +13,8 @@ #include "components/ui_image_view.h" #include "UiConfig.h" -#include "AlipayTransListItem.h" -#include "AlipayTransListView.h" +#include "alipay/include/AlipayTrans/AlipayTransListItem.h" +#include "alipay/include/AlipayTrans/AlipayTransListView.h" namespace OHOS { class AlipayTransListItemView : public UIViewGroup { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h index 23cb4fe94..9caaf4539 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h @@ -17,11 +17,11 @@ #include "components/ui_list.h" #include "components/ui_button.h" #include "components/icon_adapter.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" #include "AppViewIDs.h" #include "UiConfig.h" -#include "AlipayTransListAdapter.h" -#include "AlipayTransListItem.h" +#include "alipay/include/AlipayTrans/AlipayTransListAdapter.h" +#include "alipay/include/AlipayTrans/AlipayTransListItem.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransRes.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransRes.h index 57a93a147..8df25a513 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransRes.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransRes.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_button.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" namespace OHOS { class AlipayTransRes : public UIViewGroup { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransTips.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransTips.h index 0254ab881..7f533acbf 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransTips.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransTips.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_button.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" namespace OHOS { class AlipayTransTips : public UIViewGroup { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayUnbind.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayUnbind.h index 8118d59da..02f9c382d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayUnbind.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayUnbind.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_button.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" namespace OHOS { class AlipayUnbind : public UIViewGroup { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayUnbindFinish.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayUnbindFinish.h index 9221d783f..34e940f2c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayUnbindFinish.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/include/AlipayUnbindFinish.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_button.h" -#include "AlipayPresenter.h" +#include "alipay/include/AlipayPresenter.h" #include "components/ui_qrcode.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBarCode.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBarCode.cpp index 5e8723d58..daabbfa8c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBarCode.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBarCode.cpp @@ -8,8 +8,8 @@ #include "UiConfig.h" #include #include "cmsis_os.h" -#include "AlipayBarCode.h" -#include "AlipayModel.h" +#include "alipay/include/AlipayBarCode.h" +#include "alipay/include/AlipayModel.h" namespace OHOS { #define ALIPAY_BARCODE_SPACE 32 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBind.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBind.cpp index 780949585..19997d4af 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBind.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBind.cpp @@ -6,8 +6,8 @@ */ #include "UiConfig.h" #include -#include "AlipayBind.h" -#include "AlipayModel.h" +#include "alipay/include/AlipayBind.h" +#include "alipay/include/AlipayModel.h" namespace OHOS { static const char *BIND_TITLE = (char *)"使用支付宝扫码绑定"; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindAni.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindAni.cpp index b5da85e05..e6a61212a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindAni.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindAni.cpp @@ -9,7 +9,7 @@ #include "layout/grid_layout.h" #include "font/ui_font.h" #include -#include "AlipayBindAni.h" +#include "alipay/include/AlipayBindAni.h" #include "common/image_cache_manager.h" #include "graphic_service.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindRes.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindRes.cpp index acde3eb94..f6ffa9754 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindRes.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayBindRes.cpp @@ -10,8 +10,8 @@ #include "font/ui_font.h" #include #include "cmsis_os.h" -#include "AlipayBindRes.h" -#include "AlipayModel.h" +#include "alipay/include/AlipayBindRes.h" +#include "alipay/include/AlipayModel.h" namespace OHOS { static const int16 EXIT_LABEL_X_FIRST = 83; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayExitBind.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayExitBind.cpp index c24d18441..6368e2101 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayExitBind.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayExitBind.cpp @@ -9,7 +9,8 @@ #include "layout/grid_layout.h" #include "font/ui_font.h" #include -#include "AlipayExitBind.h" +#include "alipay/include/AlipayExitBind.h" + namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayHelp.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayHelp.cpp index a772a5c10..cfe9c6ed1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayHelp.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayHelp.cpp @@ -8,8 +8,8 @@ #include "UiConfig.h" #include #include "cmsis_os.h" -#include "AlipayHelp.h" -#include "AlipayModel.h" +#include "alipay/include/AlipayHelp.h" +#include "alipay/include/AlipayModel.h" namespace OHOS { static const char *HELP_TITLE = (char*)"使用支付宝扫码求助"; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListAdapter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListAdapter.cpp index 75b2d2da8..2af3bab3f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListAdapter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListAdapter.cpp @@ -5,8 +5,8 @@ * Create: */ -#include "AlipayListAdapter.h" -#include "AlipayListItemView.h" +#include "alipay/include/AlipayList/AlipayListAdapter.h" +#include "alipay/include/AlipayList/AlipayListItemView.h" namespace OHOS { AlipayListAdapter::AlipayListAdapter() diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListItemView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListItemView.cpp index c7722640d..fab1a839c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListItemView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListItemView.cpp @@ -6,7 +6,7 @@ */ #include "wearable_log.h" -#include "AlipayListItemView.h" +#include "alipay/include/AlipayList/AlipayListItemView.h" namespace OHOS { static constexpr int16_t ALIPAY_LIST_ITEM_BUTTON_HEIGHT = 120; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListView.cpp index 91be991f2..aa0b120ef 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayList/AlipayListView.cpp @@ -6,8 +6,6 @@ */ #include -// #include "AlipayListView.h" -// #include "AlipayListItem.h" #include "alipay/include/AlipayList/AlipayListView.h" #include "alipay/include/AlipayList/AlipayListItem.h" #include "cmsis_os2.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayMainView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayMainView.cpp index 8757eb61b..9fb10f175 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayMainView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayMainView.cpp @@ -5,11 +5,11 @@ * Create: */ -#include "AlipayMainView.h" +#include "alipay/include/AlipayMainView.h" #include "UiConfig.h" #include "alipay_feature.h" #include "custom_utils.h" -#include "AlipayC.h" +#include "alipay/include/AlipayC.h" bool is_Alipay_bind(void) { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayModel.cpp index e583eeddb..45e53bec1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayModel.cpp @@ -7,8 +7,8 @@ #include "UiConfig.h" #include "alipay_feature.h" -#include "AlipayModel.h" -#include "AlipayMainView.h" +#include "alipay/include/AlipayModel.h" +#include "alipay/include/AlipayMainView.h" #include "graphic_service.h" #include "power_display_service.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPayCode.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPayCode.cpp index 80f52fa27..0a6364a4c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPayCode.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPayCode.cpp @@ -8,8 +8,8 @@ #include "UiConfig.h" #include #include "cmsis_os.h" -#include "AlipayPayCode.h" -#include "AlipayModel.h" +#include "alipay/include/AlipayPayCode.h" +#include "alipay/include/AlipayModel.h" namespace OHOS { static AlipayPayCode *g_alipayPayCode = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp index e95c202e3..f4c0789bc 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayPresenter.cpp @@ -5,8 +5,8 @@ * Create: */ -#include "AlipayPresenter.h" -#include "AlipayMainView.h" +#include "alipay/include/AlipayPresenter.h" +#include "alipay/include/AlipayMainView.h" #include "ChangeSliceListener.h" #include "graphic_service.h" #include "string" @@ -14,15 +14,15 @@ #include "sstream" #include "errcode.h" #include "pm_definition.h" -#include "AlipayListView.h" -#include "AlipayListItemView.h" -#include "AlipayTransListItemView.h" -#include "AlipayTransListView.h" +#include "alipay/include/AlipayList/AlipayListView.h" +#include "alipay/include/AlipayList/AlipayListItemView.h" +#include "alipay/include/AlipayTrans/AlipayTransListItemView.h" +#include "alipay/include/AlipayTrans/AlipayTransListView.h" #include "NativeRegisterManager.h" #include "custom_utils.h" #include "common/key_code.h" #include "gfx_utils/mem_check.h" -#include "AlipayC.h" +#include "alipay/include/AlipayC.h" #include "ui_resource_string.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipaySetting.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipaySetting.cpp index 1431015d9..ef7ec2d74 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipaySetting.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipaySetting.cpp @@ -8,8 +8,6 @@ #include "UiConfig.h" #include #include "cmsis_os.h" -// #include "AlipaySetting.h" -// #include "AlipayModel.h" #include "alipay/include/AlipaySetting.h" #include "alipay/include/AlipayModel.h" #include "uicomponents/UIComponents.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayGetTransList.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayGetTransList.cpp index 0bdadd009..b44bbb0ec 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayGetTransList.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayGetTransList.cpp @@ -10,7 +10,7 @@ #include "font/ui_font.h" #include #include "cmsis_os.h" -#include "AlipayGetTransList.h" +#include "alipay/include/AlipayTrans/AlipayGetTransList.h" namespace OHOS { static const int16 EXIT_LABEL_X_FIRST = 60; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransAni.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransAni.cpp index 37adb66e5..7f9eb53a3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransAni.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransAni.cpp @@ -10,7 +10,7 @@ #include "font/ui_font.h" #include #include "cmsis_os.h" -#include "AlipayTransAni.h" +#include "alipay/include/AlipayTrans/AlipayTransAni.h" #include "common/image_cache_manager.h" #include "graphic_service.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp index b32347cde..923fa41f4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransCode.cpp @@ -8,8 +8,8 @@ #include "UiConfig.h" #include #include "cmsis_os.h" -#include "AlipayTransCode.h" -#include "AlipayModel.h" +#include "alipay/include/AlipayTrans/AlipayTransCode.h" +#include "alipay/include/AlipayModel.h" namespace OHOS { static const char *TRANSCODE_BUTTON = (char *)"切换交通卡"; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransEnable.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransEnable.cpp index 8b42995ba..c26979c3e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransEnable.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransEnable.cpp @@ -8,8 +8,8 @@ #include "UiConfig.h" #include #include "cmsis_os.h" -#include "AlipayTransEnable.h" -#include "AlipayModel.h" +#include "alipay/include/AlipayTrans/AlipayTransEnable.h" +#include "alipay/include/AlipayModel.h" namespace OHOS { static const char *TRANSCODE_TITLE = (char *)"乘车码未开通"; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListAdapter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListAdapter.cpp index 703c4b275..4d80ad742 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListAdapter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListAdapter.cpp @@ -5,8 +5,8 @@ * Create: */ -#include "AlipayTransListAdapter.h" -#include "AlipayTransListItemView.h" +#include "alipay/include/AlipayTrans/AlipayTransListAdapter.h" +#include "alipay/include/AlipayTrans/AlipayTransListItemView.h" namespace OHOS { AlipayTransListAdapter::AlipayTransListAdapter() diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListItemView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListItemView.cpp index 96fe00d11..961956ee5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListItemView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListItemView.cpp @@ -6,7 +6,6 @@ */ #include "wearable_log.h" -// #include "AlipayTransListItemView.h" #include "alipay/include/AlipayTrans/AlipayTransListItemView.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListView.cpp index b5307c5b7..3299bfad0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransListView.cpp @@ -6,9 +6,9 @@ */ #include -#include "AlipayTransListView.h" -#include "AlipayTransListItem.h" -#include "AlipayModel.h" +#include "alipay/include/AlipayTrans/AlipayTransListView.h" +#include "alipay/include/AlipayTrans/AlipayTransListItem.h" +#include "alipay/include/AlipayModel.h" #include "cmsis_os2.h" #include "common_def.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransRes.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransRes.cpp index c7b5558b2..4bf1a901e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransRes.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransRes.cpp @@ -10,8 +10,8 @@ #include "font/ui_font.h" #include #include "cmsis_os.h" -#include "AlipayTransRes.h" -#include "AlipayModel.h" +#include "alipay/include/AlipayTrans/AlipayTransRes.h" +#include "alipay/include/AlipayModel.h" namespace OHOS { static const int16 EXIT_LABEL_X_FIRST = 38; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp index 79ffdd814..ce15d75fc 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayTrans/AlipayTransTips.cpp @@ -10,8 +10,6 @@ #include "font/ui_font.h" #include #include "cmsis_os.h" -// #include "AlipayTransTips.h" -// #include "AlipayModel.h" #include "alipay/include/AlipayTrans/AlipayTransTips.h" #include "alipay/include/AlipayModel.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbind.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbind.cpp index 0107e26cf..7c6749a3b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbind.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbind.cpp @@ -10,7 +10,6 @@ #include "font/ui_font.h" #include #include "cmsis_os.h" -// #include "AlipayUnbind.h" #include "alipay/include/AlipayUnbind.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbindFinish.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbindFinish.cpp index 9a3c629c4..ce6679260 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbindFinish.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alipay/src/AlipayUnbindFinish.cpp @@ -8,7 +8,6 @@ #include "UiConfig.h" #include #include "cmsis_os.h" -// #include "AlipayUnbindFinish.h" #include "alipay/include/AlipayUnbindFinish.h" namespace OHOS { static AlipayUnbindFinish *g_alipayUnbindFinish = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/include/AodModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/include/AodModel.h index 69586855d..c1ec92bc4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/include/AodModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/include/AodModel.h @@ -7,7 +7,7 @@ #ifndef AODMODEL_H #define AODMODEL_H -#include "AodView.h" +#include "aod_view/include/AodView.h" #include "components/ui_view.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/include/AodPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/include/AodPresenter.h index 969fc9c1d..35d4565a7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/include/AodPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/include/AodPresenter.h @@ -7,11 +7,12 @@ #ifndef AODPRESENTER_H #define AODPRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" -#include "AodView.h" +#include "aod_view/include/AodView.h" #include "components/ui_view.h" -#include "KeyInputListener.h" -#include "ModelListenerSample.h" +#include "key/include/KeyInputListener.h" +#include "main/include/ModelListenerSample.h" namespace OHOS { class AodView; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/include/AodView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/include/AodView.h index 0bcf7afba..85b6ac3ba 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/include/AodView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/include/AodView.h @@ -8,12 +8,12 @@ #ifndef AODVIEW_H #define AODVIEW_H #include "View.h" -#include "MainModel.h" -#include "SetDialInfo.h" -#include "DialBinTypesV2.h" +#include "main/include/MainModel.h" +#include "set_dial/include/SetDialInfo.h" +#include "main/include/DialBinTypesV2.h" #include "components/ui_view.h" #include "components/ui_card_page.h" - +#include "aod_view/include/AodPresenter.h" namespace OHOS { class AodPresenter; class AodView : public View { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/src/AodModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/src/AodModel.cpp index e06b38c0e..6e8821106 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/src/AodModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/src/AodModel.cpp @@ -5,7 +5,7 @@ * Create: 2024-10-30 */ -#include "AodModel.h" +#include "aod_view/include/AodModel.h" #include "kv_store.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/src/AodPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/src/AodPresenter.cpp index c08a7472b..863c11bcd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/src/AodPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/src/AodPresenter.cpp @@ -5,7 +5,7 @@ * Create: 2024-10-30 */ -#include "AodPresenter.h" +#include "aod_view/include/AodPresenter.h" #include "NativeRegisterManager.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/src/AodView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/src/AodView.cpp index 7943c5a98..f56d0d43f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/src/AodView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/aod_view/src/AodView.cpp @@ -5,14 +5,14 @@ * Create: 2024-10-30 */ -#include "AodView.h" -#include "AodPresenter.h" -#include "AodModel.h" +#include "aod_view/include/AodView.h" +#include "aod_view/include/AodPresenter.h" +#include "aod_view/include/AodModel.h" #include "common/graphic_utils.h" -#include "DialBinParser.h" -#include "DialViewGroup.h" -#include "AmbientClockView.h" -#include "DialModelTime.h" +#include "main/include/DialBinParser.h" +#include "main/include/dial/DialViewGroup.h" +#include "clock/include/AmbientClockView.h" +#include "main/include/dial/DialModelTime.h" namespace OHOS { AodView::~AodView() @@ -90,7 +90,10 @@ UIViewGroup *AodView::InitAodOffDial(DialSetting &setting) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AodView::InitAodOffDial: Failed to open the dial file.\n"); return nullptr; } - bool ret = DialBinParserManager::GetInstance()->GetDialPreviewInfo(fp, &preview); + bool ret = false; + #ifdef FD230_650_0723 + ret = DialBinParserManager::GetInstance()->GetDialPreviewInfo(fp, &preview); + #endif fclose(fp); if (!ret) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AodView::InitAodOffDial: Failed to get the dial preview info.\n"); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/AppItemView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/AppItemView.h index bd89ec720..eebb4afb1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/AppItemView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/AppItemView.h @@ -11,7 +11,7 @@ #include "components/ui_label.h" #include "components/ui_view_group.h" #include "components/ui_image_view.h" -#include "ApplistModel.h" +#include "applist/include/ApplistModel.h" #include "UiConfig.h" #include "components/ui_transform_group.h" #include "components/ui_label_ext.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/ApplistAdapter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/ApplistAdapter.h index b66b15169..6ccb3a313 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/ApplistAdapter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/ApplistAdapter.h @@ -18,7 +18,7 @@ #include "UiConfig.h" #include "wearable_log.h" #include "AppItemView.h" -#include "ApplistModel.h" +#include "applist/include/ApplistModel.h" #include "components/root_view.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/ApplistModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/ApplistModel.h index d9e8f68d7..95d4510fb 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/ApplistModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/ApplistModel.h @@ -12,6 +12,7 @@ #include "AppViewIDs.h" #include "ohos_types.h" #include "themestyle/include/ThemeStyleModel.h" +#include "ui_resource_string.h" #define APP_MAX_NUM 50 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/ApplistPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/ApplistPresenter.h index 91858750d..094580061 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/ApplistPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/include/ApplistPresenter.h @@ -8,11 +8,12 @@ #ifndef APPLIST_PRESENTER_H #define APPLIST_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "ohos_types.h" #include "AppItemView.h" #include "ApplistView.h" -#include "ApplistModel.h" +#include "applist/include/ApplistModel.h" #include "components/root_view.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/AppItemView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/AppItemView.cpp index 8663911cf..fbe5b16be 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/AppItemView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/AppItemView.cpp @@ -5,7 +5,7 @@ * Create: 2021-09-18 */ -#include "AppItemView.h" +#include "applist/include/AppItemView.h" #include "wearable_log.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistAdapter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistAdapter.cpp index 39c67f3c8..3ce95f304 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistAdapter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistAdapter.cpp @@ -5,7 +5,7 @@ * Create: 2021-09-18 */ -#include "ApplistAdapter.h" +#include "applist/include/ApplistAdapter.h" namespace OHOS { ApplistAdapter::ApplistAdapter() {} @@ -326,7 +326,7 @@ static void updateCircleListAndSelectImageWhenStartangleZero(UIImageView** Circl curselectImageIndex = preselectImageIndex; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "startangle等于0:[%d,%d]", curselectImageIndex, preselectImageIndex); - CircleListSelectImage_->SetSrc(ApplistModel::GetInstance().GetApplistItems()[curselectImageIndex].iconLarge); + CircleListSelectImage_->SetSrc(ApplistModel::GetInstance().GetApplistItems()[curselectImageIndex].iconSmall); CircleListSelectImage_->SetViewIndex(ApplistModel::GetInstance().GetApplistItems()[curselectImageIndex].id); ApplistModel::GetInstance().SetCurselectImageIndex(curselectImageIndex); ApplistModel::GetInstance().SetPreselectImageIndex(preselectImageIndex); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistModel.cpp index c57047826..eb0a8397d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistModel.cpp @@ -14,9 +14,9 @@ #include "wearable_log.h" #include "UiConfig.h" -#include "ApplistModel.h" -#include "ApplistPresenter.h" -#include "SetDesktopView.h" +#include "applist/include/ApplistModel.h" +#include "applist/include/ApplistPresenter.h" +#include "font/font_global_manager.h" #include "NativeRegisterManager.h" namespace OHOS { #define FOOTBALL_PLANE_MAX_NUM 20 @@ -97,7 +97,6 @@ namespace OHOS { applist[appLen] = { VIEW_EXTERN_APP, bundleInfos[len].smallIconPath, - bundleInfos[len].smallIconPath, bundleInfos[len].bigIconPath, bundleInfos[len].label, bundleInfos[len].bundleName @@ -165,18 +164,6 @@ namespace OHOS { AppListStyle ApplistModel::GetCurrentStyle(void) { return ThemeStyleModel::GetInstance().GetAppListDisplayStyle(); //根据显示样式界面设置的返回当前applit样式 - #if 0 - uint8_t currenStyle = SetDesktopView::GetInstance()->GetCurrentSelectedStyle(); - if (currenStyle == 1) { // 1: hexagons desktop style - return HEXAGONS_STYLE; - } else if (currenStyle == 2) { // 2: football desktop style - return FOOTBALL_STYLE; - } else if (currenStyle == 3) { // 3: waterfall desktop style - return WATERFALL_STYLE; - } else { - return APPLIST_STYLE; - } - #endif } /* -------------------------------------------------------------------------- */ diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistPresenter.cpp index 673315a0e..146a17f39 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistPresenter.cpp @@ -5,7 +5,7 @@ * Create: 2021-09-18 */ -#include "ApplistPresenter.h" +#include "applist/include/ApplistPresenter.h" #include "ability_manager.h" #include "securec.h" #include "components/ui_hexagons_list.h" @@ -44,7 +44,6 @@ REGIST_SLICE(VIEW_APPLIST, ApplistView, ApplistPresenter); void ApplistPresenter::OnResume() { - Presenter::OnResume(); if (GetCurrentStyle() == AppListStyle::FOOTBALL_STYLE) { view_->StartFootBallAnimator(); } else if (GetCurrentStyle() == AppListStyle::WATERFALL_STYLE) { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistView.cpp index 6fc004cce..49430530d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/applist/src/ApplistView.cpp @@ -6,12 +6,13 @@ */ #include "components/ui_view_group.h" -#include "ApplistView.h" -#include "ApplistPresenter.h" -#include "AppItemView.h" +#include "applist/include/ApplistView.h" +#include "applist/include/ApplistPresenter.h" +#include "applist/include/AppItemView.h" #include "common/image_cache_manager.h" #include "hal_tick.h" #include "main/include/ModelListenerSample.h" +#include "common/screen.h" namespace OHOS { static constexpr int16 NUM_2 = 2; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/include/AssistantPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/include/AssistantPresenter.h index 4c729985e..336e77fa1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/include/AssistantPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/include/AssistantPresenter.h @@ -5,6 +5,7 @@ #include "AssistantView.h" #include "ModelListenerSample.h" +#include "key/include/KeyInputListener.h" #include "Presenter.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantModel.cpp index 26f2da765..ec6ea74a0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantModel.cpp @@ -37,7 +37,7 @@ #include // #include "PhoneService.h" -// #include "PhoneServiceC.h" +// #include "phoneservice/include/PhoneServiceC.h" extern "C" { int uapi_open_voice_recognition(void); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantPresenter.cpp index b83083c66..8fa3b6678 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/assistant/src/AssistantPresenter.cpp @@ -1,6 +1,6 @@ #include "AppViewIDs.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "NativeAbility.h" #include "common/key_code.h" #include "components/ui_label_ext.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodDetectionPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodDetectionPresenter.h index 2eb9ed404..821b2d9bd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodDetectionPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodDetectionPresenter.h @@ -8,10 +8,11 @@ #ifndef BLOOD_DETECTION_PRESENTER_H #define BLOOD_DETECTION_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "components/ui_list.h" #include "components/ui_view.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "ModelListenerSample.h" #include "bloodoxygen/include/BloodDetectionView.h" #include "power_display_service.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodResultPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodResultPresenter.h index b02ba0b19..ca5bc3830 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodResultPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/include/BloodResultPresenter.h @@ -3,11 +3,12 @@ #ifndef BLOOD_RESULT_PRESENTER_H #define BLOOD_RESULT_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "ModelListenerSample.h" #include "components/ui_circle_progress.h" #include "ohos_types.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "common/key_code.h" #include "bloodoxygen/include/BloodResultView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp index b514467ad..99600ad57 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionPresenter.cpp @@ -11,11 +11,11 @@ #include "AppViewIDs.h" #include "NativeAbility.h" #include "common/key_code.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" // #include "displaybrightness/include/DisplayBrightnessModel.h" #include "bloodoxygen/include/BloodOxygenModel.h" -#include "MainModel.h" +#include "main/include/MainModel.h" #include "NativeRegisterManager.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp index 835b3288f..075f8be24 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodDetectionView.cpp @@ -6,10 +6,9 @@ */ #include "UiConfig.h" #include "wearable_log.h" -#include "BloodDetectionView.h" -#include "BloodOxygenModel.h" +#include "bloodoxygen/include/BloodDetectionView.h" +#include "bloodoxygen/include/BloodOxygenModel.h" #include "ui_image_animator.h" -#include "BloodDetectionView.h" #include "ui_resource_string.h" #include "power_display_service.h" #include "uicomponents/UIComponents.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp index b0fdf85aa..2e117ceb3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp @@ -1,7 +1,7 @@ #include "bloodoxygen/include/BloodOxygenModel.h" #include "bloodoxygen/include/BloodResultPresenter.h" -#include "DialModelSPO2.h" +#include "main/include/dial/DialModelSPO2.h" #include "graphic_service.h" #include "wearable_log.h" @@ -16,7 +16,7 @@ #include "AppViewIDs.h" #include "ConfigModel.h" -#include "MainViewSample.h" +#include "main/include/MainViewSample.h" #include "NativeAbility.h" #include "battery_hal.h" #include "health/BloodCardView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp index a37656b67..740740618 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultPresenter.cpp @@ -7,7 +7,7 @@ #include "bloodoxygen/include/BloodResultPresenter.h" #include "common/task_manager.h" -#include "BloodOxygenModel.h" +#include "bloodoxygen/include/BloodOxygenModel.h" #include "bloodoxygen/include/BloodDetectionView.h" #include "bloodoxygen/include/BloodResultView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp index 7cb38d8b1..53cbdd332 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodResultView.cpp @@ -9,15 +9,15 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" -#include "MainViewSample.h" +#include "main/include/MainViewSample.h" #include "components/ui_view_group.h" -#include "DialModelSPO2.h" -#include "DialModelHeartRate.h" -#include "BloodOxygenModel.h" +#include "main/include/dial/DialModelSPO2.h" +#include "main/include/dial/DialModelHeartRate.h" +#include "bloodoxygen/include/BloodOxygenModel.h" #include "UiConfig.h" #include "uicomponents/UIComponents.h" -#include "MainPresenterSample.h" +#include "main/include/MainPresenterSample.h" #include "bloodoxygen/include/BloodResultPresenter.h" #include "bloodoxygen/include/BloodResultView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothCaseListAdapter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothCaseListAdapter.h index 5edaa1284..17de25f0b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothCaseListAdapter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothCaseListAdapter.h @@ -12,8 +12,8 @@ #include "components/ui_label.h" #include "components/ui_label_ext.h" #include "components/ui_label_button.h" -#include "PlayersPresenter.h" -#include "BluetoothItemView.h" +#include "player/include/PlayersPresenter.h" +#include "bluetooth/include/BluetoothItemView.h" namespace OHOS { class BluetoothCaseListAdapter : public AbstractAdapter { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothChangeBle.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothChangeBle.h new file mode 100644 index 000000000..fb6b0435b --- /dev/null +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothChangeBle.h @@ -0,0 +1,17 @@ +/* + * Copyright (c) @CompanyNameMagicTag 2021-2023. All rights reserved. + * Description: transmit header file + * This file should be changed only infrequently and with great care. + */ +#ifndef BLUETOOTH_CHANGE_BLE_H +#define BLUETOOTH_CHANGE_BLE_H + +#ifdef __cplusplus +extern "C" { +#endif +void ChangeBleConnectToMax(void); +void ChangeBleConnectToDefault(void); +#ifdef __cplusplus +} +#endif +#endif diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothDeviceCaseListAdapter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothDeviceCaseListAdapter.h index 2f8784a46..e03938a4b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothDeviceCaseListAdapter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothDeviceCaseListAdapter.h @@ -12,7 +12,7 @@ #include "components/ui_label.h" #include "components/ui_label_ext.h" #include "components/ui_label_button.h" -#include "BluetoothItemView.h" +#include "bluetooth/include/BluetoothItemView.h" namespace OHOS { class BluetoothDeviceCaseListAdapter : public AbstractAdapter { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothDeviceListView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothDeviceListView.h index 03ebbe168..2a7e4f71b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothDeviceListView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothDeviceListView.h @@ -12,7 +12,7 @@ #include "components/ui_label_ext.h" #include "components/ui_label_button_ext.h" #include "components/ui_list.h" -#include "BluetoothDeviceCaseListAdapter.h" +#include "bluetooth/include/BluetoothDeviceCaseListAdapter.h" #include "components/ui_scroll_view.h" namespace OHOS { class BluetoothDeviceCaseListAdapter; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothEarListView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothEarListView.h index 8106fc80e..8d9719f44 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothEarListView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothEarListView.h @@ -13,7 +13,7 @@ #include "components/ui_label_button_ext.h" #include "components/ui_image_animator.h" #include "components/ui_list.h" -#include "BluetoothCaseListAdapter.h" +#include "bluetooth/include/BluetoothCaseListAdapter.h" namespace OHOS { class BluetoothCaseListAdapter; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothEarPhoneView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothEarPhoneView.h index 4af2a23f0..23d4cbbe9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothEarPhoneView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothEarPhoneView.h @@ -14,7 +14,7 @@ #include "components/ui_label_button.h" #include "components/ui_image_animator.h" #include "cmsis_os.h" -#include "BluetoothModel.h" +#include "bluetooth/include/BluetoothModel.h" #define BLUETOOTH_SEARCH_IMAGE_NUM 8 namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothItemView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothItemView.h index 9ff78ba6d..e23213de6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothItemView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothItemView.h @@ -17,7 +17,7 @@ #include "components/ui_label_button.h" #include "components/ui_image_animator.h" -#include "BluetoothModel.h" +#include "bluetooth/include/BluetoothModel.h" #include "UiConfig.h" #define BLUETOOTH_CONNECT_IMAGE_NUM 8 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothModel.h index 161129070..eb402bfe0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothModel.h @@ -16,7 +16,13 @@ #include "bts_br_gap.h" #include namespace OHOS { - +constexpr uint16_t BLUETOOTH_CONN_HANDLE = 64; +constexpr uint16_t BLUETOOTH_INTERVAL_TOMAX_MIN = 12; +constexpr uint16_t BLUETOOTH_INTERVAL_TOMAX_MAX = 12; +constexpr uint16_t BLUETOOTH_INTERVAL_TODEFAULT_MIN = 24; +constexpr uint16_t BLUETOOTH_INTERVAL_TODEFAULT_MAX = 48; +constexpr uint16_t BLUETOOTH_LATENCY = 0; +constexpr uint16_t BLUETOOTH_TIMEOUT_MUTIPLIER = 500; typedef enum : uint16_t { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothOptionsView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothOptionsView.h index ae1157b6e..776784bf9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothOptionsView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothOptionsView.h @@ -14,7 +14,7 @@ #include "components/ui_label_ext.h" #include "components/ui_label_button_ext.h" #include "components/ui_image_animator.h" -#include "BluetoothCaseListAdapter.h" +#include "bluetooth/include/BluetoothCaseListAdapter.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothPresenter.h index 6c84d5fac..20453ad64 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothPresenter.h @@ -9,15 +9,16 @@ #ifndef BLUETOOTH_PRESENTER_H #define BLUETOOTH_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" -#include "MainBluetoothView.h" +#include "bluetooth/include/MainBluetoothView.h" #include "components/ui_view.h" #include "components/ui_image_view.h" #include "components/ui_label_button.h" #include "components/ui_view_group.h" -#include "VolumeSettingView.h" -#include "BluetoothModel.h" +#include "main/include/VolumeSettingView.h" +#include "bluetooth/include/BluetoothModel.h" #include "UiViewId.h" #include "cmsis_os.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/MainBluetoothView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/MainBluetoothView.h index e899d0813..18640908e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/MainBluetoothView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/MainBluetoothView.h @@ -10,17 +10,17 @@ #include "View.h" #include "UiConfig.h" #include "ChangeSliceListener.h" -#include "BluetoothPresenter.h" -#include "BluetoothCaseListAdapter.h" -#include "BluetoothEarListView.h" -#include "BluetoothEarPhoneView.h" -#include "BluetoothOptionsView.h" -#include "BluetoothReconnectView.h" -#include "TipsConnFailMessageView.h" -#include "TipsSuccMessageView.h" -#include "TipsFailMessageView.h" -#include "BluetoothDeviceListView.h" -#include "BluetoothItemView.h" +#include "bluetooth/include/BluetoothPresenter.h" +#include "bluetooth/include/BluetoothCaseListAdapter.h" +#include "bluetooth/include/BluetoothEarListView.h" +#include "bluetooth/include/BluetoothEarPhoneView.h" +#include "bluetooth/include/BluetoothOptionsView.h" +#include "bluetooth/include/BluetoothReconnectView.h" +#include "bluetooth/include/TipsConnFailMessageView.h" +#include "bluetooth/include/TipsSuccMessageView.h" +#include "bluetooth/include/TipsFailMessageView.h" +#include "bluetooth/include/BluetoothDeviceListView.h" +#include "bluetooth/include/BluetoothItemView.h" namespace OHOS { constexpr int16_t NUM_CONTAINER = 9; // NUM_CONTAINER :蓝牙耳机连接的9个界面容器 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothCaseListAdapter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothCaseListAdapter.cpp index b5acb85a3..8fa4b49d6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothCaseListAdapter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothCaseListAdapter.cpp @@ -5,15 +5,15 @@ * Create: 2021-07-26 */ #include -#include "BluetoothCaseListAdapter.h" -#include "BluetoothEarPhoneView.h" +#include "bluetooth/include/BluetoothCaseListAdapter.h" +#include "bluetooth/include/BluetoothEarPhoneView.h" #include "gfx_utils/list.h" -#include "PlayersPresenter.h" +#include "player/include/PlayersPresenter.h" #include "wearable_log.h" #include "UiConfig.h" -#include "BluetoothModel.h" +#include "bluetooth/include/BluetoothModel.h" #include "bluetooth/include/MainBluetoothView.h" -#include "CallerLogModel.h" +#include "callerlog/include/CallerLogModel.h" #include "custom_utils.h" #include "notification_manager.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothDeviceCaseListAdapter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothDeviceCaseListAdapter.cpp index 5478357ef..074d4c407 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothDeviceCaseListAdapter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothDeviceCaseListAdapter.cpp @@ -5,19 +5,19 @@ * Create: 2021-07-26 */ #include -#include "BluetoothDeviceCaseListAdapter.h" -#include "BluetoothOptionsView.h" +#include "bluetooth/include/BluetoothDeviceCaseListAdapter.h" +#include "bluetooth/include/BluetoothOptionsView.h" #include "gfx_utils/list.h" -#include "BluetoothModel.h" +#include "bluetooth/include/BluetoothModel.h" #include "wearable_log.h" #include "UiConfig.h" -#include "BluetoothPresenter.h" -#include "CallerLogModel.h" +#include "bluetooth/include/BluetoothPresenter.h" +#include "callerlog/include/CallerLogModel.h" #include "custom_utils.h" #include "notification_manager.h" #ifdef SUPPORT_PHONE_SERVICE -#include "PhoneAGService.h" +#include "phoneservice/include/PhoneAGService.h" #endif namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothDeviceListView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothDeviceListView.cpp index 428f9a46a..799128ac3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothDeviceListView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothDeviceListView.cpp @@ -4,12 +4,12 @@ * Author: * Create: 2021-10-13 */ -#include "BluetoothDeviceListView.h" +#include "bluetooth/include/BluetoothDeviceListView.h" #include "wearable_log.h" #include "UiConfig.h" -#include "PlayersPresenter.h" -#include "BluetoothPresenter.h" -#include "BluetoothModel.h" +#include "player/include/PlayersPresenter.h" +#include "bluetooth/include/BluetoothPresenter.h" +#include "bluetooth/include/BluetoothModel.h" #include "ui_resource_string.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothEarListView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothEarListView.cpp index 31bd0e828..e2137ac5e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothEarListView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothEarListView.cpp @@ -4,13 +4,13 @@ * Author: * Create: 2021-10-13 */ -#include "BluetoothModel.h" -#include "BluetoothEarListView.h" +#include "bluetooth/include/BluetoothModel.h" +#include "bluetooth/include/BluetoothEarListView.h" #include "wearable_log.h" #include "UiConfig.h" -#include "PlayersPresenter.h" -#include "BluetoothPresenter.h" -#include "SettingModel.h" +#include "player/include/PlayersPresenter.h" +#include "bluetooth/include/BluetoothPresenter.h" +#include "settings/include/SettingModel.h" #include "ui_resource_string.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp index 3d246fcd3..f274f2358 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp @@ -5,13 +5,13 @@ * Create: 2021-10-13 */ #include -#include "BluetoothEarPhoneView.h" +#include "bluetooth/include/BluetoothEarPhoneView.h" #include "wearable_log.h" #include "UiConfig.h" -#include "BluetoothPresenter.h" -#include "PlayersPresenter.h" -#include "BluetoothItemView.h" -#include "SettingModel.h" +#include "bluetooth/include/BluetoothPresenter.h" +#include "player/include/PlayersPresenter.h" +#include "bluetooth/include/BluetoothItemView.h" +#include "settings/include/SettingModel.h" #include "common/image_cache_manager.h" #include "graphic_service.h" #include "uicomponents/UIComponents.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp index 2b10bff3d..1d794dbb1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp @@ -5,10 +5,10 @@ * Create: 2022-3-22 */ -#include +#include "bluetooth/include/BluetoothHeadsetEvent.h" #include "bts_avrcp_target.h" #include "bts_avrcp_controller.h" -#include "PlayersModel.h" +#include "player/include/PlayersModel.h" #include "service_id_define.h" #include "graphic_service.h" #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp index a7a350c5c..1562b624e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothItemView.cpp @@ -5,18 +5,18 @@ * Create: 2021-10-13 */ -#include "BluetoothItemView.h" +#include "bluetooth/include/BluetoothItemView.h" #include "wearable_log.h" #include "UiConfig.h" #include "player/include/PlayersView.h" #include "ui_resource_image.h" #include "ui_resource_string.h" -#include "CallerLogModel.h" +#include "callerlog/include/CallerLogModel.h" #include "custom_utils.h" #include "notification_manager.h" #ifdef SUPPORT_PHONE_SERVICE -#include "PhoneAGService.h" +#include "phoneservice/include/PhoneAGService.h" #endif #include "ConfigModel.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp index 2bf729647..7fe7d4bb6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp @@ -5,15 +5,15 @@ * Create: 2021-10-13 */ #include -#include "BluetoothModel.h" -#include "BluetoothModelC.h" -#include "BluetoothWrapper.h" -#include "BluetoothPresenter.h" -#include "ConnectPhonePresenter.h" -#include "MusicPlayerSourceView.h" -#include "BluetoothItemView.h" -#include "PlayersModel.h" -#include "PhoneAudio.h" +#include "bluetooth/include/BluetoothModel.h" +#include "bluetooth/include/BluetoothModelC.h" +#include "bluetooth/include/BluetoothWrapper.h" +#include "bluetooth/include/BluetoothPresenter.h" +#include "connectnewphone/include/ConnectPhonePresenter.h" +#include "player/include/MusicPlayerSourceView.h" +#include "bluetooth/include/BluetoothItemView.h" +#include "player/include/PlayersModel.h" +#include "phoneservice/include/PhoneAudio.h" #include "graphic_service.h" #include "msg_center.h" #include "bts_def.h" @@ -41,7 +41,7 @@ #include "msg_center_protocol.h" #include "dfx_channel.h" #include "tcxo.h" -#include "ui_service.h" +#include "uiservice/include/ui_service.h" #include "network/network_listener.h" #include "font/ui_font_header.h" @@ -54,11 +54,12 @@ //#include "hfp_hf_service.h" #include "uiservice/include/ui_service.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #ifdef SUPPORT_OHOSFWK -#include "BluetoothWrapper.h" +#include "bluetooth/include/BluetoothWrapper.h" #endif -#include "Bluetooyhpabpserver.h" +#include "bluetooth/include/Bluetooyhpabpserver.h" +#include "bluetooth/include/BluetoothChangeBle.h" @@ -68,11 +69,11 @@ #include "ConfigModel.h" #ifdef SUPPORT_PHONE_SERVICE -#include "PhoneAGService.h" +#include "phoneservice/include/PhoneAGService.h" #endif #include "custom_save_runtime.h" -#include "BluetoothHeadsetEvent.h" +#include "bluetooth/include/BluetoothHeadsetEvent.h" namespace OHOS { @@ -1157,6 +1158,37 @@ void uapi_set_ACL_br_address(const bd_addr_t * bdAddr) memcpy(&ACL_bdAdd,bdAddr,sizeof(bd_addr_t)); } +void ChangeBleConnectToMax() +{ + if (msg_center_get_trans_channel() == DIAG_FRAME_FID_BT) { + gap_conn_param_update_t conn_param = { 0 }; + conn_param.conn_handle = BLUETOOTH_CONN_HANDLE; + conn_param.interval_min = BLUETOOTH_INTERVAL_TOMAX_MIN; + conn_param.interval_max = BLUETOOTH_INTERVAL_TOMAX_MAX; + conn_param.slave_latency = BLUETOOTH_LATENCY; + conn_param.timeout_multiplier = BLUETOOTH_TIMEOUT_MUTIPLIER; + errcode_t ret = gap_ble_connect_param_update(&conn_param); + WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "BleConnectCallback change to max interval ret:%d : latency-min:%u latency-max:%u\n", + ret, conn_param.interval_min, conn_param.interval_max); + } +} + +void ChangeBleConnectToDefault() +{ + if (msg_center_get_trans_channel() == DIAG_FRAME_FID_BT) { + gap_conn_param_update_t conn_param = { 0 }; + conn_param.conn_handle = BLUETOOTH_CONN_HANDLE; + conn_param.interval_min = BLUETOOTH_INTERVAL_TODEFAULT_MIN; + conn_param.interval_max = BLUETOOTH_INTERVAL_TODEFAULT_MAX; + conn_param.slave_latency = BLUETOOTH_LATENCY; + conn_param.timeout_multiplier = BLUETOOTH_TIMEOUT_MUTIPLIER; + errcode_t ret = gap_ble_connect_param_update(&conn_param); + WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "BleConnectCallback change to default interval ret:%d : latency-min:%u latency-max:%u\n", + ret, conn_param.interval_min, conn_param.interval_max); + } +} + + // 回调:ACL连接状态上报 void GapAclStateChangedCallback(const bd_addr_t *bdAddr, gap_acl_state_t state, unsigned int reason) { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothPresenter.cpp index 2d6e3229e..aa6bc5fca 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothPresenter.cpp @@ -7,11 +7,11 @@ #include "wearable_log.h" #include "UiConfig.h" -#include "BluetoothPresenter.h" -#include "BluetoothReconnectView.h" -#include "MainBluetoothView.h" +#include "bluetooth/include/BluetoothPresenter.h" +#include "bluetooth/include/BluetoothReconnectView.h" +#include "bluetooth/include/MainBluetoothView.h" #include "UiConfig.h" -#include "BluetoothModel.h" +#include "bluetooth/include/BluetoothModel.h" #include "custom_utils.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothReconnectView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothReconnectView.cpp index 4aa486fba..acf3114b6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothReconnectView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothReconnectView.cpp @@ -4,17 +4,17 @@ * Create: 2021-10-13 */ -#include "BluetoothReconnectView.h" -#include "BluetoothModel.h" +#include "bluetooth/include/BluetoothReconnectView.h" +#include "bluetooth/include/BluetoothModel.h" #include "wearable_log.h" #include "UiConfig.h" -#include "PlayersPresenter.h" -#include "BluetoothPresenter.h" +#include "player/include/PlayersPresenter.h" +#include "bluetooth/include/BluetoothPresenter.h" #include "common/image_cache_manager.h" #include "uicomponents/UIComponents.h" #include #include "graphic_service.h" -#include +#include "uiservice/include/ui_service.h" namespace OHOS { static BluetoothReconnectView *g_pBluetoothReconnectView{nullptr}; #define BLUETOOTH_IMAGE_X 183 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothWrapper.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothWrapper.cpp index eaaafecca..2274cba20 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothWrapper.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothWrapper.cpp @@ -6,7 +6,7 @@ */ #include -#include "BluetoothWrapper.h" +#include "bluetooth/include/BluetoothWrapper.h" #ifdef __cplusplus extern "C" { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/Bluetooyhpabpserver.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/Bluetooyhpabpserver.cpp index b09d34de4..35aa8a7b6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/Bluetooyhpabpserver.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/Bluetooyhpabpserver.cpp @@ -3,7 +3,7 @@ * Description: This module include test function of BT PBAP Service module. */ -#include "Bluetooyhpabpserver.h" +#include "bluetooth/include/Bluetooyhpabpserver.h" #include #include #include "securec.h" @@ -25,8 +25,8 @@ #include #include "bleService.h" #endif -#include "BluetoothModel.h" -#include "CallerLogModel.h" +#include "bluetooth/include/BluetoothModel.h" +#include "callerlog/include/CallerLogModel.h" #ifdef __cplusplus extern "C" { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/MainBluetoothView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/MainBluetoothView.cpp index bab8aed35..1d2a1ce66 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/MainBluetoothView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/MainBluetoothView.cpp @@ -4,8 +4,8 @@ * Author: * Create: 2021-10-13 */ -#include "MainBluetoothView.h" -#include "BluetoothModel.h" +#include "bluetooth/include/MainBluetoothView.h" +#include "bluetooth/include/BluetoothModel.h" #include "wearable_log.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/TipsConnFailMessageView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/TipsConnFailMessageView.cpp index 78a9d0752..10f363d7a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/TipsConnFailMessageView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/TipsConnFailMessageView.cpp @@ -4,12 +4,12 @@ * Author: * Create: 2021-10-13 */ -#include "TipsConnFailMessageView.h" -#include "BluetoothModel.h" +#include "bluetooth/include/TipsConnFailMessageView.h" +#include "bluetooth/include/BluetoothModel.h" #include "wearable_log.h" #include "UiConfig.h" -#include "PlayersPresenter.h" -#include "BluetoothPresenter.h" +#include "player/include/PlayersPresenter.h" +#include "bluetooth/include/BluetoothPresenter.h" #include "ui_resource_string.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/TipsFailMessageView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/TipsFailMessageView.cpp index c8bd18943..6e037d100 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/TipsFailMessageView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/TipsFailMessageView.cpp @@ -4,8 +4,8 @@ * Author: * Create: 2021-10-13 */ -#include "TipsFailMessageView.h" -#include "BluetoothModel.h" +#include "bluetooth/include/TipsFailMessageView.h" +#include "bluetooth/include/BluetoothModel.h" #include "wearable_log.h" #include "UiConfig.h" #include "player/include/PlayersPresenter.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/TipsSuccMessageView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/TipsSuccMessageView.cpp index 89fb0151a..161fc0460 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/TipsSuccMessageView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/TipsSuccMessageView.cpp @@ -4,12 +4,12 @@ * Author: * Create: 2021-10-13 */ -#include "TipsSuccMessageView.h" -#include "BluetoothModel.h" +#include "bluetooth/include/TipsSuccMessageView.h" +#include "bluetooth/include/BluetoothModel.h" #include "wearable_log.h" #include "UiConfig.h" -#include "PlayersPresenter.h" -#include "BluetoothPresenter.h" +#include "player/include/PlayersPresenter.h" +#include "bluetooth/include/BluetoothPresenter.h" #include "ui_resource_string.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/include/BrightnessLevelPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/include/BrightnessLevelPresenter.h index bec93170d..cad4f33f5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/include/BrightnessLevelPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/include/BrightnessLevelPresenter.h @@ -9,6 +9,7 @@ #ifndef BRIGHTNESS_LEVEL_PRESENTER_H #define BRIGHTNESS_LEVEL_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "brightnesslevel/include/BrightnessLevelView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/include/CalculatorModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/include/CalculatorModel.h index 9412c3319..ab603f7ef 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/include/CalculatorModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/include/CalculatorModel.h @@ -9,10 +9,10 @@ #include "los_mux.h" #include "string" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" -#include"ui_resource_string.h" +#include "ui_resource_string.h" #include "message.h" #include "msg_center.h" #include "stack" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/include/CalculatorPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/include/CalculatorPresenter.h index 709f5444b..5cb691954 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/include/CalculatorPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/include/CalculatorPresenter.h @@ -8,9 +8,10 @@ #ifndef CALCULATOR_PRESENTER_H #define CALCULATOR_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "ohos_types.h" -#include "CallerLogModel.h" +#include "callerlog/include/CallerLogModel.h" #include "cmsis_os.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/include/CalculatorView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/include/CalculatorView.h index 27dc9dad6..89c96faee 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/include/CalculatorView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/include/CalculatorView.h @@ -22,7 +22,7 @@ #include "components/abstract_adapter.h" #include "components/ui_image_view.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #include "vector.h" #include "ChangeSliceListener.h" #include "cmsis_os2.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorModel.cpp index c2a67bd91..6a13c3298 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorModel.cpp @@ -4,7 +4,7 @@ * Author: * Create: 2021-10-12 */ -#include "DialingScreenView.h" +#include "makephone/include/DialingScreenView.h" #include "service_id_define.h" #include "cmsis_os.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorView.cpp index 1e89cf6d3..7b2cacdf4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calculator/src/CalculatorView.cpp @@ -12,6 +12,7 @@ #include #include #include +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/include/CalendarModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/include/CalendarModel.h index 144c82076..44faf6f37 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/include/CalendarModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/include/CalendarModel.h @@ -9,10 +9,10 @@ #include "los_mux.h" #include "string" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" -#include"ui_resource_string.h" +#include "ui_resource_string.h" #include "message.h" #include "msg_center.h" #include "stack" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/include/CalendarPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/include/CalendarPresenter.h index 4bb7c0393..96dd61122 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/include/CalendarPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/include/CalendarPresenter.h @@ -8,6 +8,7 @@ #ifndef CALENDAR_PRESENTER_H #define CALENDAR_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "ohos_types.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarModel.cpp index f06596375..c6465d27f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/calendar/src/CalendarModel.cpp @@ -4,8 +4,7 @@ * Author: * Create: 2021-10-12 */ -#include "DialingScreenView.h" - +#include "makephone/include/DialingScreenView.h" #include "service_id_define.h" #include "cmsis_os.h" #include "samgr_lite.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerItemView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerItemView.h index d61864211..350966595 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerItemView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerItemView.h @@ -14,9 +14,9 @@ #include "components/ui_image_view.h" #include "components/ui_label_button.h" -#include "CallerLogModel.h" +#include "callerlog/include/CallerLogModel.h" #include "UiConfig.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerLogModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerLogModel.h index 6aa7511e0..e53372084 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerLogModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerLogModel.h @@ -9,10 +9,10 @@ #include "los_mux.h" #include "string" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" -#include"ui_resource_string.h" +#include "ui_resource_string.h" #include "message.h" #include "msg_center.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerLogPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerLogPresenter.h index dc049dc78..fc623681c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerLogPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerLogPresenter.h @@ -8,9 +8,10 @@ #ifndef CALLER_LOG_PRESENTER_H #define CALLER_LOG_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "ohos_types.h" -#include "CallerLogModel.h" +#include "callerlog/include/CallerLogModel.h" #include "cmsis_os.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerLogView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerLogView.h index 5fda17fea..6651c00ca 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerLogView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/include/CallerLogView.h @@ -9,8 +9,8 @@ #define CALLER_LOG_VIEW_H #include "View.h" -#include "CallerLogPresenter.h" -#include "CallerItemView.h" +#include "callerlog/include/CallerLogPresenter.h" +#include "callerlog/include/CallerItemView.h" #include "components/ui_view_group.h" #include "components/ui_image_animator.h" @@ -20,7 +20,7 @@ #include "components/ui_label_button.h" #include "components/ui_list.h" #include "components/abstract_adapter.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #include "vector.h" #include "ChangeSliceListener.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerItemView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerItemView.cpp index c63f1851c..715f26327 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerItemView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerItemView.cpp @@ -5,8 +5,8 @@ * Create: 2021-10-12 */ -#include "CallerItemView.h" -#include "CallerLogPresenter.h" +#include "callerlog/include/CallerItemView.h" +#include "callerlog/include/CallerLogPresenter.h" #include "wearable_log.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogModel.cpp index 7a6e49156..2774077a4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogModel.cpp @@ -4,15 +4,15 @@ * Author: * Create: 2021-10-12 */ -#include "CallerLogModel.h" -#include "CallerLogView.h" -#include "DialingScreenView.h" -#include "CallingView.h" +#include "callerlog/include/CallerLogModel.h" +#include "callerlog/include/CallerLogView.h" +#include "makephone/include/DialingScreenView.h" +#include "makephone/include/CallingView.h" #include "service_id_define.h" #include "cmsis_os.h" #include "samgr_lite.h" -#include "MainCallingPresenter.h" -#include "PlayersModel.h" +#include "makephone/include/MainCallingPresenter.h" +#include "player/include/PlayersModel.h" #include "graphic_service.h" #include "notification_manager.h" #include "osal_timer.h" @@ -21,7 +21,7 @@ #include "ConfigModel.h" #include "vibrator_service.h" #include "custom_runtime.h" -#include "MainCallingView.h" +#include "makephone/include/MainCallingView.h" #ifdef FD230_650 #include "dial_sos_c.h" @@ -31,10 +31,10 @@ #include "cat1_ctl.h" #include "cat1_server.h" #endif -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #ifdef SUPPORT_PHONE_SERVICE -#include "PhoneAGService.h" +#include "phoneservice/include/PhoneAGService.h" #endif #include "custom_save_runtime.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogPresenter.cpp index 615054487..2d5e67daf 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogPresenter.cpp @@ -5,11 +5,11 @@ * Create: 2021-10-12 */ -#include "CallerLogPresenter.h" -#include "CallerLogView.h" +#include "callerlog/include/CallerLogPresenter.h" +#include "callerlog/include/CallerLogView.h" #include "common/task_manager.h" #include "wearable_log.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #include "NativeRegisterManager.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogView.cpp index c6a04aea0..bc0d0a1c7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/callerlog/src/CallerLogView.cpp @@ -5,9 +5,9 @@ * Create: 2021-10-12 */ -#include "CallerLogView.h" -#include "CallerLogPresenter.h" -#include "CallerLogModel.h" +#include "callerlog/include/CallerLogView.h" +#include "callerlog/include/CallerLogPresenter.h" +#include "callerlog/include/CallerLogModel.h" #include "wearable_log.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/include/BluetoothServiceOptionsPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/include/BluetoothServiceOptionsPresenter.h index 36134ba16..a71db9eea 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/include/BluetoothServiceOptionsPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/include/BluetoothServiceOptionsPresenter.h @@ -8,6 +8,7 @@ #ifndef BLUETOOTH_SERVICE_OPTIONS_PRESENTER_H #define BLUETOOTH_SERVICE_OPTIONS_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/include/ClassicBlueToothPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/include/ClassicBlueToothPresenter.h index 0404af427..067c19280 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/include/ClassicBlueToothPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/include/ClassicBlueToothPresenter.h @@ -7,6 +7,7 @@ */ #ifndef CLASSIC_BLUETOOTH_PRESENTER_H #define CLASSIC_BLUETOOTH_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "classicbluetooth/include/ClassicBlueToothView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp index 0600416ff..ac6421486 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp @@ -9,8 +9,8 @@ #include "map" #include "classicbluetooth/include/BluetoothServiceOptionsPresenter.h" #include "classicbluetooth/include/BluetoothServiceOptionsView.h" -#include "BluetoothModel.h" -#include "PhoneService.h" +#include "bluetooth/include/BluetoothModel.h" +#include "phoneservice/include/PhoneService.h" #include "bts_le_gap.h" #include "NativeRegisterManager.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp index d28a10a96..5589340db 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp @@ -5,8 +5,8 @@ #include "wearable_log.h" #include "phoneservice/include/PhoneService.h" - -#include "BluetoothModel.h" +#include "common/screen.h" +#include "bluetooth/include/BluetoothModel.h" #include "ui_resource_string.h" #include "cmsis_os2.h" #include "graphic_service.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp index 0f6487c4b..ba0db4bcf 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp @@ -15,10 +15,10 @@ #include "wearable_log.h" #include "ConfigModel.h" #include -#include "BluetoothModel.h" +#include "bluetooth/include/BluetoothModel.h" #include "custom_runtime.h" #include "ConfigModelC.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #include "NativeRegisterManager.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp index 90f492c19..d6d21609c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp @@ -3,6 +3,7 @@ #include "ConfigModel.h" #include "UiConfig.h" #include "ui_resource_string.h" +#include "common/screen.h" namespace OHOS { static ClassicBlueToothView *g_pClassicBlueToothView{nullptr}; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/include/AmbientClockView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/include/AmbientClockView.h index 44e9f36cc..85c01e090 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/include/AmbientClockView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/include/AmbientClockView.h @@ -21,8 +21,8 @@ #include "font/ui_font_bitmap.h" #include "font/ui_font.h" #include "graphic_config.h" -#include "HealthModel.h" -#include "ActivityModel.h" +#include "main/include/HealthModel.h" +#include "activity/include/ActivityModel.h" #include "UiConfig.h" #include "components/ui_card_page.h" #include "animator/animator_manager.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/include/MainClockView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/include/MainClockView.h index 5567c4f20..9ce7d1383 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/include/MainClockView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/include/MainClockView.h @@ -32,7 +32,7 @@ #include "font/ui_font.h" #include "graphic_config.h" #include "HealthModel.h" - #include "ActivityModel.h" + #include "activity/include/ActivityModel.h" #include "UiConfig.h" #include "components/ui_card_page.h" #include "animator/animator_manager.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/AmbientClockView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/AmbientClockView.cpp index 5ede0bcc6..3d48b9228 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/AmbientClockView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/AmbientClockView.cpp @@ -5,8 +5,8 @@ * Create: 2024-10-30 */ -#include "AmbientClockView.h" -#include "MainPresenterSample.h" +#include "clock/include/AmbientClockView.h" +#include "main/include/MainPresenterSample.h" #include "components/ui_label.h" #include "wearable_log.h" #include "ui_resource_image.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp index 140458bb1..f361413e7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/clock/src/MainClockView.cpp @@ -11,17 +11,17 @@ * Create: 2021-08-14 */ - #include "MainClockView.h" - #include "MainModel.h" - #include "MainPresenterSample.h" - #include "SetDialModel.h" - #include "battery_hal.h" - #include "common/image_cache_manager.h" - #include "components/ui_label.h" - #include "custom_runtime.h" +#include "clock/include/MainClockView.h" +#include "main/include/MainModel.h" +#include "main/include/MainPresenterSample.h" +#include "set_dial/include/SetDialModel.h" +#include "battery_hal.h" +#include "common/image_cache_manager.h" +#include "components/ui_label.h" +#include "custom_runtime.h" - #include "main/include/PullUpDownView.h" - #include "message/include/MessageControlView.h" +#include "main/include/PullUpDownView.h" +#include "message/include/MessageControlView.h" #include "uicomponents/UIComponents.h" #include "ui_resource_image.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/include/CodedLockPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/include/CodedLockPresenter.h index 1d37d8abe..f3d9bb776 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/include/CodedLockPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/include/CodedLockPresenter.h @@ -2,6 +2,7 @@ #ifndef _CodedLock_PRESENTER_H #define _CodedLock_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "codedlock/include/CodedLockPresenter.h" #include "codedlock/include/CodedLockView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/src/CodedLockModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/src/CodedLockModel.cpp index c10f09db3..5f3f43cdb 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/src/CodedLockModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/src/CodedLockModel.cpp @@ -1,5 +1,5 @@ #include "codedlock/include/CodedLockModel.h" -#include "MainViewSample.h" +#include "main/include/MainViewSample.h" #include "codedlock/include/CodedLockView.h" #include #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/src/CodedLockPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/src/CodedLockPresenter.cpp index 4faba3a60..ce75982d0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/src/CodedLockPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/src/CodedLockPresenter.cpp @@ -9,14 +9,14 @@ #include "components/ui_label_ext.h" #include "ui_resource_string.h" #include "NativeAbility.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" -#include "ui_service.h" +#include "uiservice/include/ui_service.h" #include "codedlock/include/CodedLockPresenter.h" #include "codedlock/include/CodedLockModel.h" -#include "MainModel.h" +#include "main/include/MainModel.h" #include "string.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/src/CodedLockView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/src/CodedLockView.cpp index d8cffeeeb..a846483e1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/src/CodedLockView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/codedlock/src/CodedLockView.cpp @@ -16,6 +16,7 @@ #include "ui_resource_image.h" #include "ui_resource_string.h" #include "uicomponents/UIComponents.h" +#include "vector" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/CompassControlView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/CompassControlView.h index 9c776e9be..e286500e9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/CompassControlView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/CompassControlView.h @@ -11,8 +11,8 @@ #include "components/root_view.h" #include "UiConfig.h" #include "components/ui_card_page.h" -#include "CompassCalibrationView.h" -#include "CompassView.h" +#include "compass/include/CompassCalibrationView.h" +#include "compass/include/CompassView.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/CompassPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/CompassPresenter.h index 16a46417a..771fae462 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/CompassPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/CompassPresenter.h @@ -7,6 +7,7 @@ #ifndef COMPASS_PRESENTER_H #define COMPASS_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "components/ui_view.h" #include "components/ui_image_view.h" @@ -14,8 +15,8 @@ #include "UiConfig.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" -#include"ui_resource_string.h" -#include "CompassView.h" +#include "ui_resource_string.h" +#include "compass/include/CompassView.h" namespace OHOS { typedef struct { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/CompassView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/CompassView.h index a139a2523..fdf3fbfa8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/CompassView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/CompassView.h @@ -16,7 +16,7 @@ #include "ChangeSliceListener.h" #include "UiConfig.h" #include "AppGroupView.h" -#include "CompassCalibrationView.h" +#include "compass/include/CompassCalibrationView.h" namespace OHOS { static constexpr float VIEW_CENTERS = 233;/*233代表分辨率为466的屏幕*/ diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/MainCompassPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/MainCompassPresenter.h index 0a4b2d4a3..227f97db1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/MainCompassPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/include/MainCompassPresenter.h @@ -8,16 +8,17 @@ #ifndef COMPASS_MAINPRESENTER_H #define COMPASS_MAINPRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" -#include "ModelListenerSample.h" +#include "main/include/ModelListenerSample.h" #include "ohos_types.h" #include "UiConfig.h" #include "AppViewIDs.h" -#include "MainCompassView.h" -#include "CompassPresenter.h" -#include "CompassModel.h" -#include "CompassCalibrationView.h" -#include "KeyInputListener.h" +#include "compass/include/MainCompassView.h" +#include "compass/include/CompassPresenter.h" +#include "compass/include/CompassModel.h" +#include "compass/include/CompassCalibrationView.h" +#include "key/include/KeyInputListener.h" #include "components/ui_label_ext.h" #include "ui_resource_string.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/src/CompassCalibrationView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/src/CompassCalibrationView.cpp index 248fe4fdc..2bb3ac459 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/src/CompassCalibrationView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/compass/src/CompassCalibrationView.cpp @@ -7,7 +7,7 @@ #include "UiConfig.h" #include "wearable_log.h" #include "compass/include/CompassCalibrationView.h" -#include "CompassModel.h" +#include "compass/include/CompassModel.h" #include "ui_resource_string.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/include/ConnectPhonePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/include/ConnectPhonePresenter.h index 2bb8fe69c..2167c081c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/include/ConnectPhonePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/include/ConnectPhonePresenter.h @@ -7,8 +7,9 @@ #ifndef CONNECT_PHONE_PRESENTER_H #define CONNECT_PHONE_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" -#include "ConnectOpenView.h" +#include "connectnewphone/include/ConnectOpenView.h" #include "NativeLauncher.h" #include "NativeAbility.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/include/ConnectPhoneView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/include/ConnectPhoneView.h index d74226c55..834ad8e06 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/include/ConnectPhoneView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/include/ConnectPhoneView.h @@ -8,7 +8,7 @@ #define CONNECT_PHONE_VIEW_H #include "View.h" -#include "ConnectPhonePresenter.h" +#include "connectnewphone/include/ConnectPhonePresenter.h" #include "ConnectSelectView.h" #include "AppGroupView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/include/ConnectSelectView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/include/ConnectSelectView.h index 48d9695b5..263be0e03 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/include/ConnectSelectView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/include/ConnectSelectView.h @@ -8,7 +8,7 @@ #define CONNECT_SELECT_VIEW_H #include "View.h" -#include "ConnectPhonePresenter.h" +#include "connectnewphone/include/ConnectPhonePresenter.h" #include "components/ui_label.h" #include "components/ui_button.h" #include "components/ui_view_group.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectOpenView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectOpenView.cpp index ac8fee5af..23e80b29f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectOpenView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectOpenView.cpp @@ -3,11 +3,12 @@ * Description: ConnectOpen View * Create: 2022-03-22 */ -#include "ConnectOpenView.h" +#include "connectnewphone/include/ConnectOpenView.h" #include "wearable_log.h" #include "UiConfig.h" -#include "ConnectPhonePresenter.h" -#include "BluetoothModel.h" +#include "connectnewphone/include/ConnectPhonePresenter.h" +#include "bluetooth/include/BluetoothModel.h" +#include "PageTransitionMgr.h" namespace OHOS { static ConnectOpenView *g_pConnectOpenView{nullptr}; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectPhonePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectPhonePresenter.cpp index 7af848df4..8d228da67 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectPhonePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectPhonePresenter.cpp @@ -4,13 +4,13 @@ * Create: 2022-01-19 */ -#include "ConnectPhonePresenter.h" -#include "ConnectPhoneView.h" +#include "connectnewphone/include/ConnectPhonePresenter.h" +#include "connectnewphone/include/ConnectPhoneView.h" #include "drag_event.h" #include "cmsis_os.h" #include "UiConfig.h" #include "wearable_log.h" -#include "ui_service.h" +#include "uiservice/include/ui_service.h" #include "NativeRegisterManager.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectPhoneView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectPhoneView.cpp index 5e9c6b58c..943b546ac 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectPhoneView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectPhoneView.cpp @@ -4,7 +4,7 @@ * Create: 2022-01-19 */ -#include "ConnectPhoneView.h" +#include "connectnewphone/include/ConnectPhoneView.h" #include "components/ui_label.h" #include "wearable_log.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectSelectView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectSelectView.cpp index 3a4196111..0723cdb02 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectSelectView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/connectnewphone/src/ConnectSelectView.cpp @@ -3,10 +3,11 @@ * Description: ConnectSelect View * Create: 2022-03-22 */ -#include "ConnectSelectView.h" +#include "connectnewphone/include/ConnectSelectView.h" #include "wearable_log.h" #include "UiConfig.h" -#include "ConnectPhonePresenter.h" +#include "connectnewphone/include/ConnectPhonePresenter.h" +#include "PageTransitionMgr.h" namespace OHOS { static ConnectSelectView *g_pConnectSelectView{nullptr}; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/include/MainCountDownPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/include/MainCountDownPresenter.h index e16f7feef..226a9c03d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/include/MainCountDownPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/countdown/include/MainCountDownPresenter.h @@ -9,6 +9,7 @@ #define MAIN_COUNTDOWN_PRESENTER_H #include "View.h" +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "MainCountDownView.h" #include "ui_resource_string.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/include/DisplayBrightnessPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/include/DisplayBrightnessPresenter.h index bf14d29b3..c454b00c8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/include/DisplayBrightnessPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/include/DisplayBrightnessPresenter.h @@ -9,6 +9,7 @@ #define _DISPLAY_BRIGHTNESS_PRESENTER_H /*显示与亮度*/ +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "DisplayBrightnessView.h" #include "components/ui_slider.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/BrightnessControlView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/BrightnessControlView.cpp index 4cf3adebe..ba4309526 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/BrightnessControlView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/BrightnessControlView.cpp @@ -7,6 +7,7 @@ #include "map" #include "iostream" #include "vibrator_service.h" +#include "common/screen.h" namespace OHOS { static BrightnessControlView *g_pBrightnessControlView{nullptr}; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessView.cpp index 658ecbb56..ea28a166a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessView.cpp @@ -6,6 +6,7 @@ #include "ui_resource_string.h" #include #include "custom_runtime.h" +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/ScreenDurationView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/ScreenDurationView.cpp index 3507fc935..c10ca7636 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/ScreenDurationView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/ScreenDurationView.cpp @@ -4,6 +4,7 @@ #include "wearable_log.h" #include "ui_resource_string.h" #include +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/include/DnotDisturbPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/include/DnotDisturbPresenter.h index ca7b7bf7a..3579df86e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/include/DnotDisturbPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/include/DnotDisturbPresenter.h @@ -9,6 +9,7 @@ #ifndef DNOTDISTURB_PRESENTER_H #define DNOTDISTURB_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbModel.cpp index ed646eaca..c033891d4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/dnotdisturb/src/DnotDisturbModel.cpp @@ -7,7 +7,7 @@ */ #include "dnotdisturb/include/DnotDisturbModel.h" #include "main/include/MainViewSample.h" -#include "MainModel.h" +#include "main/include/MainModel.h" #include "ConfigModel.h" #include "custom_runtime.h" #include "main/include/dropdown/DropDownCardPage1.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/include/FindPhonePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/include/FindPhonePresenter.h index 8983da0ca..f08dc563a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/include/FindPhonePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/findphone/include/FindPhonePresenter.h @@ -9,6 +9,7 @@ #ifndef FIND_PHONE_PRESENTER_H #define FIND_PHONE_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/include/FlashlightPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/include/FlashlightPresenter.h index 8508e214e..e8ee476d9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/include/FlashlightPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/include/FlashlightPresenter.h @@ -9,6 +9,7 @@ #ifndef FLASHLIGHT_PRESENTER_H #define FLASHLIGHT_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "flashlight/include/FlashlightView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/include/FlashlightView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/include/FlashlightView.h index cd0b39b96..03c3c4a1c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/include/FlashlightView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/flashlight/include/FlashlightView.h @@ -19,6 +19,7 @@ #include "components/ui_label_button_ext.h" #include "components/ui_label_ext.h" #include "components/ui_radio_button.h" +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/include/Maingoalpresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/include/Maingoalpresenter.h index 1a4c3a806..3de088561 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/include/Maingoalpresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/include/Maingoalpresenter.h @@ -8,6 +8,7 @@ #ifndef MAIN_GOAL_PRESENTER_H #define MAIN_GOAL_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "Maingoalview.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/goalmodel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/goalmodel.cpp index 91fc92c0b..af8d178cc 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/goalmodel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/goalmodel.cpp @@ -8,7 +8,7 @@ #include "goal/include/goalmodel.h" #include "goal/include/Maingoalview.h" -#include "ActivityModel.h" +#include "activity/include/ActivityModel.h" #include "ConfigModel.h" // #include "cywee_hal.h" // #include "goal_notification.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/BloodCardView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/BloodCardView.cpp index c14293ecc..a1f2388c3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/BloodCardView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/BloodCardView.cpp @@ -5,14 +5,14 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" -#include "MainViewSample.h" +#include "main/include/MainViewSample.h" #include "components/ui_view_group.h" -#include "DialModelSPO2.h" -#include "DialModelHeartRate.h" +#include "main/include/dial/DialModelSPO2.h" +#include "main/include/dial/DialModelHeartRate.h" #include "UiConfig.h" #include "uicomponents/UIComponents.h" -#include "MainPresenterSample.h" +#include "main/include/MainPresenterSample.h" #include "bloodoxygen/include/BloodResultPresenter.h" #include "bloodoxygen/include/BloodOxygenModel.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.cpp index 63c1caed5..41359c672 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.cpp @@ -13,7 +13,7 @@ #include "health/CheckAbnormalPresenter.h" #include "common/task_manager.h" -#include "BloodOxygenModel.h" +#include "bloodoxygen/include/BloodOxygenModel.h" #include "bloodoxygen/include/BloodDetectionView.h" #include "health/CheckAbnormalView.h" @@ -50,7 +50,7 @@ #include "cywee_service.h" #endif -#include "MainModel.h" +#include "main/include/MainModel.h" #include "health/health_service/health_service.h" #include "battery_hal.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.h index 19a57588d..c3fb32bfb 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalPresenter.h @@ -8,11 +8,12 @@ #ifndef CHECK_ABNORMAL_PRESENTER_H #define CHECK_ABNORMAL_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "ModelListenerSample.h" #include "components/ui_circle_progress.h" #include "ohos_types.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "common/key_code.h" #include "health/CheckAbnormalView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalView.cpp index c90712767..497277512 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckAbnormalView.cpp @@ -9,15 +9,15 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" -#include "MainViewSample.h" +#include "main/include/MainViewSample.h" #include "components/ui_view_group.h" -#include "DialModelSPO2.h" -#include "DialModelHeartRate.h" -#include "BloodOxygenModel.h" +#include "main/include/dial/DialModelSPO2.h" +#include "main/include/dial/DialModelHeartRate.h" +#include "bloodoxygen/include/BloodOxygenModel.h" #include "UiConfig.h" #include "uicomponents/UIComponents.h" -#include "MainPresenterSample.h" +#include "main/include/MainPresenterSample.h" #include "health/CheckAbnormalPresenter.h" #include "health/CheckAbnormalView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidPresenter.cpp index cb1536123..848d6bdd1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidPresenter.cpp @@ -13,7 +13,7 @@ #include "health/CheckInvalidPresenter.h" #include "common/task_manager.h" -#include "BloodOxygenModel.h" +#include "bloodoxygen/include/BloodOxygenModel.h" #include "bloodoxygen/include/BloodDetectionView.h" #include "health/CheckInvalidView.h" @@ -50,7 +50,7 @@ #include "cywee_service.h" #endif -#include "MainModel.h" +#include "main/include/MainModel.h" #include "NativeRegisterManager.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidPresenter.h index b3a5f35ba..f8916ce9d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidPresenter.h @@ -8,11 +8,12 @@ #ifndef CHECK_Invalid_PRESENTER_H #define CHECK_Invalid_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "ModelListenerSample.h" #include "components/ui_circle_progress.h" #include "ohos_types.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "common/key_code.h" #include "health/CheckInvalidView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidView.cpp index 51a37cbd6..4fc464f3d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/health/CheckInvalidView.cpp @@ -15,15 +15,15 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" -#include "MainViewSample.h" +#include "main/include/MainViewSample.h" #include "components/ui_view_group.h" -#include "DialModelSPO2.h" -#include "DialModelHeartRate.h" -#include "BloodOxygenModel.h" +#include "main/include/dial/DialModelSPO2.h" +#include "main/include/dial/DialModelHeartRate.h" +#include "bloodoxygen/include/BloodOxygenModel.h" #include "UiConfig.h" #include "uicomponents/UIComponents.h" -#include "MainPresenterSample.h" +#include "main/include/MainPresenterSample.h" #include "health/CheckInvalidPresenter.h" #include "health/CheckInvalidView.h" @@ -33,7 +33,7 @@ #include "vibrator_service.h" #include "custom_runtime.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartChartPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartChartPresenter.h index 876166b71..01fb7916c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartChartPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartChartPresenter.h @@ -8,10 +8,11 @@ #ifndef HEART_Chart_PRESENTER_H #define HEART_Chart_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "components/ui_list.h" #include "components/ui_view.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "ModelListenerSample.h" #include "heartrate/include/HeartChartView.h" #include "power_display_service.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartDetectionPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartDetectionPresenter.h index 8c7ec9318..4bd86cfad 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartDetectionPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartDetectionPresenter.h @@ -8,11 +8,12 @@ #ifndef HEART_DETECTION_PRESENTER_H #define HEART_DETECTION_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "components/ui_list.h" #include "components/ui_view.h" -#include "KeyInputListener.h" -#include "ModelListenerSample.h" +#include "key/include/KeyInputListener.h" +#include "main/include/ModelListenerSample.h" #include "heartrate/include/HeartDetectionView.h" #include "power_display_service.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartRateView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartRateView.h index 8117440d2..fe78b262c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartRateView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartRateView.h @@ -15,7 +15,7 @@ #include "wearable_log.h" #include "ohos_types.h" #include "components/ui_card_page.h" -#include "HeartModel.h" +#include "heartrate/include/HeartModel.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartResultPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartResultPresenter.h index a6d87c58b..3203bc22c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartResultPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/include/HeartResultPresenter.h @@ -9,11 +9,12 @@ #ifndef HEART_RESULT_PRESENTER_H #define HEART_RESULT_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "ModelListenerSample.h" #include "components/ui_circle_progress.h" #include "ohos_types.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "common/key_code.h" #include "battery_hal.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartPresenter.cpp index f60a66a7b..293959d92 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartChartPresenter.cpp @@ -17,13 +17,13 @@ #include "AppViewIDs.h" #include "NativeAbility.h" #include "common/key_code.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" // #include "displaybrightness/include/DisplayBrightnessModel.h" #include "heartrate/include/HeartModel.h" -#include "MainModel.h" +#include "main/include/MainModel.h" #include "gfx_utils/mem_check.h" #include "NativeRegisterManager.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 013cfd982..7fe8251cd 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 @@ -12,8 +12,8 @@ * @FilePath: * /FD230/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartView.cpp */ -#include "HeartChartView.h" -#include "HeartModel.h" +#include "heartrate/include/HeartChartView.h" +#include "heartrate/include/HeartModel.h" #include "UiConfig.h" #include "health/health_service/health_service.h" #include "power_display_service.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionPresenter.cpp index 7d47169ce..b403e7820 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionPresenter.cpp @@ -11,13 +11,13 @@ #include "AppViewIDs.h" #include "NativeAbility.h" #include "common/key_code.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" // #include "displaybrightness/include/DisplayBrightnessModel.h" #include "heartrate/include/HeartModel.h" -#include "MainModel.h" +#include "main/include/MainModel.h" #include "NativeRegisterManager.h" #include namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionView.cpp index 935818d7d..a43d6f608 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartDetectionView.cpp @@ -6,10 +6,9 @@ */ #include "UiConfig.h" #include "wearable_log.h" -#include "HeartDetectionView.h" -#include "HeartModel.h" +#include "heartrate/include/HeartDetectionView.h" +#include "heartrate/include/HeartModel.h" #include "ui_image_animator.h" -#include "HeartDetectionView.h" #include "ui_resource_string.h" #include "power_display_service.h" #include "uicomponents/UIComponents.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 fbc80a6fc..2d84d7991 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 @@ -1,18 +1,18 @@ #include "heartrate/include/HeartModel.h" -#include "IndoorWalkPreparedView.h" -#include "IndoorWalkPresenter.h" -#include "MainViewSample.h" +#include "indoorwalk/include/IndoorWalkPreparedView.h" +#include "indoorwalk/include/IndoorWalkPresenter.h" +#include "main/include/MainViewSample.h" #include "graphic_service.h" #include "wearable_log.h" -#include "DialModelHeartRate.h" +#include "main/include/dial/DialModelHeartRate.h" #include "heartrate/include/HeartChartView.h" #include "heartrate/include/HeartDetectionPresenter.h" #include "heartrate/include/HeartRateView.h" #include "heartrate/include/HeartResultPresenter.h" #include "ConfigModel.h" -#include "DialModelHeartRate.h" +#include "main/include/dial/DialModelHeartRate.h" #include "custom_runtime.h" #include "custom_utils.h" @@ -29,7 +29,7 @@ #include "wearable_log.h" #include -#include "MainClockView.h" +#include "clock/include/MainClockView.h" #ifdef BLE_SERVER_ENABLE #include "bleEvent.h" @@ -54,7 +54,7 @@ #include "battery_hal.h" #include "languagecode/LanguageInit.h" -#include "ui_service.h" +#include "uiservice/include/ui_service.h" #include 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 2932eb509..6a4dc66e3 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 @@ -6,10 +6,10 @@ */ #include -#include "HeartRateView.h" +#include "heartrate/include/HeartRateView.h" #include "common/screen.h" #include "UiConfig.h" -#include "ScreenModels.h" +#include "screensetting/include/ScreenModels.h" #include "ui_resource_image.h" #include "common/image_cache_manager.h" #include "health/health_service/health_service.h" 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 286978346..355a453bf 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 @@ -7,7 +7,7 @@ #include "heartrate/include/HeartResultPresenter.h" #include "common/task_manager.h" -#include "HeartModel.h" +#include "heartrate/include/HeartModel.h" #include "heartrate/include/HeartDetectionView.h" #include "heartrate/include/HeartResultView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultView.cpp index e467e1776..736feb6c5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartResultView.cpp @@ -9,15 +9,15 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" -#include "MainViewSample.h" +#include "main/include/MainViewSample.h" #include "components/ui_view_group.h" -#include "DialModelSPO2.h" -#include "DialModelHeartRate.h" -#include "HeartModel.h" +#include "main/include/dial/DialModelSPO2.h" +#include "main/include/dial/DialModelHeartRate.h" +#include "heartrate/include/HeartModel.h" #include "UiConfig.h" #include "uicomponents/UIComponents.h" -#include "MainPresenterSample.h" +#include "main/include/MainPresenterSample.h" #include "heartrate/include/HeartResultPresenter.h" #include "heartrate/include/HeartResultView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/include/IndoorWalkMotionView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/include/IndoorWalkMotionView.h index 40e0e4502..1ae0dc92d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/include/IndoorWalkMotionView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/include/IndoorWalkMotionView.h @@ -8,11 +8,11 @@ #define INDOORWALK_MOTION_VIEW_H #include "View.h" -#include "MotionPageFirst.h" -#include "MotionPageSecond.h" -#include "MotionPageThird.h" -#include "MotionPageFourth.h" -#include "MotionPageFifth.h" +#include "indoorwalk/include/MotionPageFirst.h" +#include "indoorwalk/include/MotionPageSecond.h" +#include "indoorwalk/include/MotionPageThird.h" +#include "indoorwalk/include/MotionPageFourth.h" +#include "indoorwalk/include/MotionPageFifth.h" #include "components/ui_swipe_view.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/include/IndoorWalkPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/include/IndoorWalkPresenter.h index 1b7f95615..5f3bb63c1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/include/IndoorWalkPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/include/IndoorWalkPresenter.h @@ -7,6 +7,7 @@ #ifndef INDOORWALK_PRESENTER_H #define INDOORWALK_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "components/ui_label.h" #include "NativeLauncher.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/include/IndoorWalkView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/include/IndoorWalkView.h index c89592aa1..2ce92d8e9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/include/IndoorWalkView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/include/IndoorWalkView.h @@ -7,12 +7,12 @@ #ifndef INDOORWALK_VIEW_H #define INDOORWALK_VIEW_H -#include "IndoorWalkEndView.h" +#include "indoorwalk/include/IndoorWalkEndView.h" #include "View.h" -#include "IndoorWalkPresenter.h" -#include "IndoorWalkPreparedView.h" -#include "CustomizationView.h" -#include "IndoorWalkMotionView.h" +#include "indoorwalk/include/IndoorWalkPresenter.h" +#include "indoorwalk/include/IndoorWalkPreparedView.h" +#include "indoorwalk/include/CustomizationView.h" +#include "indoorwalk/include/IndoorWalkMotionView.h" #include "components/ui_view_group.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/CustomizationView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/CustomizationView.cpp index 4e3e637ea..6f11832c4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/CustomizationView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/CustomizationView.cpp @@ -4,8 +4,8 @@ * Create: 2022-03-02 */ -#include "CustomizationView.h" -#include "IndoorWalkPresenter.h" +#include "indoorwalk/include/CustomizationView.h" +#include "indoorwalk/include/IndoorWalkPresenter.h" #include "wearable_log.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkEndView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkEndView.cpp index bcaa1e761..90d704910 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkEndView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkEndView.cpp @@ -4,8 +4,8 @@ * Create: 2022-03-02 */ -#include "IndoorWalkEndView.h" -#include "IndoorWalkPresenter.h" +#include "indoorwalk/include/IndoorWalkEndView.h" +#include "indoorwalk/include/IndoorWalkPresenter.h" #include "wearable_log.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkModel.cpp index 4afd157fd..f3d2a704f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkModel.cpp @@ -4,8 +4,8 @@ * Create: 2022-03-02 */ -#include "IndoorWalkModel.h" -#include "IndoorWalkPresenter.h" +#include "indoorwalk/include/IndoorWalkModel.h" +#include "indoorwalk/include/IndoorWalkPresenter.h" #include "ohos_timer.h" #include "graphic_timer.h" @@ -293,7 +293,7 @@ void InitIndoorWalkTimer() WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "IndoorWalkModel::IndoorWalkTimer already exists!!"); return; } - uint32 tick = GetOSTick(MS_ONE_SECONDS); + uint32_t tick = GetOSTick(MS_ONE_SECONDS); g_startCounting = new GraphicTimer(tick, IndoorWalkTimerCallback, nullptr, true); if (g_startCounting == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "IndoorWalkModel::IndoorWalkTimer new GraphicTimer failed!!"); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkMotionView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkMotionView.cpp index a3350f28e..3c2514687 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkMotionView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkMotionView.cpp @@ -4,13 +4,13 @@ * Create: 2022-03-02 */ -#include "IndoorWalkMotionView.h" -#include "IndoorWalkPresenter.h" +#include "indoorwalk/include/IndoorWalkMotionView.h" +#include "indoorwalk/include/IndoorWalkPresenter.h" #include "wearable_log.h" #include "UiConfig.h" -#include "ScreenModels.h" -#include "ActivityModel.h" -#include "IndoorWalkModel.h" +#include "screensetting/include/ScreenModels.h" +#include "activity/include/ActivityModel.h" +#include "indoorwalk/include/IndoorWalkModel.h" #include namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkPreparedView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkPreparedView.cpp index 4eff7a964..6aa87187f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkPreparedView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkPreparedView.cpp @@ -4,9 +4,9 @@ * Create: 2022-03-02 */ -#include "IndoorWalkPreparedView.h" -#include "IndoorWalkPresenter.h" -#include "ScreenModels.h" +#include "indoorwalk/include/IndoorWalkPreparedView.h" +#include "indoorwalk/include/IndoorWalkPresenter.h" +#include "screensetting/include/ScreenModels.h" #include "ui_resource_image.h" #include "wearable_log.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkPresenter.cpp index 8f295e398..b7eb9b1c8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkPresenter.cpp @@ -4,14 +4,14 @@ * Create: 2022-03-02 */ -#include "IndoorWalkPresenter.h" -#include "IndoorWalkView.h" -#include "IndoorWalkModel.h" +#include "indoorwalk/include/IndoorWalkPresenter.h" +#include "indoorwalk/include/IndoorWalkView.h" +#include "indoorwalk/include/IndoorWalkModel.h" #include "drag_event.h" #include "UiConfig.h" #include "wearable_log.h" #include -#include "ActivityModel.h" +#include "activity/include/ActivityModel.h" #include "NativeRegisterManager.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkView.cpp index 0308e9864..48df76a34 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/IndoorWalkView.cpp @@ -4,8 +4,8 @@ * Create: 2022-03-02 */ -#include "IndoorWalkView.h" -#include "IndoorWalkModel.h" +#include "indoorwalk/include/IndoorWalkView.h" +#include "indoorwalk/include/IndoorWalkModel.h" #include "wearable_log.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageFifth.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageFifth.cpp index a3da2bbde..59a732014 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageFifth.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageFifth.cpp @@ -3,7 +3,7 @@ * Description: Motion PageFifth View * Create: 2022-03-02 */ -#include "MotionPageFifth.h" +#include "indoorwalk/include/MotionPageFifth.h" #include "wearable_log.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageFirst.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageFirst.cpp index c16b941d5..0a0d6e199 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageFirst.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageFirst.cpp @@ -4,9 +4,9 @@ * Create: 2022-03-02 */ -#include "MotionPageFirst.h" -#include "IndoorWalkPresenter.h" -#include "IndoorWalkModel.h" +#include "indoorwalk/include/MotionPageFirst.h" +#include "indoorwalk/include/IndoorWalkPresenter.h" +#include "indoorwalk/include/IndoorWalkModel.h" #include "wearable_log.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageFourth.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageFourth.cpp index a43ab8ff6..8a96ee884 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageFourth.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageFourth.cpp @@ -3,9 +3,9 @@ * Description: Motion PageFourth View * Create: 2022-03-02 */ -#include "MotionPageFourth.h" -#include "IndoorWalkPresenter.h" -#include "IndoorWalkModel.h" +#include "indoorwalk/include/MotionPageFourth.h" +#include "indoorwalk/include/IndoorWalkPresenter.h" +#include "indoorwalk/include/IndoorWalkModel.h" #include "wearable_log.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageSecond.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageSecond.cpp index 34e136df5..ade800ebb 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageSecond.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageSecond.cpp @@ -3,9 +3,9 @@ * Description: Motion PageSecond View * Create: 2022-03-02 */ -#include "MotionPageSecond.h" -#include "IndoorWalkPresenter.h" -#include "IndoorWalkModel.h" +#include "indoorwalk/include/MotionPageSecond.h" +#include "indoorwalk/include/IndoorWalkPresenter.h" +#include "indoorwalk/include/IndoorWalkModel.h" #include "wearable_log.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageThird.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageThird.cpp index 668d78cd4..1587822d8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageThird.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/indoorwalk/src/MotionPageThird.cpp @@ -3,9 +3,9 @@ * Description: Motion PageThird View * Create: 2022-03-02 */ -#include "MotionPageThird.h" -#include "IndoorWalkPresenter.h" -#include "IndoorWalkModel.h" +#include "indoorwalk/include/MotionPageThird.h" +#include "indoorwalk/include/IndoorWalkPresenter.h" +#include "indoorwalk/include/IndoorWalkModel.h" #include "wearable_log.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/key/src/KeyInputListener.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/key/src/KeyInputListener.cpp index 5c0a1ea20..85538519e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/key/src/KeyInputListener.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/key/src/KeyInputListener.cpp @@ -5,19 +5,19 @@ * Create: 2021-09-18 */ -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "common/key_code.h" #include "AppViewIDs.h" #include "View.h" -#include "MainViewSample.h" +#include "main/include/MainViewSample.h" #include "wearable_log.h" #include "UiConfig.h" #include "dock/input_device.h" #include "notification_manager.h" -#include "AlarmPopUpPresenter.h" -#include "CallerLogModel.h" -#include "MainCallingPresenter.h" -#include "ApplistModel.h" +#include "alarm/include/AlarmPopUpPresenter.h" +#include "callerlog/include/CallerLogModel.h" +#include "makephone/include/MainCallingPresenter.h" +#include "applist/include/ApplistModel.h" #include "UiConfig.h" #include "custom_runtime.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/include/LanguageSwitchPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/include/LanguageSwitchPresenter.h index 423a66ea3..786a2fd0d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/include/LanguageSwitchPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/include/LanguageSwitchPresenter.h @@ -8,6 +8,7 @@ #ifndef LANGUAGE_SWITCH_PRESENTER_H #define LANGUAGE_SWITCH_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "languagecode/include/LanguageSwitchModel.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp index 166ebbb40..808ec3904 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/languagecode/src/LanguageSwitchView.cpp @@ -2,6 +2,7 @@ #include "languagecode/include/LanguageSwitchPresenter.h" #include "wearable_log.h" #include "UiConfig.h" +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/DialBinParserManager.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/DialBinParserManager.h index 50a9e4a6f..27d158537 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/DialBinParserManager.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/DialBinParserManager.h @@ -10,8 +10,8 @@ #include #include #include "graphic_types.h" -#include "DialViewGroup.h" -#include "DialBinTypes.h" +#include "main/include/dial/DialViewGroup.h" +#include "main/include/DialBinTypes.h" namespace OHOS { class DialBinParserInterface { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/DialBinParserV3.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/DialBinParserV3.h index 99d530e89..af2d51d05 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/DialBinParserV3.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/DialBinParserV3.h @@ -8,7 +8,7 @@ #ifndef GRAPHIC_LITE_DIAL_BIN_PARSER_V3_H #define GRAPHIC_LITE_DIAL_BIN_PARSER_V3_H #include "DialBinParserManager.h" -#include "DialModelTime.h" +#include "main/include/dial/DialModelTime.h" #include "components/ui_abstract_progress.h" #include "DialViewContainer.h" #include "DialDataType.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainPresenterSample.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainPresenterSample.h index 5b4a2ad6e..8f2e780d7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainPresenterSample.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainPresenterSample.h @@ -8,15 +8,16 @@ #ifndef MAIN_PRESENTER_SAMPLE_H #define MAIN_PRESENTER_SAMPLE_H -#include "HeartRateView.h" -#include "KeyInputListener.h" -#include "MainCompassPresenter.h" -#include "MainCompassView.h" -#include "MainModel.h" -#include "MainViewSample.h" -#include "ModelListenerSample.h" +#include "heartrate/include/HeartRateView.h" +#include "key/include/KeyInputListener.h" +#include "compass/include/MainCompassPresenter.h" +#include "compass/include/MainCompassView.h" +#include "main/include/MainModel.h" +#include "main/include/MainViewSample.h" +#include "main/include/ModelListenerSample.h" #include "player/include/PlayersView.h" +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "components/root_view.h" #include "components/ui_swipe_view.h" 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 a25464833..16e20cd35 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 @@ -17,23 +17,22 @@ #include "font/ui_font.h" #include "graphic_config.h" #include "ModelListenerSample.h" -#include "ScreenModels.h" -#include "ActivityWeekView.h" -#include "CompassControlView.h" -#include "DialViewGroup.h" -#include "MainClockView.h" +#include "screensetting/include/ScreenModels.h" +#include "activity/include/ActivityWeekView.h" +#include "compass/include/CompassControlView.h" +#include "main/include/dial/DialViewGroup.h" +#include "clock/include/MainClockView.h" #include "player/include/PlayersView.h" -#include "MainPresenterSample.h" -#include "HeartRateView.h" +#include "main/include/MainPresenterSample.h" +#include "heartrate/include/HeartRateView.h" #include "components/ui_card_page.h" #include "PullUpDownView.h" #include "components/ui_cross_view.h" #include "uicomponents/UIComponents.h" -#include "SetCardModel.h" +#include "set_card/include/SetCardModel.h" #include "health/BloodCardView.h" #include "traing/training_card/include/Training_CardView.h" -// #include "ApplistCardView.h" #include "weather/include/WeatherControlView.h" #include "goal/include/goalControlView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/VolumeSettingPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/VolumeSettingPresenter.h index ed77277ed..86fdc8a45 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/VolumeSettingPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/VolumeSettingPresenter.h @@ -5,7 +5,7 @@ #include "components/ui_label_button.h" #include "components/ui_view_group.h" #include "components/ui_slider.h" -#include "VolumeSettingView.h" +#include "main/include/VolumeSettingView.h" #include "player/include/PlayersView.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDigitalImgView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDigitalImgView.h index 540c491b5..d46001e57 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDigitalImgView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialDigitalImgView.h @@ -7,7 +7,7 @@ #include #include "DialView.h" -#include "DialModelTime.h" +#include "main/include/dial/DialModelTime.h" #include "components/ui_image_view.h" #include "gfx_utils/graphic_math.h" #include "components/ui_view_group.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialOptionImgView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialOptionImgView.h index 52e4298c2..3d763b099 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialOptionImgView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialOptionImgView.h @@ -7,7 +7,7 @@ #include #include "DialView.h" -#include "DialModelTime.h" +#include "main/include/dial/DialModelTime.h" #include "components/ui_image_view.h" #include "font/font_global_manager.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialStaticImgView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialStaticImgView.h index df8f2810c..d5871c938 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialStaticImgView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/DialStaticImgView.h @@ -7,7 +7,7 @@ #include "components/ui_image_view.h" #include "font/font_global_manager.h" -#include "DialModelTime.h" +#include "main/include/dial/DialModelTime.h" namespace OHOS { class DialStaticImgView : public UIImageView, diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/ModelDialDataFactory.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/ModelDialDataFactory.h index 33bedbe49..8347b2939 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/ModelDialDataFactory.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/ModelDialDataFactory.h @@ -11,7 +11,7 @@ #include #include "DialBaseModel.h" #include "DialDataBase.h" -#include "ModelDialDataFactory.h" +#include "main/include/dial/ModelDialDataFactory.h" namespace OHOS { class ModelDialDataFactory : public HeapBase { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/RegisterDialModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/RegisterDialModel.h index f648a5d37..c1a12da6a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/RegisterDialModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/dial/RegisterDialModel.h @@ -9,7 +9,7 @@ #define REGISTER_DIAL_MODEL_H #include "DialDataBase.h" -#include "ModelDialDataFactory.h" +#include "main/include/dial/ModelDialDataFactory.h" namespace OHOS { class RegisterDialModel { public: diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/ConnectedStatusView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/ConnectedStatusView.cpp index 9fe460cd5..9bc59a5cb 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/ConnectedStatusView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/ConnectedStatusView.cpp @@ -1,7 +1,7 @@ #include "main/include/ConnectedStatusView.h" #include "main/include/PullUpDownView.h" #include "wearable_log.h" -#include "SettingModel.h" +#include "settings/include/SettingModel.h" #include #include "screensetting/include/ScreenModels.h" #include "main/include/MainPresenterSample.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainModel.cpp index c9943f4e7..491274446 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainModel.cpp @@ -6,19 +6,19 @@ */ #include "unistd.h" -#include "MainModel.h" +#include "main/include/MainModel.h" #include "kv_store.h" #include "securec.h" #include "wearable_log.h" #include "ConfigModel.h" #include #include -#include "MainViewSample.h" -#include "ui_service.h" -#include "SetDialModel.h" +#include "main/include/MainViewSample.h" +#include "uiservice/include/ui_service.h" +#include "set_dial/include/SetDialModel.h" #include "dnotdisturb/include/DnotDisturbModel.h" #include "custom_utils.h" -#include "DialViewGroup.h" +#include "main/include/MainModel.h" #ifdef SUPPORT_POWER_MANAGER #include "power_display_service.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 355d8adb0..3346ff23d 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 @@ -5,15 +5,15 @@ * Create: 2021-10-18 */ -#include "MainPresenterSample.h" +#include "main/include/MainPresenterSample.h" #include "common/task_manager.h" -#include "HeartRateView.h" -#include "PlayersModel.h" -#include "PlayersPresenter.h" -#include "CompassPresenter.h" +#include "heartrate/include/HeartRateView.h" +#include "player/include/PlayersModel.h" +#include "player/include/PlayersPresenter.h" +#include "compass/include/CompassPresenter.h" #include "NativeRegisterManager.h" #include "compass/include/CompassModel.h" -#include "CompassCalibrationView.h" +#include "compass/include/CompassCalibrationView.h" #include "drag_event.h" #include "graphic_service.h" #include "wearable_log.h" @@ -21,9 +21,9 @@ #include "ui_resource_image.h" #include #include -#include "ModelDialDataFactory.h" -#include "DialModelTime.h" -#include "DialModelPower.h" +#include "main/include/dial/ModelDialDataFactory.h" +#include "main/include/dial/DialModelTime.h" +#include "main/include/dial/DialModelPower.h" #include "heartrate/include/HeartModel.h" #include "gfx_utils/mem_check.h" #include "custom_utils.h" @@ -34,14 +34,14 @@ #include "sleep/include/SleepControlView.h" #include "sleep/include/SleepCardView.h" #include "sleep/include/SleepModel.h" -#include "MainModel.h" +#include "main/include/MainModel.h" #include "custom_runtime.h" #include "rebootandshutdown/include/RebootAndShutdownModelC.h" #if USE_OFFLINE_DIAL -#include "DialViewGroup.h" +#include "main/include/MainModel.h" #endif -#include "ui_service.h" +#include "uiservice/include/ui_service.h" #include "time.h" #define TESTCHECK 0 //心率弹窗 @@ -52,6 +52,8 @@ #include "power_display_service.h" #endif +#include "PageTransitionMgr.h" + extern "C" { #ifdef SUPPORT_BATTERY_SERVICE @@ -105,7 +107,6 @@ REGIST_SLICE(VIEW_MAIN, MainViewSample, MainPresenterSample); void MainPresenterSample::OnPause() { - Presenter::OnPause(); // Save watchface content for slide back UIView* watchFace = view_->GetViewById(WATCH_FACE)->GetParent(); uint8_t opaScale = watchFace->GetOpaScale(); @@ -131,7 +132,6 @@ REGIST_SLICE(VIEW_MAIN, MainViewSample, MainPresenterSample); void MainPresenterSample::OnResume(void) { - Presenter::OnResume(); mainPresenterState_ = MainPresenterState::RESUME; // Set current page again to invoke OnActive method. uint8_t curCardId = view_->GetHorCurrentCard(); @@ -269,7 +269,7 @@ if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true) { void MainPresenterSample::SetTaskPeroid(CardId cardId) { - SetLastRun(0); // refresh entering card in time + SetLastRun(0); if (cardId == COMPASS) { SetPeriod(DEFAULT_TASK_PERIOD); } else if (cardId == WATCH_FACE) { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp index 02a3647cf..29a89cd33 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/MainViewSample.cpp @@ -5,11 +5,11 @@ * Create: 2021-10-18 */ #include "wearable_log.h" -#include "MainViewSample.h" +#include "main/include/MainViewSample.h" #include "graphic_service.h" // #include "dialupdate/include/DialUpdateModel.h" #include "uicomponents/UIComponents.h" -#include "ui_service.h" +#include "uiservice/include/ui_service.h" // extern DialInfo_1 dialInfo_1[MAX_DIALNUM_1]; extern "C" uint8_t uapi_dev_runtime_get_lock_status(void); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp index ccb5860dd..7b684d58a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp @@ -3,20 +3,20 @@ * Description: VolumeSettingView view * Create: 2021-09-5 */ -#include "VolumeSettingView.h" +#include "main/include/VolumeSettingView.h" #include "VolumeSettingPresenter.h" -#include "PlayersModel.h" +#include "player/include/PlayersModel.h" #include "common/image_cache_manager.h" #include "UiConfig.h" #include "ui_resource_image.h" #include "drag_event.h" -#include "MainCallingView.h" -#include "PhoneService.h" -#include "CallerLogModel.h" +#include "makephone/include/MainCallingView.h" +#include "phoneservice/include/PhoneService.h" +#include "callerlog/include/CallerLogModel.h" #include "bts_avrcp_controller.h" #include "bts_avrcp_target.h" #include "notification_manager.h" -#include "BluetoothHeadsetEvent.h" +#include "bluetooth/include/BluetoothHeadsetEvent.h" #include "bts_avrcp_controller.h" #include "ConfigModel.h" #include "vibrator_service.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingView.cpp index 1f8a31252..95e69cf40 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingView.cpp @@ -3,8 +3,8 @@ * Description: VolumeSettingView view * Create: 2021-09-5 */ -#include "VolumeSettingView.h" -#include "PlayersView.h" +#include "main/include/VolumeSettingView.h" +#include "player/include/PlayersView.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/main/src/dial/DialArcLabelView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialArcLabelView.cpp index 02ce99c31..43518719b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialArcLabelView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialArcLabelView.cpp @@ -2,7 +2,7 @@ * Copyright (c) @CompanyNameMagicTag. 2023. All rights reserved. */ -#include "DialArcLabelView.h" +#include "main/include/dial/DialArcLabelView.h" #include "securec.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialArcProgressView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialArcProgressView.cpp index b9ab85499..43fff8806 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialArcProgressView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialArcProgressView.cpp @@ -2,7 +2,7 @@ * Copyright (c) @CompanyNameMagicTag. 2023. All rights reserved. */ -#include "DialArcProgressView.h" +#include "main/include/dial/DialArcProgressView.h" namespace OHOS { DialArcProgressView::DialArcProgressView(void) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressModel.cpp index 6b818c086..5cb89f89c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressModel.cpp @@ -1,5 +1,5 @@ -#include "DialBoxProgressModel.h" -#include "DialBoxProgressView.h" +#include "main/include/dial/DialBoxProgressModel.h" +#include "main/include/dial/DialBoxProgressView.h" #include "wearable_log.h" #include "battery_hal.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressView.cpp index 5457370bf..45366d771 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialBoxProgressView.cpp @@ -1,5 +1,5 @@ -#include "DialBoxProgressView.h" -#include "DialBoxProgressModel.h" +#include "main/include/dial/DialBoxProgressView.h" +#include "main/include/dial/DialBoxProgressModel.h" #include "wearable_log.h" // 从转换后的uint32_t数据中提取数据类型 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialDigitalImgView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialDigitalImgView.cpp index 4f316171e..c58063b5c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialDigitalImgView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialDigitalImgView.cpp @@ -2,7 +2,7 @@ * Copyright (c) @CompanyNameMagicTag. 2023. All rights reserved. */ -#include "DialDigitalImgView.h" +#include "main/include/dial/DialDigitalImgView.h" #include #include "securec.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialLabelView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialLabelView.cpp index 526d0a2fd..86cacc98c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialLabelView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialLabelView.cpp @@ -2,7 +2,7 @@ * Copyright (c) @CompanyNameMagicTag. 2023. All rights reserved. */ -#include "DialLabelView.h" +#include "main/include/dial/DialLabelView.h" #include "securec.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCalorie.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCalorie.cpp index 55f4b1181..7c3c4885a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCalorie.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCalorie.cpp @@ -6,8 +6,8 @@ * Create: 2023-12 */ -#include "DialModelCalorie.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialModelCalorie.h" +#include "main/include/dial/RegisterDialModel.h" #include "wearable_log.h" #include "goal/include/goalmodel.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCharge.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCharge.cpp index 1e89666e0..aa7801136 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCharge.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelCharge.cpp @@ -5,8 +5,8 @@ * Create: 2023-12 */ -#include "RegisterDialModel.h" -#include "DialModelCharge.h" +#include "main/include/dial/RegisterDialModel.h" +#include "main/include/dial/DialModelCharge.h" #include "main/include/dial/DialModelChargeC.h" #include "wearable_log.h" REGIST_DIAL_MODULE(OHOS::DialDataType::CHARGING_STATUS, OHOS::DialModelCharge::GetInstance()); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateEnStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateEnStr.cpp index acb782b37..8b092bf85 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateEnStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateEnStr.cpp @@ -1,5 +1,5 @@ -#include "DialModelDateEnStr.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialModelDateEnStr.h" +#include "main/include/dial/RegisterDialModel.h" #include "sys/time.h" #include "wearable_log.h" #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateStr.cpp index 801a44512..7f8a9bd47 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateStr.cpp @@ -1,5 +1,5 @@ -#include "RegisterDialModel.h" -#include "DialModelDateStr.h" +#include "main/include/dial/RegisterDialModel.h" +#include "main/include/dial/DialModelDateStr.h" #include #include #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateWeekStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateWeekStr.cpp index 872daeecd..c7b3667c9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateWeekStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDateWeekStr.cpp @@ -1,5 +1,5 @@ -#include "DialModelDateWeekStr.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialModelDateWeekStr.h" +#include "main/include/dial/RegisterDialModel.h" #include "sys/time.h" #include "wearable_log.h" #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDistance.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDistance.cpp index 66350f7bb..0bb072480 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDistance.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelDistance.cpp @@ -1,6 +1,6 @@ -#include "RegisterDialModel.h" -#include "DialModelDistance.h" +#include "main/include/dial/RegisterDialModel.h" +#include "main/include/dial/DialModelDistance.h" #include "wearable_log.h" REGIST_DIAL_MODULE(OHOS::DialDataType::DISTANCE_DATA, OHOS::DialModelDistance::GetInstance()); #include "goal/include/goalmodel.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHeartRate.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHeartRate.cpp index 9f0e4d332..5d7683c53 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHeartRate.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHeartRate.cpp @@ -17,8 +17,8 @@ * Create: 2023-12 */ -#include "RegisterDialModel.h" -#include "DialModelHeartRate.h" +#include "main/include/dial/RegisterDialModel.h" +#include "main/include/dial/DialModelHeartRate.h" #include "wearable_log.h" REGIST_DIAL_MODULE(OHOS::DialDataType::HEART_RATE, OHOS::DialModelHeartRate::GetInstance()); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourTens.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourTens.cpp index adb191dbb..b0715626e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourTens.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourTens.cpp @@ -6,8 +6,8 @@ */ #include -#include "RegisterDialModel.h" -#include "DialModelHourTens.h" +#include "main/include/dial/RegisterDialModel.h" +#include "main/include/dial/DialModelHourTens.h" #include "custom_runtime.h" // 注册模块 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourUnits.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourUnits.cpp index fd1524b46..13227d5c6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourUnits.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelHourUnits.cpp @@ -1,7 +1,7 @@ #include -#include "RegisterDialModel.h" -#include "DialModelHourUnits.h" +#include "main/include/dial/RegisterDialModel.h" +#include "main/include/dial/DialModelHourUnits.h" #include "custom_runtime.h" // 注册模块 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoal.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoal.cpp index 2f66e6e06..3b44a5e90 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoal.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoal.cpp @@ -5,10 +5,10 @@ * Create: 2023-12 */ -#include "DialModelKcalgoal.h" -#include "DialBoxProgressView.h" -#include "DialBoxProgressModel.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialModelKcalgoal.h" +#include "main/include/dial/DialBoxProgressView.h" +#include "main/include/dial/DialBoxProgressModel.h" +#include "main/include/dial/RegisterDialModel.h" #include "goal/include/goalmodel.h" REGIST_DIAL_MODULE(OHOS::DialDataType::CALORIE_GOAL_BOXPROGRESS, diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalStr.cpp index ce4993d66..20f976799 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalStr.cpp @@ -5,9 +5,9 @@ * Create: 2023-12 */ -#include "DialModelKcalgoalStr.h" -#include "DialBoxProgressView.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialModelKcalgoalStr.h" +#include "main/include/dial/DialBoxProgressView.h" +#include "main/include/dial/RegisterDialModel.h" #include "goal/include/goalmodel.h" REGIST_DIAL_MODULE(OHOS::DialDataType::CALORIE_GOAL_STR, diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalValue.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalValue.cpp index f73360ebf..b6cd93f44 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalValue.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelKcalgoalValue.cpp @@ -5,9 +5,9 @@ * Create: 2023-12 */ -#include "DialModelKcalgoalValue.h" -#include "DialBoxProgressView.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialModelKcalgoalValue.h" +#include "main/include/dial/DialBoxProgressView.h" +#include "main/include/dial/RegisterDialModel.h" #include "goal/include/goalmodel.h" REGIST_DIAL_MODULE(OHOS::DialDataType::CALORIE_RATIO, diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinTens.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinTens.cpp index ae0e26a8a..dc5965870 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinTens.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinTens.cpp @@ -12,8 +12,8 @@ */ #include -#include "RegisterDialModel.h" -#include "DialModelMinTens.h" +#include "main/include/dial/RegisterDialModel.h" +#include "main/include/dial/DialModelMinTens.h" #include "custom_runtime.h" // 注册模块 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinUnits.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinUnits.cpp index 69af8f2c0..5d46a76c7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinUnits.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelMinUnits.cpp @@ -12,8 +12,8 @@ */ #include -#include "RegisterDialModel.h" -#include "DialModelMinUnits.h" +#include "main/include/dial/RegisterDialModel.h" +#include "main/include/dial/DialModelMinUnits.h" #include "custom_runtime.h" // 注册模块 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPower.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPower.cpp index 057afe7c3..6db064dd6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPower.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPower.cpp @@ -19,9 +19,9 @@ * Create: 2023-12 */ -#include "RegisterDialModel.h" -#include "DialModelPower.h" -#include "DialBoxProgressView.h" +#include "main/include/dial/RegisterDialModel.h" +#include "main/include/dial/DialModelPower.h" +#include "main/include/dial/DialBoxProgressView.h" #include #include "wearable_log.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerMapper.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerMapper.cpp index 7a11c7aa6..278ec6507 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerMapper.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerMapper.cpp @@ -1,8 +1,8 @@ -#include "DialBoxProgressView.h" -#include "DialModelPowerMapper.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialBoxProgressView.h" +#include "main/include/dial/DialModelPowerMapper.h" +#include "main/include/dial/RegisterDialModel.h" #include "wearable_log.h" #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStandby.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStandby.cpp index ca5313932..7a6167557 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStandby.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelPowerStandby.cpp @@ -1,10 +1,10 @@ -#include "DialModelPowerStandby.h" -#include "DialBoxProgressView.h" -#include "DialBoxProgressModel.h" +#include "main/include/dial/DialModelPowerStandby.h" +#include "main/include/dial/DialBoxProgressView.h" +#include "main/include/dial/DialBoxProgressModel.h" -#include "RegisterDialModel.h" +#include "main/include/dial/RegisterDialModel.h" #include "wearable_log.h" #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSPO2.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSPO2.cpp index bb2e07b47..5bd70fc05 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSPO2.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSPO2.cpp @@ -11,8 +11,8 @@ * Create: 2023-12 */ -#include "RegisterDialModel.h" -#include "DialModelSPO2.h" +#include "main/include/dial/RegisterDialModel.h" +#include "main/include/dial/DialModelSPO2.h" #include "wearable_log.h" REGIST_DIAL_MODULE(OHOS::DialDataType::BLOOD_OXYGEN, OHOS::DialModelSPO2::GetInstance()); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSecondMapper.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSecondMapper.cpp index 2f023feb6..46136a1c8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSecondMapper.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSecondMapper.cpp @@ -1,5 +1,5 @@ -#include "DialModelSecondMapper.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialModelSecondMapper.h" +#include "main/include/dial/RegisterDialModel.h" #include "custom_runtime.h" #include #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoal.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoal.cpp index a87214d6e..cd82ad1c1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoal.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoal.cpp @@ -5,10 +5,10 @@ * Create: 2023-12 */ -#include "DialModelStepgoal.h" -#include "DialBoxProgressView.h" -#include "DialBoxProgressModel.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialModelStepgoal.h" +#include "main/include/dial/DialBoxProgressView.h" +#include "main/include/dial/DialBoxProgressModel.h" +#include "main/include/dial/RegisterDialModel.h" #include "goal/include/goalmodel.h" REGIST_DIAL_MODULE(OHOS::DialDataType::STEPS_GOAL_BOXPROGRESS, diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalStr.cpp index 4229b7096..06c713fc4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalStr.cpp @@ -5,9 +5,9 @@ * Create: 2023-12 */ -#include "DialModelStepgoalStr.h" -#include "DialBoxProgressView.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialModelStepgoalStr.h" +#include "main/include/dial/DialBoxProgressView.h" +#include "main/include/dial/RegisterDialModel.h" #include "goal/include/goalmodel.h" REGIST_DIAL_MODULE(OHOS::DialDataType::STEPS_GOAL_STR, diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalValue.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalValue.cpp index 7de676d74..ba45574c1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalValue.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelStepgoalValue.cpp @@ -5,9 +5,9 @@ * Create: 2023-12 */ -#include "DialModelStepgoalValue.h" -#include "DialBoxProgressView.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialModelStepgoalValue.h" +#include "main/include/dial/DialBoxProgressView.h" +#include "main/include/dial/RegisterDialModel.h" #include "goal/include/goalmodel.h" REGIST_DIAL_MODULE(OHOS::DialDataType::STEP_GOAL_PROGRESS, diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSteps.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSteps.cpp index 3eeb3ff71..aff88b2da 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSteps.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelSteps.cpp @@ -5,8 +5,8 @@ * Create: 2023-12 */ -#include "DialModelSteps.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialModelSteps.h" +#include "main/include/dial/RegisterDialModel.h" #include "goal/include/goalmodel.h" REGIST_DIAL_MODULE(OHOS::DialDataType::STEP_COUNT, diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTime.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTime.cpp index a08366bdd..e14923694 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTime.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTime.cpp @@ -7,8 +7,8 @@ #include #include "sys/time.h" -#include "RegisterDialModel.h" -#include "DialModelTime.h" +#include "main/include/dial/RegisterDialModel.h" +#include "main/include/dial/DialModelTime.h" #include "components/root_view.h" #include "custom_runtime.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTimeStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTimeStr.cpp index f68c23fd1..a3e3e2851 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTimeStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelTimeStr.cpp @@ -1,5 +1,5 @@ -#include "DialModelTimeStr.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialModelTimeStr.h" +#include "main/include/dial/RegisterDialModel.h" #include "custom_runtime.h" #include "sys/time.h" #include "wearable_log.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeather.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeather.cpp index d360fed1c..8135db8a8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeather.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeather.cpp @@ -11,8 +11,8 @@ * Create: 2023-12 */ -#include "RegisterDialModel.h" -#include "DialModelWeather.h" +#include "main/include/dial/RegisterDialModel.h" +#include "main/include/dial/DialModelWeather.h" #include "wearable_log.h" REGIST_DIAL_MODULE(OHOS::DialDataType::WEATHER_TYPE, OHOS::DialModelWeather::GetInstance()); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeatherStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeatherStr.cpp index ec5524190..077df17b2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeatherStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeatherStr.cpp @@ -8,8 +8,8 @@ * * Copyright (c) 2024 by ${git_name_email}, All Rights Reserved. */ -#include "RegisterDialModel.h" -#include "DialModelWeatherStr.h" +#include "main/include/dial/RegisterDialModel.h" +#include "main/include/dial/DialModelWeatherStr.h" #include #include #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekEnStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekEnStr.cpp index 72ff069ba..7f6762d4f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekEnStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekEnStr.cpp @@ -1,5 +1,5 @@ -#include "DialModelWeekEnStr.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialModelWeekEnStr.h" +#include "main/include/dial/RegisterDialModel.h" #include "sys/time.h" #include "wearable_log.h" #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekNum.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekNum.cpp index deb1e35e2..d0f960e0f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekNum.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekNum.cpp @@ -1,5 +1,5 @@ -#include "DialModelWeekNum.h" -#include "RegisterDialModel.h" +#include "main/include/dial/DialModelWeekNum.h" +#include "main/include/dial/RegisterDialModel.h" #include "sys/time.h" #include "wearable_log.h" #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekStr.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekStr.cpp index f076832e3..2ab69b7cc 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekStr.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialModelWeekStr.cpp @@ -1,5 +1,5 @@ -#include "RegisterDialModel.h" -#include "DialModelWeekStr.h" +#include "main/include/dial/RegisterDialModel.h" +#include "main/include/dial/DialModelWeekStr.h" #include #include #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialOptionImgView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialOptionImgView.cpp index 980d438cd..2247a76e0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialOptionImgView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialOptionImgView.cpp @@ -2,7 +2,7 @@ * Copyright (c) @CompanyNameMagicTag. 2023. All rights reserved. */ -#include "DialOptionImgView.h" +#include "main/include/dial/DialOptionImgView.h" #include "securec.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialRotateImgView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialRotateImgView.cpp index bec17ca81..58d70602a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialRotateImgView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialRotateImgView.cpp @@ -2,7 +2,7 @@ * Copyright (c) @CompanyNameMagicTag. 2023. All rights reserved. */ -#include "DialRotateImgView.h" +#include "main/include/dial/DialRotateImgView.h" namespace OHOS { DialRotateImgView::DialRotateImgView(void) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialSequenceImgView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialSequenceImgView.cpp index c7d1c24e7..7574cdcc9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialSequenceImgView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialSequenceImgView.cpp @@ -2,7 +2,7 @@ * Copyright (c) @CompanyNameMagicTag. 2023. All rights reserved. */ -#include "DialSequenceImgView.h" +#include "main/include/dial/DialSequenceImgView.h" #include "securec.h" #include "common/graphic_utils.h" #include "common/image_cache_manager.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialStaticImgView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialStaticImgView.cpp index ffc87a701..d1f0a82c4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialStaticImgView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialStaticImgView.cpp @@ -2,7 +2,7 @@ * Copyright (c) @CompanyNameMagicTag. 2023. All rights reserved. */ -#include "DialStaticImgView.h" +#include "main/include/dial/DialStaticImgView.h" namespace OHOS { DialStaticImgView::DialStaticImgView() diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialVideoView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialVideoView.cpp index 13113cd1c..4c25fd0c1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialVideoView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialVideoView.cpp @@ -2,7 +2,7 @@ * Copyright (c) @CompanyNameMagicTag. 2023. All rights reserved. */ -#include "DialVideoView.h" +#include "main/include/dial/DialVideoView.h" namespace OHOS { static constexpr int16_t JPEG_HEIGHT_DIVISOR = 2; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewContainer.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewContainer.cpp index 8ed4cf710..a9772609d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewContainer.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewContainer.cpp @@ -5,9 +5,9 @@ * Create: 2025-02-06 */ -#include "DialViewContainer.h" -#include "DialDigitalImgView.h" -#include "ModelDialDataFactory.h" +#include "main/include/dial/DialViewContainer.h" +#include "main/include/dial/DialDigitalImgView.h" +#include "main/include/dial/ModelDialDataFactory.h" namespace OHOS { DialViewContainer::~DialViewContainer() diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewGroup.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewGroup.cpp index f172246b7..26d5fd49a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewGroup.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/DialViewGroup.cpp @@ -1,4 +1,4 @@ -#include "DialViewGroup.h" +#include "main/include/MainModel.h" #include #include #include "NativeAbility.h" @@ -6,21 +6,21 @@ #include "securec.h" #include "DialBinParser.h" #include "custom_runtime.h" -#include "MainModel.h" -#include "ModelDialDataFactory.h" +#include "main/include/MainModel.h" +#include "main/include/dial/ModelDialDataFactory.h" #include "common/low_power_manager.h" #include "main/include/PullUpDownView.h" // #include "message/include/MessageControlView.h" #include "hal_tick.h" #include "common/image_cache_manager.h" -#include "MainViewSample.h" +#include "main/include/MainViewSample.h" #include "alipay_feature.h" #ifdef SUPPORT_OHOSFWK -#include "ui_screennotify.h" +#include "screennotify/include/ui_screennotify.h" #endif -#include "DialDigitalImgView.h" +#include "main/include/dial/DialDigitalImgView.h" #include "common/input_device_manager.h" -#include "DialSequenceImgView.h" +#include "main/include/dial/DialSequenceImgView.h" #include "engines/gfx/lite_m_gfx_engine.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/ModelDialDataFactory.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/ModelDialDataFactory.cpp index d17de5b31..39e3f9fd5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/ModelDialDataFactory.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/ModelDialDataFactory.cpp @@ -5,7 +5,7 @@ * Create: 2023-12 */ -#include "ModelDialDataFactory.h" +#include "main/include/dial/ModelDialDataFactory.h" namespace OHOS { bool ModelDialDataFactory::GetDialTextData(DialDataType& type, std::string*& out, int16_t& strNum) { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/WatchInterface.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/WatchInterface.cpp index 45e63594e..2fc3509cb 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/WatchInterface.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/dial/WatchInterface.cpp @@ -9,12 +9,12 @@ #include "dirent.h" #include "DialBinParser.h" #include "UiConfig.h" -#include "WatchInterface.h" +#include "main/include/dial/WatchInterface.h" #include "gfx_utils/vector.h" #include "common/screen.h" -#include "MainModel.h" -#include "MainViewSample.h" -#include "SetDialModel.h" +#include "main/include/MainModel.h" +#include "main/include/MainViewSample.h" +#include "set_dial/include/SetDialModel.h" #include "graphic_service.h" #include "NativeAbility.h" @@ -36,6 +36,7 @@ bool GetActiveWatchPath(std::string &path) bool GetPreviewInfo(const std::string &fileName, DialPreviewInfo &preview) { + #ifdef FD230_650_0723 const std::string type(".bin"); if (!(fileName.length() > type.length() && fileName.substr(fileName.length() - type.length(), type.length()) == type)) { @@ -49,6 +50,8 @@ bool GetPreviewInfo(const std::string &fileName, DialPreviewInfo &preview) fclose(file); } return isSuccess; + #endif + return false; } bool ConvertPreview2WatchDialInfo(const DialPreviewInfo &preview, watch_dial_info &info) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/include/CallingView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/include/CallingView.h index e457e3bb1..aa0226ce6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/include/CallingView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/include/CallingView.h @@ -17,7 +17,7 @@ #include "UiConfig.h" #include "ChangeSliceListener.h" #include "components/ui_label_button.h" -#include "BluetoothEarListView.h" +#include "bluetooth/include/BluetoothEarListView.h" namespace OHOS { class CallingView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/include/MainCallingPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/include/MainCallingPresenter.h index ecae95120..67d7e38f3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/include/MainCallingPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/include/MainCallingPresenter.h @@ -7,12 +7,13 @@ #ifndef MAIN_CALLING_PRESENTER_H #define MAIN_CALLING_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "ohos_types.h" -#include "CallerLogModel.h" -#include "VolumeSettingView.h" -#include "VolumeSettingPresenter.h" -#include "KeyInputListener.h" +#include "callerlog/include/CallerLogModel.h" +#include "main/include/VolumeSettingView.h" +#include "main/include/VolumeSettingPresenter.h" +#include "key/include/KeyInputListener.h" namespace OHOS { class MainCallingView; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/include/MainCallingView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/include/MainCallingView.h index d16f41c32..5873f994e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/include/MainCallingView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/include/MainCallingView.h @@ -11,10 +11,10 @@ #include "components/ui_view_group.h" #include "ohos_types.h" -#include "CallerDisplayView.h" -#include "CallingView.h" -#include "DialingScreenView.h" -#include "WaitingHintsView.h" +#include "makephone/include/CallerDisplayView.h" +#include "makephone/include/CallingView.h" +#include "makephone/include/DialingScreenView.h" +#include "makephone/include/WaitingHintsView.h" namespace OHOS { class MainCallingPresenter; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/CallerDisplayView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/CallerDisplayView.cpp index beb1d83cc..b087c21a8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/CallerDisplayView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/CallerDisplayView.cpp @@ -4,8 +4,8 @@ * Author: * Create: 2021-10-12 */ -#include "CallerDisplayView.h" -#include "MainCallingPresenter.h" +#include "makephone/include/CallerDisplayView.h" +#include "makephone/include/MainCallingPresenter.h" #include "UiConfig.h" #include "phone/include/phoneaddressmodel.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/CallingView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/CallingView.cpp index 7bf58bc90..760674c5a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/CallingView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/CallingView.cpp @@ -4,11 +4,11 @@ * Author: * Create: 2021-10-12 */ -#include "CallingView.h" -#include "MainCallingPresenter.h" +#include "makephone/include/CallingView.h" +#include "makephone/include/MainCallingPresenter.h" #include "wearable_log.h" #include "UiConfig.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #ifdef SUPPORT_CAT1_SERVICE #include "cat1_server.h" #include "cat1_server_hal.h" @@ -27,7 +27,7 @@ #include "ui_resource_string.h" #ifdef SUPPORT_PHONE_SERVICE -#include "PhoneAGService.h" +#include "phoneservice/include/PhoneAGService.h" #endif namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/DialingScreenView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/DialingScreenView.cpp index 1c11fc2eb..e7f0c8f4c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/DialingScreenView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/DialingScreenView.cpp @@ -6,8 +6,8 @@ */ #include "wearable_log.h" #include "UiConfig.h" -#include "DialingScreenView.h" -#include "MainCallingPresenter.h" +#include "makephone/include/DialingScreenView.h" +#include "makephone/include/MainCallingPresenter.h" namespace OHOS { static constexpr uint16 MATH_ZERO = 0; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/MainCallingPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/MainCallingPresenter.cpp index f0a078991..1da1807b9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/MainCallingPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/MainCallingPresenter.cpp @@ -9,13 +9,13 @@ #include "common/image_cache_manager.h" #include "UiConfig.h" #include "ui_resource_image.h" -#include "MainCallingPresenter.h" -#include "CallingView.h" -#include "CallerDisplayView.h" -#include "DialingScreenView.h" -#include "MainCallingView.h" -#include "PhoneService.h" -#include "WaitingHintsView.h" +#include "makephone/include/MainCallingPresenter.h" +#include "makephone/include/CallingView.h" +#include "makephone/include/CallerDisplayView.h" +#include "makephone/include/DialingScreenView.h" +#include "makephone/include/MainCallingView.h" +#include "phoneservice/include/PhoneService.h" +#include "makephone/include/WaitingHintsView.h" #ifdef SUPPORT_CAT1_SERVICE #include "cat1_server.h" #include "cat1_server_hal.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/MainCallingView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/MainCallingView.cpp index a7fe86808..27101980a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/MainCallingView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/MainCallingView.cpp @@ -6,9 +6,9 @@ */ #include "wearable_log.h" #include "UiConfig.h" -#include "MainCallingView.h" -#include "MainCallingPresenter.h" -#include "CallerLogModel.h" +#include "makephone/include/MainCallingView.h" +#include "makephone/include/MainCallingPresenter.h" +#include "callerlog/include/CallerLogModel.h" namespace OHOS { static MainCallingView *g_pMainView = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/WaitingHintsView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/WaitingHintsView.cpp index 9470a5c56..5807a58a2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/WaitingHintsView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/makephone/src/WaitingHintsView.cpp @@ -4,10 +4,10 @@ * Author: * Create: 2022-03-14 */ -#include "WaitingHintsView.h" +#include "makephone/include/WaitingHintsView.h" #include "UiConfig.h" -#include "CallerLogModel.h" -#include "MainCallingPresenter.h" +#include "callerlog/include/CallerLogModel.h" +#include "makephone/include/MainCallingPresenter.h" #include "ui_resource_string.h" #ifdef SUPPORT_BLE_SERVICE @@ -19,7 +19,7 @@ #include "custom_utils.h" #include "wearable_log.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #ifdef SUPPORT_CAT1_SERVICE #include "cat1_server.h" #include "cat1_server_hal.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageControlPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageControlPresenter.h index e3abc0ba2..fef22368f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageControlPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageControlPresenter.h @@ -14,6 +14,7 @@ #ifndef MESSAGE_CONTROL_PRESENTER_H #define MESSAGE_CONTROL_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "components/ui_view.h" #include "components/ui_image_view.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessagePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessagePresenter.h index 187229ac6..8f1d39aa6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessagePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessagePresenter.h @@ -3,11 +3,12 @@ #ifndef Message_PRESENTER_H #define Message_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "MessageView.h" #include "message/include/MessageModel.h" // #include "components/ui_list.h" -// #include "KeyInputListener.h" +// #include "key/include/KeyInputListener.h" #include "common/key_code.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageShowPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageShowPresenter.h index 2025cb0fd..2afeddaa6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageShowPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/include/MessageShowPresenter.h @@ -8,6 +8,7 @@ #ifndef MessageShow_PRESENTER_H #define MessageShow_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "MessageShowView.h" #include "message/include/MessageModel.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageModel.cpp index 86a2f5d4b..d63038205 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageModel.cpp @@ -9,8 +9,8 @@ #include "message/include/MessageModel.h" #include "AppViewIDs.h" #include "ConfigModel.h" -#include "MainModel.h" -#include "MainViewSample.h" +#include "main/include/MainModel.h" +#include "main/include/MainViewSample.h" #include "NativeAbility.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessagePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessagePresenter.cpp index 2d242f2d4..a1ba5f1fc 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessagePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessagePresenter.cpp @@ -12,7 +12,7 @@ #include "wearable_log.h" #include "NativeAbility.h" #include "common/key_code.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "gfx_utils/mem_check.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowPresenter.cpp index f9c276f67..dce979e0e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/message/src/MessageShowPresenter.cpp @@ -15,7 +15,7 @@ #include "wearable_log.h" #include "common/key_code.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "NativeRegisterManager.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/include/MotionRecognitionPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/include/MotionRecognitionPresenter.h index a7b6e63b9..fbf5d1c5d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/include/MotionRecognitionPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/include/MotionRecognitionPresenter.h @@ -8,6 +8,7 @@ #ifndef MOTION_RECOGNITION_PRESENTER_H #define MOTION_RECOGNITION_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "components/ui_toggle_button.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionView.cpp index 41e5a6f02..5494d9f0d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/motionrecognition/src/MotionRecognitionView.cpp @@ -11,6 +11,7 @@ #include "ConfigModel.h" #include #include +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/include/MusicPlayerPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/include/MusicPlayerPresenter.h index a5e6ffa33..7ae2a7d00 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/include/MusicPlayerPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/musicplayer/include/MusicPlayerPresenter.h @@ -9,6 +9,7 @@ #ifndef MUSIC_PLAYER_PRESENTER_H #define MUSIC_PLAYER_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/include/NetworkAndCallPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/include/NetworkAndCallPresenter.h index 2524b1eef..9b7b2aeac 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/include/NetworkAndCallPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/include/NetworkAndCallPresenter.h @@ -9,6 +9,7 @@ #ifndef NETWORK_AND_CALL_PRESENTER_H #define NETWORK_AND_CALL_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallView.cpp index e32c11ce4..79ecdb3a8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/networkandcall/src/NetworkAndCallView.cpp @@ -3,7 +3,7 @@ #include "wearable_log.h" #include "UiConfig.h" #include "ConfigModel.h" - +#include "common/screen.h" extern "C" { #ifdef SUPPORT_CAT1_SERVICE #include "cat1_ctl.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/include/MainVocassistView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/include/MainVocassistView.h index c039e7981..c78a87279 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/include/MainVocassistView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/include/MainVocassistView.h @@ -8,8 +8,8 @@ #define MAIN_VOCASSIST_VIEW_H #include "View.h" -#include "VocassistModel.h" -#include "VocassistView.h" +#include "offlinevoice/include/VocassistModel.h" +#include "offlinevoice/include/VocassistView.h" namespace OHOS { class VocassistPresenter; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/include/VocassistModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/include/VocassistModel.h index e17d153fb..d90f19618 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/include/VocassistModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/include/VocassistModel.h @@ -9,7 +9,7 @@ #define VOCASSIST_MODEL_H #include "smart_voice_service.h" -#include "VocassistView.h" +#include "offlinevoice/include/VocassistView.h" #ifdef __cplusplus extern "C" { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/include/VocassistPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/include/VocassistPresenter.h index 5c3abe4f6..94deac5b8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/include/VocassistPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/include/VocassistPresenter.h @@ -8,10 +8,11 @@ #ifndef VOCASSIST_PRESENTER_H #define VOCASSIST_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "NativeAbility.h" -#include "VocassistView.h" -#include "MainVocassistView.h" +#include "offlinevoice/include/VocassistView.h" +#include "offlinevoice/include/MainVocassistView.h" namespace OHOS { class MainVocassistView; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/MainVocassistView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/MainVocassistView.cpp index 2b1eb6b10..016675017 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/MainVocassistView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/MainVocassistView.cpp @@ -5,8 +5,8 @@ * Create: 2022-01-18 */ -#include "MainVocassistView.h" -#include "VocassistPresenter.h" +#include "offlinevoice/include/MainVocassistView.h" +#include "offlinevoice/include/VocassistPresenter.h" namespace OHOS { static MainVocassistView *g_pMainVocassistView = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistModel.cpp index adae52d69..648b8d7d8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistModel.cpp @@ -4,10 +4,10 @@ * Author: CompanyName * Create: 2022-01-18 */ -#include "PhoneService.h" -#include "MainViewSample.h" -#include "VocassistView.h" -#include "VocassistModel.h" +#include "phoneservice/include/PhoneService.h" +#include "main/include/MainViewSample.h" +#include "offlinevoice/include/VocassistView.h" +#include "offlinevoice/include/VocassistModel.h" #include "AppViewIDs.h" #include "NativeAbility.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp index 9bd9f98a6..6f14806a6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp @@ -5,9 +5,9 @@ * Create: 2022-01-18 */ #include "AppViewIDs.h" -#include "VocassistPresenter.h" -#include "PlayersModel.h" -#include "ui_service.h" +#include "offlinevoice/include/VocassistPresenter.h" +#include "player/include/PlayersModel.h" +#include "uiservice/include/ui_service.h" #include "NativeRegisterManager.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp index 14ace5594..ab4382dd6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp @@ -9,11 +9,11 @@ #include "ohos_timer.h" #include "graphic_timer.h" #include "AppViewIDs.h" -#include "PlayersModel.h" -#include "CallerLogModel.h" -#include "VocassistModel.h" -#include "VocassistView.h" -#include "VocassistPresenter.h" +#include "player/include/PlayersModel.h" +#include "callerlog/include/CallerLogModel.h" +#include "offlinevoice/include/VocassistModel.h" +#include "offlinevoice/include/VocassistView.h" +#include "offlinevoice/include/VocassistPresenter.h" static constexpr uint16_t SWITCH_MAP_NUM = 16; static constexpr uint16_t ANI_X = 84; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/CallLogAdapter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/CallLogAdapter.h index 9d4354db3..231b4edaf 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/CallLogAdapter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/CallLogAdapter.h @@ -15,7 +15,7 @@ #include "UiConfig.h" #include #include "languagecode/LanguageInit.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #include "components/ui_swipe_view.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/CallLogItem.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/CallLogItem.h index c61a63d42..077a97b05 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/CallLogItem.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/CallLogItem.h @@ -12,7 +12,7 @@ #include "components/ui_label_button_ext.h" #include "languagecode/include/LanguageSwitchListAdapter.h" #include "components/ui_image_view.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #include "components/ui_swipe_view.h" #include "phone/include/MainPhoneView.h" #include "phone/include/TelephonyInitInterface.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/DialingMethodPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/DialingMethodPresenter.h index fc64f7dd4..8eb9dbd06 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/DialingMethodPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/DialingMethodPresenter.h @@ -9,6 +9,7 @@ #ifndef DIALING_METHOD_PRESENTER_H #define DIALING_METHOD_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/MainPhonePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/MainPhonePresenter.h index 4cb9d670f..0ee5bbacc 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/MainPhonePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/MainPhonePresenter.h @@ -9,6 +9,7 @@ #ifndef MAIN_PHONE_PRESENTER_H #define MAIN_PHONE_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "ui_swipe_view.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/MainPhoneView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/MainPhoneView.h index 558f9ed4e..c96f521d6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/MainPhoneView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/MainPhoneView.h @@ -16,7 +16,7 @@ #include "components/ui_label_ext.h" #include "components/ui_image_view.h" #include "phone/include/TelephonyInitInterface.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #include "components/ui_label_button_ext.h" #include "components/ui_swipe_view.h" #include "phone/include/CallLogAdapter.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/PhoneCallPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/PhoneCallPresenter.h index 54c4d3b2e..66fc97493 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/PhoneCallPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/PhoneCallPresenter.h @@ -1,6 +1,7 @@ #ifndef _PhoneCall_PRESENTER_H #define _PhoneCall_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "PhoneCallView.h" #include "string" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/PhoneDirPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/PhoneDirPresenter.h index e63653e33..fba0444e4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/PhoneDirPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/PhoneDirPresenter.h @@ -1,6 +1,7 @@ #ifndef _PhoneDir_PRESENTER_H #define _PhoneDir_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "PhoneDirView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/PhonePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/PhonePresenter.h index 3d4651580..b19d2ea01 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/PhonePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/include/PhonePresenter.h @@ -1,6 +1,7 @@ #ifndef _PHONE_PRESENTER_H #define _PHONE_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "PhoneView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp index 9493d25d8..a76fd5021 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodPresenter.cpp @@ -13,7 +13,7 @@ #include #include "phone/include/TelephonyInitInterface.h" #include "phone/include/phoneaddressmodel.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #include "custom_runtime.h" #ifdef SUPPORT_CAT1_SERVICE #include "cat1_ctl.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodView.cpp index 8b0549837..ec86a806d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/DialingMethodView.cpp @@ -11,6 +11,7 @@ #include "phone/include/TelephonyInitInterface.h" #include "UiConfig.h" #include "ui_resource_string.h" +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/MainPhoneView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/MainPhoneView.cpp index cc70b94b8..9887e0eab 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/MainPhoneView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/MainPhoneView.cpp @@ -18,6 +18,7 @@ #include "NativeAbility.h" #include "phone/include/CallLogAdapter.h" #include "phone/include/CallLogItem.h" +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/PhoneCallPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/PhoneCallPresenter.cpp index c3a63dc88..4c6784e1e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/PhoneCallPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/PhoneCallPresenter.cpp @@ -8,7 +8,7 @@ #ifdef SUPPORT_CAT1_SERVICE #include "cat1_server_hal.h" #endif -#include "PhoneService.h" +#include "phoneservice/include/PhoneService.h" #include "phone/include/PhoneCallView.h" #include "phone/include/TelephonyInitInterface.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/PhoneDirView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/PhoneDirView.cpp index 9b9857eb3..2164f325c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/PhoneDirView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phone/src/PhoneDirView.cpp @@ -3,6 +3,7 @@ #include "phone/include/PhoneDirView.h" #include "ui_resource_string.h" #include "common/image_cache_manager.h" +#include "common/screen.h" #include "phone/include/phoneaddressmodel.h" #define PHONE_DIR_GIRL "/user/res/Phone/little-girl.bin" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneAGService.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneAGService.cpp index 85cbddc4b..8c0592a27 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneAGService.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneAGService.cpp @@ -3,7 +3,7 @@ // * Description: This module include test function of BT HFP Service module. // */ -// #include "PhoneAGService.h" +// #include "phoneservice/include/PhoneAGService.h" // #include // #include // #include @@ -24,16 +24,16 @@ // #include "common_def.h" // #include "PhoneAudio.h" // #include "cat1_ctl.h" -// #include "BluetoothHeadsetEvent.h" +// #include "bluetooth/include/BluetoothHeadsetEvent.h" -// #include "PhoneServiceC.h" +// #include "phoneservice/include/PhoneServiceC.h" // #include "notification_manager.h" // #include "PhoneService.h" -// #include "CallerLogModel.h" +// #include "callerlog/include/CallerLogModel.h" // #include "custom_utils.h" // #include "voice_call_volte_sample_wrapper.h" -// #include "BluetoothModel.h" +// #include "bluetooth/include/BluetoothModel.h" // #include "BluetoothDeviceListView.h" // #include "ui_list.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneAudio.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneAudio.cpp index 85a5ca9b8..9caea50bd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneAudio.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneAudio.cpp @@ -4,8 +4,8 @@ * Create: 2021-09-22 */ -#include "PhoneAudio.h" -#include "PhoneService.h" +#include "phoneservice/include/PhoneAudio.h" +#include "phoneservice/include/PhoneService.h" #include #include #include "audio_manager.h" @@ -15,11 +15,11 @@ #include "audio_errors.h" #include "wearable_log.h" #include "audio_manager_c_wrapper.h" -#include "CallerLogModel.h" +#include "callerlog/include/CallerLogModel.h" #ifdef SUPPORT_CAT1_SERVICE #include "cat1_ctl.h" #endif -#include "PhoneServiceC.h" +#include "phoneservice/include/PhoneServiceC.h" #ifdef __cplusplus diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneService.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneService.cpp index b19ce81cb..5e530a795 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneService.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/phoneservice/src/PhoneService.cpp @@ -4,10 +4,10 @@ * Create: 2021-09-22 */ -#include "PhoneService.h" -#include "PhoneServiceC.h" +#include "phoneservice/include/PhoneService.h" +#include "phoneservice/include/PhoneServiceC.h" -#include "PhoneAudio.h" +#include "phoneservice/include/PhoneAudio.h" #include "securec.h" #include #include @@ -25,24 +25,24 @@ #include "broadcast_feature.h" #include "service_id_define.h" #include "samgr_lite.h" -#include "ui_service.h" +#include "uiservice/include/ui_service.h" #ifdef SUPPORT_CAT1_SERVICE #include "cat1_server_hal.h" #include "cat1_ctl.h" #endif -#include "BluetoothModel.h" +#include "bluetooth/include/BluetoothModel.h" #include "notification_manager.h" -#include "CallerLogModel.h" +#include "callerlog/include/CallerLogModel.h" #include "custom_utils.h" -#include "Bluetooyhpabpserver.h" -#include "AlarmClockModel.h" +// #include "BluetoothHpabpserver.h" +#include "alarm/include/AlarmClockModel.h" #include "ConfigModel.h" #include "custom_runtime.h" #include "vibrator_service.h" #include "gfx_utils/mem_api.h" #include "ConfigModelC.h" #include "UiConfig.h" -#include "PhoneAGService.h" +#include "phoneservice/include/PhoneAGService.h" #include "cmath" #ifdef __cplusplus extern "C" { @@ -385,8 +385,8 @@ static void AudioDnStart(void) return; } -#include "PlayersModelC.h" -#include "BluetoothModelC.h" +#include "player/include/PlayersModelC.h" +#include "bluetooth/include/BluetoothModelC.h" void cat1_audio_AudioSetup(void) { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersPresenter.h index 089441171..79fca531b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersPresenter.h @@ -14,20 +14,20 @@ #include "player.h" #include "audio_manager.h" #include "audio_base_type.h" -#include "MusicPlayerSourceView.h" -#include "VolumeSettingView.h" -#include "VolumeSettingPresenter.h" -#include "BluetoothModel.h" -#include "BluetoothEarPhoneView.h" -#include "BluetoothEarListView.h" -#include "BluetoothOptionsView.h" -#include "BluetoothReconnectView.h" -#include "TipsSuccMessageView.h" -#include "TipsConnFailMessageView.h" -#include "TipsFailMessageView.h" -#include "BluetoothDeviceListView.h" -#include "BluetoothItemView.h" -#include "PlayersCaseListAdapter.h" +#include "player/include/MusicPlayerSourceView.h" +#include "main/include/VolumeSettingView.h" +#include "main/include/VolumeSettingPresenter.h" +#include "bluetooth/include/BluetoothModel.h" +#include "bluetooth/include/BluetoothEarPhoneView.h" +#include "bluetooth/include/BluetoothEarListView.h" +#include "bluetooth/include/BluetoothOptionsView.h" +#include "bluetooth/include/BluetoothReconnectView.h" +#include "bluetooth/include/TipsSuccMessageView.h" +#include "bluetooth/include/TipsConnFailMessageView.h" +#include "bluetooth/include/TipsFailMessageView.h" +#include "bluetooth/include/BluetoothDeviceListView.h" +#include "bluetooth/include/BluetoothItemView.h" +#include "player/include/PlayersCaseListAdapter.h" namespace OHOS { using OHOS::Media::Player; using namespace OHOS::Media; @@ -144,6 +144,7 @@ public: bool IsResumed(); bool IsBeginStopped(); bool IsEndStopped(); + bool IsInterruptedPaused(); void OnInterrupt(int32_t type, int32_t hint) override; void PausePlayer(void); void ResumePlayer(void); @@ -157,6 +158,7 @@ private: bool isResumed_{false}; bool isBeginStopped_{false}; bool isEndStopped_{false}; + bool isInterruptedPause_{false}; }; // 滑动手势 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersView.h index b7556ded5..49f62ddb7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersView.h @@ -23,16 +23,15 @@ #include "components/ui_circle_progress.h" #include "components/ui_checkbox.h" #include "components/ui_list.h" - +#include "components/ui_scroll_view.h" +#include "common/image_cache_manager.h" #include "font/ui_font_bitmap.h" #include "font/ui_font.h" #include "graphic_config.h" #include "components/ui_card_page.h" #include "player/include/PlayersPresenter.h" -#include "components/ui_scroll_view.h" -#include "PlayerListDelSongView.h" -#include "common/image_cache_manager.h" -#include "VolumeSettingView.h" +#include "player/include/PlayerListDelSongView.h" +#include "main/include/VolumeSettingView.h" #include "player/include/MusicPlayerSourceView.h" #include "player/include/MusicPlayerBluetoothDisConView.h" #include "player/include/MusicPlayerBTConnectFailedView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/MusicPlayerSourceView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/MusicPlayerSourceView.cpp index c2bfe8a66..65f47c18c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/MusicPlayerSourceView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/MusicPlayerSourceView.cpp @@ -7,7 +7,7 @@ #include "player/include/PlayersView.h" #include "player/include/PlayersModel.h" #include "UiConfig.h" -#include "BluetoothEarPhoneView.h" +#include "bluetooth/include/BluetoothEarPhoneView.h" #include "player/include/PlayersPresenter.h" #include "ui_resource_image.h" #include "ui_resource_string.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/PlayersCaseListAdapter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/PlayersCaseListAdapter.cpp index 84e0b2c6a..c76def7e8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/PlayersCaseListAdapter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/PlayersCaseListAdapter.cpp @@ -5,7 +5,7 @@ * Create: 2021-07-26 */ #include -#include "PlayersCaseListAdapter.h" +#include "player/include/PlayersCaseListAdapter.h" #include "gfx_utils/list.h" #include "player/include/PlayersView.h" #include "player/include/PlayersPresenter.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/PlayersModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/PlayersModel.cpp index f4371a116..119309548 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/PlayersModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/PlayersModel.cpp @@ -18,7 +18,7 @@ #include "cmsis_os.h" #include #include -#include "MainViewSample.h" +#include "main/include/MainViewSample.h" #include "settings/include/SettingModel.h" #include "bluetooth/include/BluetoothHeadsetEvent.h" #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/PlayersPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/PlayersPresenter.cpp index 5b327381b..08487a24f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/PlayersPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/PlayersPresenter.cpp @@ -16,20 +16,20 @@ #include "ui_resource_image.h" #include "player/include/PlayersView.h" #include "player/include/PlayersModel.h" -#include "BluetoothPresenter.h" +#include "bluetooth/include/BluetoothPresenter.h" #include "graphic_service.h" #include "phoneservice/include/PhoneService.h" #include "bts_avrcp_controller.h" #include "bts_avrcp_target.h" -#include +#include "player/include/PlayerListDelSongView.h" #include "ConfigModel.h" #include "ctype.h" #include #include #include "NativeRegisterManager.h" -#include "MainViewSample.h" +#include "main/include/MainViewSample.h" namespace OHOS @@ -993,6 +993,11 @@ bool PlayerInterruptListener::IsPaused() return isPaused_; } +bool PlayerInterruptListener::IsInterruptedPaused() +{ + return isInterruptedPause_; +} + bool PlayerInterruptListener::IsDelayed() { return isDelayed_; @@ -1128,10 +1133,12 @@ void PlayerInterruptListener::OnInterrupt(int32_t type, int32_t hint) WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "[PlayerInterruptListener::] OnInterrupt go in, type %d, hint %d.", type, hint); if (type == INTERRUPT_TYPE_BEGIN && hint == INTERRUPT_HINT_PAUSE) { + isInterruptedPause_ = true; PausePlayer(); } if (type == INTERRUPT_TYPE_END && hint == INTERRUPT_HINT_RESUME) { + isInterruptedPause_ = false; ResumePlayer(); } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/include/RebootAndShutdownPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/include/RebootAndShutdownPresenter.h index 913f1c20c..aff4b44ab 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/include/RebootAndShutdownPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/include/RebootAndShutdownPresenter.h @@ -9,10 +9,12 @@ #ifndef REBOOT_AND_SHUTDOWN_PRESENTER_H #define REBOOT_AND_SHUTDOWN_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "components/ui_slider.h" #include "components/ui_image_animator.h" +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp index 65fabbb77..062ceb534 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp @@ -22,7 +22,7 @@ #include #include "bleService.h" #endif -#include "ui_service.h" +#include "uiservice/include/ui_service.h" #ifdef FD230_650 #include "dial_sos_c.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/include/RebootPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/include/RebootPresenter.h index 8239ee252..38cf1c952 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/include/RebootPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/include/RebootPresenter.h @@ -7,6 +7,7 @@ #ifndef REBOOT_PRESENTER_H #define REBOOT_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "NativeLauncher.h" #include "NativeAbility.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/include/RebootView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/include/RebootView.h index 8627b6232..2019136e9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/include/RebootView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/include/RebootView.h @@ -7,8 +7,8 @@ #define REBOOT_VIEW_H #include "View.h" -#include "ShutdownDeviceView.h" -#include "RebootDeviceView.h" +#include "rebootdevice/include/ShutdownDeviceView.h" +#include "rebootdevice/include/RebootDeviceView.h" #include "components/ui_view_group.h" #include "components/ui_label.h" #include "components/ui_button.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootDeviceView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootDeviceView.cpp index d2777a947..9575f2be4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootDeviceView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootDeviceView.cpp @@ -4,10 +4,11 @@ * Create: 2022-04-28 */ -#include "RebootDeviceView.h" +#include "rebootdevice/include/RebootDeviceView.h" #include "wearable_log.h" #include "UiConfig.h" -#include "RebootPresenter.h" +#include "rebootdevice/include/RebootPresenter.h" +#include "PageTransitionMgr.h" namespace OHOS { static RebootDeviceView *g_pRebootDeviceView{nullptr}; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootModel.cpp index d974582fd..e5d19bc2a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootModel.cpp @@ -4,7 +4,7 @@ * Create: 2022-04-28 */ -#include "RebootModel.h" +#include "rebootdevice/include/RebootModel.h" #include "dfx_reboot.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootPresenter.cpp index 7de3989c3..db26c7b72 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootPresenter.cpp @@ -4,9 +4,9 @@ * Create: 2022-04-28 */ -#include "RebootPresenter.h" -#include "RebootView.h" -#include "RebootModel.h" +#include "rebootdevice/include/RebootPresenter.h" +#include "rebootdevice/include/RebootView.h" +#include "rebootdevice/include/RebootModel.h" #include "drag_event.h" #include "wearable_log.h" #include "NativeRegisterManager.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootView.cpp index efce7f8bf..92fc10698 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/RebootView.cpp @@ -4,11 +4,12 @@ * Create: 2022-04-28 */ -#include "RebootView.h" -#include "RebootModel.h" +#include "rebootdevice/include/RebootView.h" +#include "rebootdevice/include/RebootModel.h" #include "wearable_log.h" #include "UiConfig.h" -#include "RebootPresenter.h" +#include "rebootdevice/include/RebootPresenter.h" +#include "PageTransitionMgr.h" namespace OHOS { static RebootView *g_pRebootView{nullptr}; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/ShutdownDeviceView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/ShutdownDeviceView.cpp index 24ef4ef1f..4f37f2f8b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/ShutdownDeviceView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rebootdevice/src/ShutdownDeviceView.cpp @@ -4,10 +4,11 @@ * Create: 2022-04-28 */ -#include "ShutdownDeviceView.h" +#include "rebootdevice/include/ShutdownDeviceView.h" #include "wearable_log.h" #include "UiConfig.h" -#include "RebootPresenter.h" +#include "rebootdevice/include/RebootPresenter.h" +#include "PageTransitionMgr.h" namespace OHOS { static ShutdownDeviceView *g_pShutdownDeviceView{nullptr}; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/include/RecordingPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/include/RecordingPresenter.h index 936111c15..59f0a36d2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/include/RecordingPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/include/RecordingPresenter.h @@ -9,9 +9,10 @@ #ifndef RECORD_PRESENTER_H #define RECORD_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "RecordingView.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "common/key_code.h" #include "record/include/RecordingModel.h" #include "media_thread_adapt.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/include/RecordingView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/include/RecordingView.h index e2060e80f..362f72b13 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/include/RecordingView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/include/RecordingView.h @@ -10,7 +10,7 @@ #include "View.h" - +#include "common/screen.h" #include "components/ui_view_group.h" #include "components/ui_scroll_view.h" #include "components/ui_label.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordDeleteView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordDeleteView.cpp index b72a336d9..dff833f37 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordDeleteView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/record/src/RecordDeleteView.cpp @@ -4,6 +4,7 @@ #include "wearable_log.h" #include "ui_resource_string.h" #include "ConfigModel.h" +#include "common/screen.h" namespace OHOS { static RecordDeleteView *g_pRecordDeleteView{nullptr}; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/include/RespiratoryTrainingPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/include/RespiratoryTrainingPresenter.h index 913e5fe12..74b8b20d3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/include/RespiratoryTrainingPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/include/RespiratoryTrainingPresenter.h @@ -9,6 +9,7 @@ #ifndef RESPIRATORY_TRAINING_PRESENTER_H #define RESPIRATORY_TRAINING_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/include/RespiratoryTrainingView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/include/RespiratoryTrainingView.h index 19e876350..a8caa3925 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/include/RespiratoryTrainingView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/include/RespiratoryTrainingView.h @@ -11,6 +11,7 @@ #include "View.h" +#include "common/screen.h" #include "components/ui_label_ext.h" #include #include "components/ui_image_animator.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingCompletedView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingCompletedView.cpp index 962b347da..1cff26a9f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingCompletedView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingCompletedView.cpp @@ -12,7 +12,7 @@ #include "respiratorytraining/include/RespiratoryTrainingPresenter.h" #include "common/image_cache_manager.h" #include "respiratorytraining/include/RespiratoryTrainingModel.h" - +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp index eea5598b0..ff2e74b01 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingDurationSelectionView.cpp @@ -12,6 +12,7 @@ #include "UiConfig.h" #include "dock/focus_manager.h" #include "ui_resource_string.h" +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/include/RestoreDefaultsPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/include/RestoreDefaultsPresenter.h index eda2ede58..f28fc79ce 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/include/RestoreDefaultsPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/include/RestoreDefaultsPresenter.h @@ -7,6 +7,7 @@ #ifndef RESTORE_DEFAULTS_PRESENTER_H #define RESTORE_DEFAULTS_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "NativeLauncher.h" #include "NativeAbility.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/include/RestoreDefaultsView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/include/RestoreDefaultsView.h index 18ac59105..3b5c0cec8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/include/RestoreDefaultsView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/include/RestoreDefaultsView.h @@ -8,8 +8,8 @@ #define RESTORE_DEFAULTS_VIEW_H #include "View.h" -#include "RestoreDefaultsPresenter.h" -#include "RestoreSelectView.h" +#include "restoredefaults/include/RestoreDefaultsPresenter.h" +#include "restoredefaults/include/RestoreSelectView.h" #include "AppGroupView.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/include/RestoreSelectView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/include/RestoreSelectView.h index 85861750a..38d75c18b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/include/RestoreSelectView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/include/RestoreSelectView.h @@ -8,7 +8,7 @@ #define RESTORE_SELECT_VIEW_H #include "View.h" -#include "RestoreDefaultsPresenter.h" +#include "restoredefaults/include/RestoreDefaultsPresenter.h" #include "components/ui_label.h" #include "components/ui_button.h" #include "components/ui_view_group.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/src/RestoreDefaultsView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/src/RestoreDefaultsView.cpp index 707c2b7b7..7c5d606d4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/src/RestoreDefaultsView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/src/RestoreDefaultsView.cpp @@ -4,7 +4,7 @@ * Create: 2024-08-12 */ -#include "RestoreDefaultsView.h" +#include "restoredefaults/include/RestoreDefaultsView.h" #include "components/ui_label.h" #include "wearable_log.h" #include "UiConfig.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/src/RestorePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/src/RestorePresenter.cpp index 8fb3a7676..6419a4763 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/src/RestorePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/src/RestorePresenter.cpp @@ -4,9 +4,9 @@ * Create: 2024-08-12 */ -#include "RestoreDefaultsPresenter.h" -#include "RestoreDefaultsView.h" -#include "BluetoothModel.h" +#include "restoredefaults/include/RestoreDefaultsPresenter.h" +#include "restoredefaults/include/RestoreDefaultsView.h" +#include "bluetooth/include/BluetoothModel.h" #include "bts_br_gap.h" #include "drag_event.h" #include "cmsis_os.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/src/RestoreSelectView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/src/RestoreSelectView.cpp index 9c04748d0..fa00339a1 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/src/RestoreSelectView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/restoredefaults/src/RestoreSelectView.cpp @@ -3,10 +3,11 @@ * Description: RestoreSelect View * Create: 2024-08-12 */ -#include "RestoreSelectView.h" +#include "restoredefaults/include/RestoreSelectView.h" #include "wearable_log.h" #include "UiConfig.h" -#include "RestoreDefaultsPresenter.h" +#include "restoredefaults/include/RestoreDefaultsPresenter.h" +#include "PageTransitionMgr.h" namespace OHOS { static RestoreSelectView *g_pRestoreSelectView { nullptr }; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rtcservice/include/RtcService.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rtcservice/include/RtcService.h index bbda60eb4..4b315a28c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rtcservice/include/RtcService.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rtcservice/include/RtcService.h @@ -10,7 +10,7 @@ #include "service.h" #include "iunknown.h" #include "broadcast_feature.h" -#include "AlarmClockManage.h" +#include "alarmclockmanage/include/AlarmClockManage.h" #ifdef __cplusplus extern "C" { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rtcservice/src/RtcService.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rtcservice/src/RtcService.cpp index bd99bcdb1..aea50973c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/rtcservice/src/RtcService.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/rtcservice/src/RtcService.cpp @@ -14,8 +14,8 @@ #include "securec.h" #include "broadcast_service.h" -#include "AlmmgrAlarmClockManage.h" -#include "RtcService.h" +#include "alarmclockmanage/include/AlmmgrAlarmClockManage.h" +#include "rtcservice/include/RtcService.h" #ifdef __cplusplus extern "C" { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/include/SafeModeManagerPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/include/SafeModeManagerPresenter.h index 7af8ea908..b96ae95ea 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/include/SafeModeManagerPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/include/SafeModeManagerPresenter.h @@ -3,6 +3,7 @@ #ifndef _SafeModeManager_PRESENTER_H #define _SafeModeManager_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "SafeModeManagerView.h" #include "ModelListenerSample.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/src/SafeModeManagerPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/src/SafeModeManagerPresenter.cpp index 7890a98ec..c7b91c640 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/src/SafeModeManagerPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/safemodemanager/src/SafeModeManagerPresenter.cpp @@ -1,6 +1,6 @@ #if 0 #include "AppViewIDs.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "NativeAbility.h" #include "common/key_code.h" #include "components/ui_label_ext.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveBatPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveBatPresenter.h index 9b02bd006..6fb489686 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveBatPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveBatPresenter.h @@ -8,12 +8,13 @@ #ifndef _SAVEBAT_PRESENTER_H #define _SAVEBAT_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "saveele/include/SaveBatPresenter.h" #include "saveele/include/SaveEleModel.h" #include "saveele/include/SaveBatView.h" #include "ModelListenerSample.h" -#include "MainModel.h" +#include "main/include/MainModel.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveBatView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveBatView.h index 149604c00..7e014077d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveBatView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveBatView.h @@ -33,6 +33,7 @@ #include "components/ui_canvas_ext.h" #include "components/ui_label_button.h" #include "hal_tick.h" +#include "common/screen.h" namespace OHOS { enum class countStage diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveElePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveElePresenter.h index 6bc3ae99d..533a351fd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveElePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/include/SaveElePresenter.h @@ -8,6 +8,7 @@ #ifndef _SAVEELE_PRESENTER_H #define _SAVEELE_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "SaveEleView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp index c8594f125..b679c0de8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveBatPresenter.cpp @@ -1,7 +1,7 @@ #include "AppViewIDs.h" -#include "KeyInputListener.h" -#include "MainModel.h" +#include "key/include/KeyInputListener.h" +#include "main/include/MainModel.h" #include "NativeAbility.h" #include "common/key_code.h" #include "cmsis_os.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp index bc9ac10da..d69267416 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/saveele/src/SaveElePresenter.cpp @@ -1,6 +1,6 @@ #include "AppViewIDs.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "NativeAbility.h" #include "common/key_code.h" #include "components/ui_label_ext.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/ScheduleListAdapter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/ScheduleListAdapter.h index e60be8630..a2cc40b38 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/ScheduleListAdapter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/ScheduleListAdapter.h @@ -6,7 +6,7 @@ #include "components/abstract_adapter.h" #include "schedule/include/ScheduleModel.h" #include "schedule/include/ScheduleListItem.h" - +#include namespace OHOS { @@ -25,7 +25,7 @@ namespace OHOS void SetItemClickListener(UIView::OnClickListener *itemClickListener); private: - List nodeList_; + std::list nodeList_; UIView::OnClickListener * itemClickListener_; }; } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/SchedulePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/SchedulePresenter.h index a4e9ed1e7..12a83ef8a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/SchedulePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/include/SchedulePresenter.h @@ -2,6 +2,7 @@ #ifndef __SCHEDULEPRESENTER_H__ #define __SCHEDULEPRESENTER_H__ +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/ScheduleListAdapter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/ScheduleListAdapter.cpp index 83e52d74f..8ebd83573 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/ScheduleListAdapter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/schedule/src/ScheduleListAdapter.cpp @@ -13,7 +13,7 @@ namespace OHOS ScheduleListAdapter::~ScheduleListAdapter() { p_ScheduleListAdapterInstance = nullptr; - nodeList_.Clear(); + nodeList_.clear(); } ScheduleListAdapter * ScheduleListAdapter::GetInstance() @@ -24,16 +24,16 @@ namespace OHOS UIView * ScheduleListAdapter::GetView(UIView * inView, int16_t index) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:GetView,%d", __LINE__, index); - if(nodeList_.IsEmpty() || nodeList_.Size() <= index || 0 > index) + if(nodeList_.empty() || nodeList_.size() <= index || 0 > index) { return nullptr; } ScheduleListItem * item = nullptr; - ListNode * node = nodeList_.Begin(); + std::list::iterator node = nodeList_.begin(); for (uint16_t i = 0; i < index; i++) { - node = node->next_; + node++; } if (nullptr == inView) @@ -52,11 +52,11 @@ namespace OHOS if (item != nullptr) { item->SetViewIndex(index); - item->ResetItemStyle(node->data_); - item->SetItemInfo(node->data_); + item->ResetItemStyle(*node); + item->SetItemInfo(*node); item->SetOnClickListener(itemClickListener_); } - if(nodeList_.Size() > 2 && index == nodeList_.Size() - 1) + if(nodeList_.size() > 2 && index == nodeList_.size() - 1) item->ResetHeight(true); else item->ResetHeight(false); @@ -66,18 +66,18 @@ namespace OHOS uint16_t ScheduleListAdapter::GetCount() { - return nodeList_.Size(); + return nodeList_.size(); } void ScheduleListAdapter::AddListItem(const ScheduleListItemInfo &item) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[%d]:AddListItem", __LINE__); - nodeList_.PushBack(item); + nodeList_.push_back(item); } void ScheduleListAdapter::ClearListItem(void) { - nodeList_.Clear(); + nodeList_.clear(); } void ScheduleListAdapter::SetItemClickListener(UIView::OnClickListener *itemClickListener) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp index 307f99e0f..c75a42ce2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp @@ -10,8 +10,8 @@ #include "power_display_service.h" #include "NativeAbility.h" #include "AppViewIDs.h" -#include "MainViewSample.h" -#include "ui_screennotify.h" +#include "main/include/MainViewSample.h" +#include "screennotify/include/ui_screennotify.h" #include "components/root_view.h" #include "notification_manager.h" #include "DialBinTypesV2.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/screensetting/src/ScreenModels.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/screensetting/src/ScreenModels.cpp index 82d584980..31f4d7794 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/screensetting/src/ScreenModels.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/screensetting/src/ScreenModels.cpp @@ -13,7 +13,7 @@ #include #include "kvstore_env.h" #include "kv_store.h" -#include "ScreenModels.h" +#include "screensetting/include/ScreenModels.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/set_aod/include/SetAodDialPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/include/SetAodDialPresenter.h index 4192e0e0e..72ac0bf87 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/include/SetAodDialPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/include/SetAodDialPresenter.h @@ -1,6 +1,7 @@ #ifndef SET_DIAL_AOD_PRESENTER_H #define SET_DIAL_AOD_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "components/ui_toggle_button.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/include/SetAodDialView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/include/SetAodDialView.h index a65cdc15e..74211c1c0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/include/SetAodDialView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/include/SetAodDialView.h @@ -7,6 +7,7 @@ #include "components/ui_label_ext.h" #include "components/ui_image_view.h" #include "components/ui_toggle_button.h" +#include "common/screen.h" namespace OHOS { class SetAodDialPresenter; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialPresenter.cpp index d8466564b..0066e65bc 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialPresenter.cpp @@ -9,7 +9,7 @@ #include "custom_runtime.h" #include "NativeRegisterManager.h" -#include "MainModel.h" +#include "main/include/MainModel.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp index 8f32943c5..af6a6a58e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_aod/src/SetAodDialView.cpp @@ -4,7 +4,7 @@ #include "ConfigModel.h" #include #include -#include "MainModel.h" +#include "main/include/MainModel.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardAdapter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardAdapter.h index 75b9ba8d0..75c1822bd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardAdapter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardAdapter.h @@ -17,7 +17,7 @@ #include "components/abstract_adapter.h" #include "UiConfig.h" #include "wearable_log.h" -#include "SetCardItem.h" +#include "set_card/include/SetCardItem.h" namespace OHOS { class SetCardAdapter : public AbstractAdapter { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardDeleteView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardDeleteView.h index 6abfe4ee1..b3915c0c6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardDeleteView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardDeleteView.h @@ -9,7 +9,7 @@ #define SET_CARD_DELETE_VIEW_H #include "components/ui_label_button.h" -#include "SetCardPresenter.h" +#include "set_card/include/SetCardPresenter.h" namespace OHOS { class SetCardDeleteView : public UIViewGroup { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardItem.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardItem.h index 3926d9357..3a9936bb4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardItem.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardItem.h @@ -13,7 +13,7 @@ #include "components/ui_view.h" #include "components/ui_view_group.h" #include "components/ui_image_view.h" -#include "MainModel.h" +#include "main/include/MainModel.h" #include "UiConfig.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardModel.h index 43ed70b26..96de2b271 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardModel.h @@ -12,8 +12,8 @@ #include #include "AppViewIDs.h" #include "UiConfig.h" -#include "SetCardPresenter.h" -#include "SetCardItem.h" +#include "set_card/include/SetCardPresenter.h" +#include "set_card/include/SetCardItem.h" namespace OHOS { class SetCardModel { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardNoCardView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardNoCardView.h index dc8ee1226..4b02b853c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardNoCardView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardNoCardView.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_label_button.h" -#include "SetCardPresenter.h" +#include "set_card/include/SetCardPresenter.h" namespace OHOS { class SetCardNoCardView : public UIViewGroup { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardPresenter.h index 716ee877d..5c711a653 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardPresenter.h @@ -14,10 +14,11 @@ #ifndef SET_CARD_PRESENTER_H #define SET_CARD_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "components/ui_list.h" #include "components/ui_view.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "ModelListenerSample.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardView.h index ec161ca2f..32b60a9a5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetCardView.h @@ -17,10 +17,10 @@ #include "ChangeSliceListener.h" #include "UiConfig.h" -#include "SetCardAdapter.h" -#include "SetCardModel.h" -#include "SetCardDeleteView.h" -#include "SetCardNoCardView.h" +#include "set_card/include/SetCardAdapter.h" +#include "set_card/include/SetCardModel.h" +#include "set_card/include/SetCardDeleteView.h" +#include "set_card/include/SetCardNoCardView.h" namespace OHOS { class SetCardPresenter; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetMainView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetMainView.h index f76e5f8a0..02d28b378 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetMainView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/include/SetMainView.h @@ -19,7 +19,7 @@ #include "components/ui_image_animator.h" #include "components/ui_label_button_ext.h" #include "components/ui_card_page.h" -#include "SetCardPresenter.h" +#include "set_card/include/SetCardPresenter.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardAdapter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardAdapter.cpp index badbc10dc..2af84eae3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardAdapter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardAdapter.cpp @@ -5,7 +5,7 @@ * Create: 2021-09-18 */ -#include "SetCardAdapter.h" +#include "set_card/include/SetCardAdapter.h" namespace OHOS { SetCardAdapter::SetCardAdapter() {} diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardDeleteView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardDeleteView.cpp index 195276e5f..6b062dc55 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardDeleteView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardDeleteView.cpp @@ -8,7 +8,8 @@ #include "UiConfig.h" #include #include "cmsis_os.h" -#include "SetCardDeleteView.h" +#include "set_card/include/SetCardDeleteView.h" +#include "wearable_log.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardItem.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardItem.cpp index 4bdd7ba98..0afe7498e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardItem.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardItem.cpp @@ -1,5 +1,5 @@ -#include "SetCardItem.h" -#include "SetCardPresenter.h" +#include "set_card/include/SetCardItem.h" +#include "set_card/include/SetCardPresenter.h" #include "wearable_log.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardModel.cpp index 4f32dbc69..508854aaa 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardModel.cpp @@ -5,8 +5,8 @@ * Create: 2021-11-23 */ -#include "SetCardModel.h" -#include "MainModel.h" +#include "set_card/include/SetCardModel.h" +#include "main/include/MainModel.h" #include "kv_store.h" #include "securec.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardNoCardView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardNoCardView.cpp index 5ea913301..d469f0a4c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardNoCardView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardNoCardView.cpp @@ -8,7 +8,8 @@ #include "UiConfig.h" #include #include "cmsis_os.h" -#include "SetCardNoCardView.h" +#include "set_card/include/SetCardNoCardView.h" +#include "wearable_log.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp index 278895807..19b923946 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardPresenter.cpp @@ -5,9 +5,9 @@ * Create: 2021-11-23 */ -#include "SetCardView.h" -#include "SetCardModel.h" -#include "SetCardPresenter.h" +#include "set_card/include/SetCardView.h" +#include "set_card/include/SetCardModel.h" +#include "set_card/include/SetCardPresenter.h" #include "hal_tick.h" #include "NativeRegisterManager.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardView.cpp index e48b69eed..89e76c83b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetCardView.cpp @@ -6,8 +6,8 @@ */ #include -#include "SetCardView.h" -#include "SetCardPresenter.h" +#include "set_card/include/SetCardView.h" +#include "set_card/include/SetCardPresenter.h" namespace OHOS { SetCardView::SetCardView():contentList_(UIList::HORIZONTAL) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetMainView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetMainView.cpp index 68f87a55a..8c11acde6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetMainView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_card/src/SetMainView.cpp @@ -23,13 +23,12 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" -#include "MainViewSample.h" +#include "main/include/MainViewSample.h" #include "components/ui_view_group.h" #include "UiConfig.h" #include "uicomponents/UIComponents.h" -#include "MainPresenterSample.h" -#include "SetCardPresenter.h" -#include "MainPresenterSample.h" +#include "set_card/include/SetCardPresenter.h" +#include "main/include/MainPresenterSample.h" namespace OHOS { static SetMainView *g_pSetMainView{nullptr}; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/include/SetDesktopPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/include/SetDesktopPresenter.h index 93c05876e..b098142bb 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/include/SetDesktopPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/include/SetDesktopPresenter.h @@ -8,6 +8,7 @@ #ifndef SET_DESKTOP_PRESENTER_H #define SET_DESKTOP_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "components/ui_view.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/src/SetDesktopModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/src/SetDesktopModel.cpp index 25c23a40e..fb6243278 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/src/SetDesktopModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/src/SetDesktopModel.cpp @@ -5,7 +5,7 @@ * Create: 2021-11-23 */ -#include "SetDesktopModel.h" +#include "set_desktop/include/SetDesktopModel.h" #include "kv_store.h" #include "securec.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/src/SetDesktopPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/src/SetDesktopPresenter.cpp index 68b000b03..ab8f0bd55 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/src/SetDesktopPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/src/SetDesktopPresenter.cpp @@ -5,9 +5,9 @@ * Create: 2021-11-23 */ -#include "SetDesktopView.h" -#include "SetDesktopModel.h" -#include "SetDesktopPresenter.h" +#include "set_desktop/include/SetDesktopView.h" +#include "set_desktop/include/SetDesktopModel.h" +#include "set_desktop/include/SetDesktopPresenter.h" #include "NativeRegisterManager.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/src/SetDesktopView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/src/SetDesktopView.cpp index 2a661577c..69bc411b5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/src/SetDesktopView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_desktop/src/SetDesktopView.cpp @@ -6,10 +6,12 @@ */ #include -#include "SetDesktopView.h" -#include "SetDesktopPresenter.h" +#include "set_desktop/include/SetDesktopView.h" +#include "set_desktop/include/SetDesktopPresenter.h" #include "components/ui_scroll_view_nested.h" +#include "common/screen.h" +#include "PageTransitionMgr.h" namespace OHOS { SetDesktopView::SetDesktopView() { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialPresenter.h index b65627a37..b7ad59e2d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialPresenter.h @@ -14,11 +14,12 @@ #ifndef SET_DIAL_PRESENTER_H #define SET_DIAL_PRESENTER_H #include "SetDialInfo.h" -#include "SetDialModel.h" +#include "set_dial/include/SetDialModel.h" +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "components/ui_view.h" #include "components/ui_roller_view.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "ModelListenerSample.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialView.h index e2de873f5..d9080cb3d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialView.h @@ -22,7 +22,7 @@ #include "ChangeSliceListener.h" #include "UiConfig.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" namespace OHOS { static constexpr uint8_t DIVISOR_TWO = 2; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp index b4a31e5af..59b192b03 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialModel.cpp @@ -1,6 +1,6 @@ #include "set_dial/include/SetDialModel.h" #include "DialBinParser.h" -#include "MainModel.h" +#include "main/include/MainModel.h" #include "NativeAbility.h" #ifdef SUPPORT_BLE_SERVICE #include "bleEvent.h" @@ -623,8 +623,10 @@ int32_t SetDialModel::ParseDialHeader(int type, const std::string &dialFileName, return -1; } DialPreviewInfo preInfo{0}; - bool ret = - DialBinParserManager::GetInstance()->GetDialPreviewInfo(fp, &preInfo); + bool ret = false; + #ifdef FD230_650_0723 + ret = DialBinParserManager::GetInstance()->GetDialPreviewInfo(fp, &preInfo); + #endif if (!ret) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetDialPreviewInfo %s fail", dialFullName.c_str()); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp index a23202462..551a0d8f7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp @@ -11,11 +11,11 @@ * Create: 2021-11-23 */ -#include "SetDialView.h" -#include "SetDialModel.h" -#include "SetDialPresenter.h" +#include "set_dial/include/SetDialView.h" +#include "set_dial/include/SetDialModel.h" +#include "set_dial/include/SetDialPresenter.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" #ifdef SUPPORT_BLE_SERVICE diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialView.cpp index 45421f72b..9f1e776a9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/src/SetDialView.cpp @@ -6,9 +6,10 @@ */ #include -#include "SetDialView.h" -#include "SetDialPresenter.h" -#include "SetDialStyleModel.h" +#include "set_dial/include/SetDialView.h" +#include "set_dial/include/SetDialPresenter.h" +#include "set_dial_style/include/SetDialStyleModel.h" +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/include/SetDialStyleModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/include/SetDialStyleModel.h index 042c7c09f..e6b5e3d25 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/include/SetDialStyleModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/include/SetDialStyleModel.h @@ -2,7 +2,7 @@ #ifndef SET_DIAL_STYLE_MODEL_H #define SET_DIAL_STYLE_MODEL_H -#include "SetDialView.h" +#include "set_dial/include/SetDialView.h" #include "components/ui_view.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/include/SetDialStylePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/include/SetDialStylePresenter.h index 8ab128880..2a0955ecb 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/include/SetDialStylePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/include/SetDialStylePresenter.h @@ -1,8 +1,9 @@ #ifndef SET_DIAL_STYLE_PRESENTER_H #define SET_DIAL_STYLE_PRESENTER_H -#include "SetDialView.h" +#include "set_dial/include/SetDialView.h" #include "components/ui_view.h" +#include "key/include/KeyInputListener.h" #include "Presenter.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/include/SetDialStyleView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/include/SetDialStyleView.h index 8f6852e39..4b3476cd8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/include/SetDialStyleView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/include/SetDialStyleView.h @@ -6,7 +6,7 @@ #include "components/ui_view_group.h" #include "components/ui_toggle_button.h" #include "components/ui_button.h" -#include "SetDialView.h" +#include "set_dial/include/SetDialView.h" #include "components/ui_label_ext.h" #include "components/ui_image_view.h" #include "View.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/src/SetDialStyleModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/src/SetDialStyleModel.cpp index cd62e2026..3ad89c20d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/src/SetDialStyleModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/src/SetDialStyleModel.cpp @@ -1,5 +1,5 @@ -#include "SetDialStyleModel.h" +#include "set_dial_style/include/SetDialStyleModel.h" #include "kv_store.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/src/SetDialStylePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/src/SetDialStylePresenter.cpp index e1e0edb76..48e9320cf 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/src/SetDialStylePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/src/SetDialStylePresenter.cpp @@ -1,9 +1,9 @@ -#include "SetDialStyleView.h" -#include "SetDialStyleModel.h" -#include "SetDialStylePresenter.h" +#include "set_dial_style/include/SetDialStyleView.h" +#include "set_dial_style/include/SetDialStyleModel.h" +#include "set_dial_style/include/SetDialStylePresenter.h" #include "NativeRegisterManager.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/src/SetDialStyleView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/src/SetDialStyleView.cpp index 2ba3b2982..d0fc99191 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/src/SetDialStyleView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial_style/src/SetDialStyleView.cpp @@ -1,11 +1,12 @@ -#include "SetDialStyleView.h" -#include "SetDialStyleModel.h" -#include "SetDialStylePresenter.h" +#include "set_dial_style/include/SetDialStyleView.h" +#include "set_dial_style/include/SetDialStyleModel.h" +#include "set_dial_style/include/SetDialStylePresenter.h" #include "UiConfig.h" #include "ui_resource_string.h" -#include "MainModel.h" +#include "main/include/MainModel.h" +#include "PageTransitionMgr.h" namespace OHOS { SetDialStyleView::SetDialStyleView() diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/include/SetTimeFormatPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/include/SetTimeFormatPresenter.h index dd91b3272..086b1918d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/include/SetTimeFormatPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/include/SetTimeFormatPresenter.h @@ -4,6 +4,7 @@ #define SET_TimeFormat_PRESENTER_H #include "components/ui_view.h" +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "set_time_format/include/SetTimeFormatModel.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatPresenter.cpp index 1da95d3d1..c2d7f1537 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatPresenter.cpp @@ -3,7 +3,7 @@ #include "set_time_format/include/SetTimeFormatModel.h" #include "set_time_format/include/SetTimeFormatView.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "common/key_code.h" #include "custom_utils.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatView.cpp index abb5ca54c..7487cdb9e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_time_format/src/SetTimeFormatView.cpp @@ -13,6 +13,7 @@ #include "UiConfig.h" #include "ui_resource_string.h" #include "components/ui_scroll_view.h" +#include "wearable_log.h" namespace OHOS { SetTimeFormatView::SetTimeFormatView() {} diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/include/SettingAdapter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/include/SettingAdapter.h index 7efd6af1a..69a2ff93b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/include/SettingAdapter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/include/SettingAdapter.h @@ -18,7 +18,7 @@ #include "components/abstract_adapter.h" #include "wearable_log.h" #include "UiConfig.h" -#include "SettingModel.h" +#include "settings/include/SettingModel.h" #include "SettingItemView.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/include/SettingItemView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/include/SettingItemView.h index 82e1797c1..284800f64 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/include/SettingItemView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/include/SettingItemView.h @@ -17,7 +17,7 @@ #include "components/ui_view_group.h" #include "UiConfig.h" -#include "SettingModel.h" +#include "settings/include/SettingModel.h" #include "components/ui_label_button_ext.h" #include "components/ui_label_ext.h" #include "components/ui_image_view.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/include/SettingPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/include/SettingPresenter.h index 5f0ba2339..dbc767f4d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/include/SettingPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/include/SettingPresenter.h @@ -8,6 +8,7 @@ #ifndef SETTING_PRESENTER_H #define SETTING_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "components/ui_view.h" #include "View.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingModel.cpp index bd3dcd364..136b2aaff 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingModel.cpp @@ -11,9 +11,8 @@ #include "classicbluetooth/include/BluetoothServiceOptionsView.h" #include "player/include/PlayersView.h" #include "player/include/PlayersModel.h" -#include "PhoneService.h" #include "phoneservice/include/PhoneService.h" -#include "BluetoothModel.h" +#include "bluetooth/include/BluetoothModel.h" #include "player/include/MusicPlayerSourceView.h" extern "C" { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingView.cpp index f67b80df0..da278de0b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/settings/src/SettingView.cpp @@ -11,6 +11,7 @@ #include "settings/include/SettingItem.h" #include "settings/include/SettingPresenter.h" #include "ui_resource_string.h" +#include "common/screen.h" namespace OHOS { /* ---------------------------------- 设置标签 ---------------------------------- */ diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/include/SleepControlPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/include/SleepControlPresenter.h index 29cfd42be..998b9746f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/include/SleepControlPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/include/SleepControlPresenter.h @@ -8,6 +8,7 @@ #ifndef Sleep_CONTROL_PRESENTER_H #define Sleep_CONTROL_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "sleep/include/SleepView.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 5ab70e54a..a8fe634bb 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 @@ -34,7 +34,7 @@ #include #include "ConfigModelC.h" -#include "MainModel.h" +#include "main/include/MainModel.h" #include "broadcast_feature.h" #include "broadcast_service.h" #include "cmsis_os.h" @@ -43,7 +43,7 @@ #include "power_display_service.h" #include "sleep/include/SleepModelC.h" #include "thread_adapter.h" -#include "ui_service.h" +#include "uiservice/include/ui_service.h" #include #include diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/include/SleepModePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/include/SleepModePresenter.h index b33b33874..f116f6d82 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/include/SleepModePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/include/SleepModePresenter.h @@ -2,6 +2,7 @@ #ifndef __SLEEPMODEPRESENTER_H__ #define __SLEEPMODEPRESENTER_H__ +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "sleepmode/include/SleepModeView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModeModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModeModel.cpp index 2883400b1..34ca6a34b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModeModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/sleepmode/src/SleepModeModel.cpp @@ -2,11 +2,11 @@ #include "sleepmode/include/SleepModeModel.h" #include "main/include/MainViewSample.h" #include "main/include/dropdown/DropDownCardPage1.h" -#include "MainModel.h" +#include "main/include/MainModel.h" #include "ConfigModel.h" #include "custom_runtime.h" #include "custom_utils.h" -#include "ui_service.h" +#include "uiservice/include/ui_service.h" #include "ConfigModelC.h" #include "power_display_service.h" #ifdef SUPPORT_CYWEE_SERVICE diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/include/CallVolumePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/include/CallVolumePresenter.h index e330b9e44..15c8c5d65 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/include/CallVolumePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/include/CallVolumePresenter.h @@ -8,6 +8,7 @@ #ifndef CALL_VOLUME_PRESENTER_H #define CALL_VOLUME_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "CallVolumeView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/include/SoundAndVibrationPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/include/SoundAndVibrationPresenter.h index 19c6c8ac9..645da4dd5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/include/SoundAndVibrationPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/include/SoundAndVibrationPresenter.h @@ -8,6 +8,7 @@ #ifndef SOUND_AND_VIBRATION_PRESENTER_H #define SOUND_AND_VIBRATION_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "SoundAndVibrationView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/include/SystemVolumePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/include/SystemVolumePresenter.h index 40cda0855..d19bc7e07 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/include/SystemVolumePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/include/SystemVolumePresenter.h @@ -8,6 +8,7 @@ #ifndef SYSTEM_VOLUME_PRESENTER_H #define SYSTEM_VOLUME_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "SystemVolumeView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationView.cpp index e40f3f078..e6b678f45 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationView.cpp @@ -11,6 +11,7 @@ #include "wearable_log.h" #include "ui_resource_string.h" #include +#include "common/screen.h" /* 按优先级分为 1.系统音量 diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp index ca30ca5cb..f98a117d6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp @@ -2,6 +2,7 @@ #include "soundandvibration/include/SoundAndVibrationVolumeSettingPresenter.h" #include "wearable_log.h" #include "ConfigModel.h" +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/include/MainStopWatchPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/include/MainStopWatchPresenter.h index 1152b15bd..b873b5119 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/include/MainStopWatchPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/include/MainStopWatchPresenter.h @@ -8,6 +8,7 @@ #ifndef MAIN_STOPWATCH_PRESENTER_H #define MAIN_STOPWATCH_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "MainStopWatchView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchView.cpp index 1f39e561d..f1e63c0fd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/stopwatch/src/MainStopWatchView.cpp @@ -4,6 +4,7 @@ #include "NativeAbility.h" #include "AppViewIDs.h" #include "wearable_log.h" +#include "common/screen.h" /*秒表主视图*/ namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/include/SystemPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/include/SystemPresenter.h index 63c3ef8d1..9df11ba95 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/include/SystemPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/include/SystemPresenter.h @@ -9,11 +9,12 @@ #ifndef SYSTEM_PRESENTER_H #define SYSTEM_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "SystemView.h" #include "system/include/SystemModel.h" #include "components/ui_radio_button.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #ifdef SUPPORT_CAT1_SERVICE #include "cat1_ctl.h" #endif diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp index 5c0cffda1..7d65c2d61 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp @@ -4,6 +4,7 @@ #include "custom_utils.h" #include "ConfigModel.h" #include "ui_resource_string.h" +#include "common/screen.h" #define WATCH_ABOUT_TITLE_HEIGHT 50 #define WATCH_ABOUT_VALUE_HEIGHT 80 @@ -135,7 +136,6 @@ namespace OHOS delete APNprotocol; APNprotocol = nullptr; - FocusManager::GetInstance()->ClearFocus(); delete SystemAboutTheWatchScrollView; SystemAboutTheWatchScrollView = nullptr; } @@ -193,8 +193,7 @@ namespace OHOS SystemAboutTheWatchScrollView->SetThrowDrag(true); SystemAboutTheWatchScrollView->SetMaxScrollDistance(1000); SystemAboutTheWatchScrollView->SetSwipeACCLevel(200); /*设置手指抬起屏幕后的补偿距离。*/ - FocusManager::GetInstance()->RequestFocus(SystemAboutTheWatchScrollView); - FocusManager::GetInstance()->RequestFocusByDirection(FOCUS_DIRECTION_UP); + SystemAboutTheWatchScrollView->RequestFocus(); SystemAboutTheWatchScrollView->SetRotateFactor(1.0); UIView::OnDragListener *draglistener = static_cast(SystemPresenter::GetInstance()); if (draglistener == nullptr) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemFactoryResetView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemFactoryResetView.cpp index e8553e70a..ef378635f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemFactoryResetView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemFactoryResetView.cpp @@ -3,6 +3,7 @@ #include "wearable_log.h" #include "UiConfig.h" #include "ui_resource_string.h" +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemRestart.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemRestart.cpp index 4efd295b4..b30faedd5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemRestart.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemRestart.cpp @@ -9,6 +9,8 @@ #include "system/include/SystemPresenter.h" #include "ui_resource_string.h" #include "UiConfig.h" +#include "wearable_log.h" +#include "common/screen.h" namespace OHOS { SystemRestart::SystemRestart() diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemShutdown.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemShutdown.cpp index 3d407ca48..1d335ff65 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemShutdown.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemShutdown.cpp @@ -9,6 +9,8 @@ #include "UiConfig.h" #include "system/include/SystemPresenter.h" #include "ui_resource_string.h" +#include "wearable_log.h" +#include "common/screen.h" namespace OHOS { SystemShutdown::SystemShutdown() diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemSuperviseView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemSuperviseView.cpp index 79cbfc0ea..e7abb2637 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemSuperviseView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemSuperviseView.cpp @@ -1,6 +1,7 @@ #include "system/include/SystemSuperviseView.h" #include "system/include/SystemPresenter.h" #include "wearable_log.h" +#include "common/screen.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemView.cpp index 9e5796db9..5c275adf7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemView.cpp @@ -10,7 +10,7 @@ #include "battery_hal.h" #include "UiConfig.h" - +#include "common/screen.h" #include "ui_resource_string.h" @@ -274,8 +274,7 @@ namespace OHOS SystemScrollView[SYSTEMVIEW]->SetThrowDrag(true); // 设置手指抬起屏幕后是否继续滚动。 SystemScrollView[SYSTEMVIEW]->SetMaxScrollDistance(1000); // 设置手指抬起屏幕后的最大滚动距离。 SystemScrollView[SYSTEMVIEW]->SetSwipeACCLevel(200); /*设置手指抬起屏幕后的补偿距离。*/ - FocusManager::GetInstance()->RequestFocus(SystemScrollView[SYSTEMVIEW]); - FocusManager::GetInstance()->RequestFocusByDirection(FOCUS_DIRECTION_UP); + SystemScrollView[SYSTEMVIEW]->RequestFocus(); SystemScrollView[SYSTEMVIEW]->SetRotateFactor(1.0); SystemScrollView[SYSTEMVIEW]->SetOnDragListener(presenter_); SystemScrollView[SYSTEMVIEW]->SetTouchable(true); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/systemupdate/include/SystemUpdatePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/systemupdate/include/SystemUpdatePresenter.h index 45ab33630..6b81c5c72 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/systemupdate/include/SystemUpdatePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/systemupdate/include/SystemUpdatePresenter.h @@ -9,6 +9,7 @@ #ifndef SYSTEM_UPDATE_PRESENTER_H #define SYSTEM_UPDATE_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/systemupdate/src/SystemUpdateView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/systemupdate/src/SystemUpdateView.cpp index e83571189..7f790f42d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/systemupdate/src/SystemUpdateView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/systemupdate/src/SystemUpdateView.cpp @@ -34,6 +34,7 @@ #endif #include "bts_le_gap.h" #include "custom_http_download.h" +#include "common/screen.h" #ifdef __cplusplus #if __cplusplus diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/include/TakephotosPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/include/TakephotosPresenter.h index 5353abf6d..0d4008383 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/include/TakephotosPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/include/TakephotosPresenter.h @@ -1,6 +1,7 @@ #ifndef _Takephotos_PRESENTER_H #define _Takephotos_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TakephotosView.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosPresenter.cpp index e0d584d7b..06a7c0f5a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/takephotos/src/TakephotosPresenter.cpp @@ -15,7 +15,7 @@ #include "uicomponents/UIComponents.h" #include "common/key_code.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "takephotos/include/TakephotosPresenter.h" #include "takephotos/include/TakephotosModel.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempClickMea.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempClickMea.h index 7756ff74e..9197eb9f9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempClickMea.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempClickMea.h @@ -11,7 +11,7 @@ #include "components/ui_label.h" #include "components/ui_label_button.h" #include "components/ui_scroll_view.h" -#include "TempPresenter.h" +#include "temperature/include/TempPresenter.h" namespace OHOS { class TempClickMea : public UIScrollView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempContinueWarn.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempContinueWarn.h index c6aca9ea1..841c3f7f6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempContinueWarn.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempContinueWarn.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_view_group.h" -#include "TempPresenter.h" +#include "temperature/include/TempPresenter.h" namespace OHOS { class TempContinueWarn : public UIViewGroup { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempExitInter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempExitInter.h index 81df8141b..c709523d8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempExitInter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempExitInter.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "AppGroupView.h" -#include "TempPresenter.h" +#include "temperature/include/TempPresenter.h" namespace OHOS { class TempExitInter : public AppGroupView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempExitPrompt.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempExitPrompt.h index 63543772d..a0ec7255b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempExitPrompt.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempExitPrompt.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_scroll_view.h" -#include "TempPresenter.h" +#include "temperature/include/TempPresenter.h" namespace OHOS { class TempExitPrompt : public UIScrollView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempInitInter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempInitInter.h index 6de798213..30781c5a0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempInitInter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempInitInter.h @@ -12,7 +12,7 @@ #include "components/ui_label.h" #include "components/ui_label_button.h" #include "AppGroupView.h" -#include "TempPresenter.h" +#include "temperature/include/TempPresenter.h" namespace OHOS { class TempInitInter : public AppGroupView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempJoinStudy.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempJoinStudy.h index 6aec60c0b..71bbec5dd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempJoinStudy.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempJoinStudy.h @@ -11,7 +11,7 @@ #include "components/ui_label.h" #include "components/ui_label_button.h" #include "components/ui_scroll_view.h" -#include "TempPresenter.h" +#include "temperature/include/TempPresenter.h" namespace OHOS { class TempJoinStudy : public UIScrollView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempLittleTip.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempLittleTip.h index 49320fcff..7f34df36e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempLittleTip.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempLittleTip.h @@ -10,7 +10,7 @@ #include "components/ui_label.h" #include "components/ui_scroll_view.h" -#include "TempPresenter.h" +#include "temperature/include/TempPresenter.h" namespace OHOS { class TempLittleTip : public UIScrollView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempMainView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempMainView.h index 2b3448138..b6fa4453e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempMainView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempMainView.h @@ -13,22 +13,22 @@ #include "components/ui_view_group.h" #include "ChangeSliceListener.h" #include "components/ui_swipe_view.h" -#include "TempPresenter.h" -#include "TempJoinStudy.h" -#include "TempMeasure.h" -#include "TempExitInter.h" -#include "TempPromptWear.h" -#include "TempClickMea.h" -#include "TempRemindWear.h" -#include "TempMeaProcess.h" -#include "TempInitInter.h" -#include "TempWarn.h" -#include "TempLittleTip.h" -#include "TempModel.h" -#include "TempStudyAbout.h" -#include "TempExitPrompt.h" -#include "TempContinueWarn.h" -#include "TempReport.h" +#include "temperature/include/TempPresenter.h" +#include "temperature/include/TempJoinStudy.h" +#include "temperature/include/TempMeasure.h" +#include "temperature/include/TempExitInter.h" +#include "temperature/include/TempPromptWear.h" +#include "temperature/include/TempClickMea.h" +#include "temperature/include/TempRemindWear.h" +#include "temperature/include/TempMeaProcess.h" +#include "temperature/include/TempInitInter.h" +#include "temperature/include/TempWarn.h" +#include "temperature/include/TempLittleTip.h" +#include "temperature/include/TempModel.h" +#include "temperature/include/TempStudyAbout.h" +#include "temperature/include/TempExitPrompt.h" +#include "temperature/include/TempContinueWarn.h" +#include "temperature/include/TempReport.h" namespace OHOS { class TempMainView; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempMeaProcess.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempMeaProcess.h index ebd0ee48a..2f13f8584 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempMeaProcess.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempMeaProcess.h @@ -12,7 +12,7 @@ #include "components/ui_label.h" #include "components/ui_scroll_view.h" #include "components/ui_circle_progress.h" -#include "TempPresenter.h" +#include "temperature/include/TempPresenter.h" namespace OHOS { class TempMeaProcess : public UIScrollView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempMeasure.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempMeasure.h index de6aa31c0..391931409 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempMeasure.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempMeasure.h @@ -12,7 +12,7 @@ #include "components/ui_label.h" #include "components/ui_label_button.h" #include "AppGroupView.h" -#include "TempPresenter.h" +#include "temperature/include/TempPresenter.h" namespace OHOS { class TempMeasure : public AppGroupView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempPresenter.h index f9b3520e1..dbfb392c3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempPresenter.h @@ -8,6 +8,7 @@ #ifndef TEMP_PRESENTER_H #define TEMP_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "UiConfig.h" #include "components/ui_image_view.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempPromptWear.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempPromptWear.h index 5f590e00f..69ac5d2ac 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempPromptWear.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempPromptWear.h @@ -12,7 +12,7 @@ #include "components/ui_label.h" #include "components/ui_label_button.h" #include "components/ui_scroll_view.h" -#include "TempPresenter.h" +#include "temperature/include/TempPresenter.h" namespace OHOS { class TempPromptWear : public UIScrollView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempRemindWear.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempRemindWear.h index 24f10ed90..48b5b6442 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempRemindWear.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempRemindWear.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "components/ui_scroll_view.h" -#include "TempPresenter.h" +#include "temperature/include/TempPresenter.h" namespace OHOS { class TempRemindWear : public UIScrollView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempReport.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempReport.h index 3faadd519..41ff67911 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempReport.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempReport.h @@ -11,7 +11,7 @@ #include "components/ui_image_view.h" #include "components/ui_label.h" #include "AppGroupView.h" -#include "TempPresenter.h" +#include "temperature/include/TempPresenter.h" namespace OHOS { class TempReport : public AppGroupView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempStudyAbout.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempStudyAbout.h index 3d0deee4a..c26d51aaf 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempStudyAbout.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempStudyAbout.h @@ -10,7 +10,7 @@ #include "components/ui_label.h" #include "components/ui_scroll_view.h" -#include "TempPresenter.h" +#include "temperature/include/TempPresenter.h" namespace OHOS { class TempStudyAbout : public UIScrollView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempWarn.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempWarn.h index 821b4a4bb..5d185b5c9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempWarn.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/include/TempWarn.h @@ -12,7 +12,7 @@ #include "components/ui_label.h" #include "components/ui_label_button.h" #include "components/ui_scroll_view.h" -#include "TempPresenter.h" +#include "temperature/include/TempPresenter.h" namespace OHOS { class TempWarn : public UIScrollView { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempClickMea.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempClickMea.cpp index f56dc3a88..c0c1c8682 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempClickMea.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempClickMea.cpp @@ -8,7 +8,7 @@ #include "UiConfig.h" #include #include "font/ui_font.h" -#include "TempClickMea.h" +#include "temperature/include/TempClickMea.h" namespace OHOS { static TempClickMea *g_tempClickMea = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempContinueWarn.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempContinueWarn.cpp index 25acea9cd..8d11e3a5b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempContinueWarn.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempContinueWarn.cpp @@ -7,7 +7,7 @@ #include "UiConfig.h" #include -#include "TempContinueWarn.h" +#include "temperature/include/TempContinueWarn.h" namespace OHOS { static TempContinueWarn *g_tempContinueWarn = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempExitInter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempExitInter.cpp index b2538b033..8ea18ecd5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempExitInter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempExitInter.cpp @@ -9,7 +9,7 @@ #include "layout/grid_layout.h" #include "font/ui_font.h" #include -#include "TempExitInter.h" +#include "temperature/include/TempExitInter.h" namespace OHOS { static TempExitInter *g_tempExitInter = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempExitPrompt.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempExitPrompt.cpp index 34359aa4c..600b97f40 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempExitPrompt.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempExitPrompt.cpp @@ -8,7 +8,7 @@ #include "UiConfig.h" #include "layout/grid_layout.h" #include -#include "TempExitPrompt.h" +#include "temperature/include/TempExitPrompt.h" namespace OHOS { static TempExitPrompt *g_tempExitPrompt = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempInitInter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempInitInter.cpp index dc00359c4..19a076c2a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempInitInter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempInitInter.cpp @@ -7,7 +7,7 @@ #include "UiConfig.h" #include -#include "TempInitInter.h" +#include "temperature/include/TempInitInter.h" namespace OHOS { static TempInitInter *g_tempInitInter = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempJoinStudy.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempJoinStudy.cpp index bf089b5a1..9dce7455d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempJoinStudy.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempJoinStudy.cpp @@ -8,7 +8,7 @@ #include "UiConfig.h" #include "layout/grid_layout.h" #include -#include "TempJoinStudy.h" +#include "temperature/include/TempJoinStudy.h" namespace OHOS { static TempJoinStudy *g_tempJoinStudy = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempLittleTip.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempLittleTip.cpp index 8c6c01873..b4e737874 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempLittleTip.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempLittleTip.cpp @@ -7,7 +7,7 @@ #include "UiConfig.h" #include -#include "TempLittleTip.h" +#include "temperature/include/TempLittleTip.h" namespace OHOS { static TempLittleTip *g_tempJoinStudy = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempMainView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempMainView.cpp index 5c533c7d2..61cd2b6b0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempMainView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempMainView.cpp @@ -5,10 +5,12 @@ * Create: 2022-02-15 */ -#include "TempMainView.h" +#include "temperature/include/TempMainView.h" #include "UiConfig.h" -#include "TempMeaProcess.h" -#include "TempWarn.h" +#include "temperature/include/TempMeaProcess.h" +#include "temperature/include/TempWarn.h" +#include "temperature/include/TempExitPrompt.h" + namespace OHOS { static TempMainView *g_tempMainView = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempMeaProcess.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempMeaProcess.cpp index 76918d105..7bb6460c7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempMeaProcess.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempMeaProcess.cpp @@ -7,8 +7,8 @@ #include "UiConfig.h" #include -#include "TempMeaProcess.h" -#include "TempMainView.h" +#include "temperature/include/TempMeaProcess.h" +#include "temperature/include/TempMainView.h" namespace OHOS { static TempMeaProcess *g_tempMeaProcess = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempMeasure.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempMeasure.cpp index a3c01d99d..d69ac21d2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempMeasure.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempMeasure.cpp @@ -7,7 +7,7 @@ #include "UiConfig.h" #include -#include "TempMeasure.h" +#include "temperature/include/TempMeasure.h" namespace OHOS { static TempMeasure *g_tempMeasure = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempModel.cpp index b52c38cfd..af1f61393 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempModel.cpp @@ -5,9 +5,9 @@ * Create: 2022-02-15 */ -#include "TempModel.h" +#include "temperature/include/TempModel.h" #include "UiConfig.h" -#include "TempModel.h" +#include "temperature/include/TempModel.h" namespace OHOS { TempModel::TempModel() diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempPresenter.cpp index 7d70cc385..5f49e419b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempPresenter.cpp @@ -5,11 +5,11 @@ * Create: 2022-02-15 */ -#include "TempPresenter.h" -#include "TempMainView.h" +#include "temperature/include/TempPresenter.h" +#include "temperature/include/TempMainView.h" #include "ChangeSliceListener.h" #include "graphic_service.h" -#include "ui_service.h" +#include "uiservice/include/ui_service.h" #include "string" #include "iostream" #include "sstream" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempPromptWear.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempPromptWear.cpp index 47ec2b05c..2cbdb64c6 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempPromptWear.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempPromptWear.cpp @@ -7,7 +7,7 @@ #include "UiConfig.h" #include -#include "TempPromptWear.h" +#include "temperature/include/TempPromptWear.h" namespace OHOS { static TempPromptWear *g_tempPromptWear = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempRemindWear.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempRemindWear.cpp index a6ffbf5c9..12a401b17 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempRemindWear.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempRemindWear.cpp @@ -7,7 +7,7 @@ #include "UiConfig.h" #include -#include "TempRemindWear.h" +#include "temperature/include/TempRemindWear.h" namespace OHOS { static TempRemindWear *g_tempRemindWear = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempReport.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempReport.cpp index 46cf911c3..43eeb7b8f 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempReport.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempReport.cpp @@ -9,7 +9,7 @@ #include "layout/grid_layout.h" #include "font/ui_font.h" #include -#include "TempReport.h" +#include "temperature/include/TempReport.h" namespace OHOS { static TempReport *g_tempReport = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempStudyAbout.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempStudyAbout.cpp index 8db30bd09..4c1a8edc9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempStudyAbout.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempStudyAbout.cpp @@ -7,7 +7,7 @@ #include "UiConfig.h" #include -#include "TempStudyAbout.h" +#include "temperature/include/TempStudyAbout.h" namespace OHOS { static TempStudyAbout *g_tempStudyAbout = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempWarn.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempWarn.cpp index 8df8eb975..985b0fe30 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempWarn.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/temperature/src/TempWarn.cpp @@ -7,7 +7,7 @@ #include "UiConfig.h" #include -#include "TempWarn.h" +#include "temperature/include/TempWarn.h" namespace OHOS { static TempWarn *g_tempWarn = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/include/ThemeStylePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/include/ThemeStylePresenter.h index eb2c7e54d..10545e30a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/include/ThemeStylePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/include/ThemeStylePresenter.h @@ -10,6 +10,7 @@ #define SET_THEMESTYLE_PRESENTER_H #include "View.h" +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "components/ui_view.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp index c99ad8c17..27bc5dc8b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/themestyle/src/ThemeStyleView.cpp @@ -12,6 +12,7 @@ #include "ui_resource_string.h" #include "dock/focus_manager.h" #include "ConfigModel.h" +#include "common/screen.h" namespace OHOS { static ThemeStyleView *g_pThemeStyleView{nullptr}; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingEnddataPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingEnddataPresenter.h index 9f2c02f55..6dfd2fd96 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingEnddataPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingEnddataPresenter.h @@ -14,6 +14,7 @@ #ifndef _TraingEnddata_PRESENTER_H #define _TraingEnddata_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingEnddataView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingNomalPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingNomalPresenter.h index cc6134cfe..3ef2ab4b5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingNomalPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingNomalPresenter.h @@ -2,6 +2,7 @@ #ifndef _TraingNomal_PRESENTER_H #define _TraingNomal_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingNomalView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingPresenter.h index db1adc5d1..87fcd1449 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingPresenter.h @@ -14,6 +14,7 @@ #ifndef _Traing_PRESENTER_H #define _Traing_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingSetPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingSetPresenter.h index b9636780e..7df8f9145 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingSetPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/include/TraingSetPresenter.h @@ -13,6 +13,7 @@ #ifndef _TraingSet_PRESENTER_H #define _TraingSet_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingSetView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingEnddataPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingEnddataPresenter.cpp index 1e596c903..e238d92ab 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingEnddataPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingEnddataPresenter.cpp @@ -2,7 +2,7 @@ #include "components/ui_label_ext.h" #include "ui_resource_string.h" #include "NativeAbility.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp index f2d015772..795d6cb7c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp @@ -4,7 +4,7 @@ #include "components/ui_label_ext.h" #include "ui_resource_string.h" #include "NativeAbility.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" @@ -13,7 +13,7 @@ #include #include "traing/include/TraingNomalPresenter.h" #include "traing/training_card/include/TraingCardPresenter.h" -#include "MainModel.h" +#include "main/include/MainModel.h" #include "UiConfig.h" // #include "TraingNomalView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingPresenter.cpp index a98635fe4..7887a3d45 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingPresenter.cpp @@ -7,7 +7,7 @@ */ #include "AppViewIDs.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "NativeAbility.h" #include "common/key_code.h" #include "components/ui_label_ext.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingSetPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingSetPresenter.cpp index 598f034a1..80c61ecf4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingSetPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingSetPresenter.cpp @@ -8,7 +8,7 @@ #include "components/ui_label_ext.h" #include "ui_resource_string.h" #include "NativeAbility.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSPresenter.h index f6e1dfcbc..0cc44acb3 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSPresenter.h @@ -2,6 +2,7 @@ #ifndef _TraingGPS_PRESENTER_H #define _TraingGPS_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingGPSView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h index 980e07088..6e260263e 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSbackPresenter.h @@ -1,6 +1,7 @@ #ifndef _TraingGPSback_PRESENTER_H #define _TraingGPSback_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingGPSbackView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h index 685444d28..cf3f87826 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlackPresenter.h @@ -2,6 +2,7 @@ #ifndef _TraingGPSlack_PRESENTER_H #define _TraingGPSlack_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingGPSlackView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlostPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlostPresenter.h index 72042cc2c..3ca2578ab 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlostPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSlostPresenter.h @@ -2,6 +2,7 @@ #ifndef _TraingGPSlost_PRESENTER_H #define _TraingGPSlost_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingGPSlostView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h index c37597f60..c7a5704f2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSnotePresenter.h @@ -1,6 +1,7 @@ #ifndef _TraingGPSnote_PRESENTER_H #define _TraingGPSnote_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingGPSnoteView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h index e090dd777..0bb93f533 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_GPS/include/TraingGPSsetPresenter.h @@ -1,6 +1,7 @@ #ifndef _TraingGPSset_PRESENTER_H #define _TraingGPSset_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingGPSsetView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h index 8e46e56c1..32f1656fd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardPresenter.h @@ -3,6 +3,7 @@ #define _TraingCard_PRESENTER_H #include "ModelListenerSample.h" +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingCardView.h" #include "traing/training_card/include/TrainingControlView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardView.h index a921c84c5..7533da30b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardView.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/include/TraingCardView.h @@ -34,7 +34,7 @@ #include "traing/Training_UiConfig.h" #include "traing/training_card/include/TraingCardPresenter.h" -#include "PlayersView.h" +#include "player/include/PlayersView.h" #include "traing/training_card/include/TraingDataAllView.h" #include "traing/training_card/include/TrainingControlView.h" #include "traing/training_card/include/TrainingDataView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/Training_CardPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/Training_CardPresenter.cpp index 9007204ad..52ad02ce4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/Training_CardPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/Training_CardPresenter.cpp @@ -25,7 +25,7 @@ #include "wearable_log.h" #include "traing/include/TraingModel.h" #include "uicomponents/UIComponents.h" -#include "MainModel.h" +#include "main/include/MainModel.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_aquatic/include/TraingAquaticPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_aquatic/include/TraingAquaticPresenter.h index f1ea13502..ef0d88826 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_aquatic/include/TraingAquaticPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_aquatic/include/TraingAquaticPresenter.h @@ -16,6 +16,7 @@ #ifndef _TraingAquatic_PRESENTER_H #define _TraingAquatic_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingAquaticView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp index 0db6c4bd3..f5c9a1116 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp @@ -5,7 +5,7 @@ #include "ui_resource_string.h" #include "NativeAbility.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ball/include/TraingBallPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ball/include/TraingBallPresenter.h index f9c1cb829..7f2087519 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ball/include/TraingBallPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ball/include/TraingBallPresenter.h @@ -16,6 +16,7 @@ #ifndef _TraingBall_PRESENTER_H #define _TraingBall_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingBallView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp index 0a83c2a38..969afad6d 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp @@ -5,7 +5,7 @@ #include "ui_resource_string.h" #include "NativeAbility.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_dance/include/TraingDancePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_dance/include/TraingDancePresenter.h index 399f793f1..49b8bf94b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_dance/include/TraingDancePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_dance/include/TraingDancePresenter.h @@ -10,6 +10,7 @@ #ifndef _TraingDance_PRESENTER_H #define _TraingDance_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingDanceView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp index d1e306850..50459e9cd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp @@ -5,7 +5,7 @@ #include "ui_resource_string.h" #include "NativeAbility.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_fitness/include/TraingFitnessPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_fitness/include/TraingFitnessPresenter.h index 50ecea753..8e3518af5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_fitness/include/TraingFitnessPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_fitness/include/TraingFitnessPresenter.h @@ -3,6 +3,7 @@ #ifndef _TraingFitness_PRESENTER_H #define _TraingFitness_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingFitnessView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp index 6e0f6ff8f..3f17e8c91 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp @@ -3,7 +3,7 @@ #include "AppViewIDs.h" #include "NativeAbility.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ice/include/TraingIcePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ice/include/TraingIcePresenter.h index c1fb86f5d..8e9c71a25 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ice/include/TraingIcePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ice/include/TraingIcePresenter.h @@ -10,6 +10,7 @@ #ifndef _TraingIce_PRESENTER_H #define _TraingIce_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingIceView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp index 18e31137c..470fa5b9c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp @@ -5,7 +5,7 @@ #include "ui_resource_string.h" #include "NativeAbility.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_limit/include/TraingLimitPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_limit/include/TraingLimitPresenter.h index fcb98df36..f51a191d2 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_limit/include/TraingLimitPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_limit/include/TraingLimitPresenter.h @@ -10,6 +10,7 @@ #ifndef _TraingLimit_PRESENTER_H #define _TraingLimit_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingLimitView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp index 77601fa77..143c5dfc4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp @@ -4,7 +4,7 @@ #include "ui_resource_string.h" #include "NativeAbility.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/include/TraingMorePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/include/TraingMorePresenter.h index 2ac392501..1dac05709 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/include/TraingMorePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/include/TraingMorePresenter.h @@ -16,6 +16,7 @@ #ifndef _TraingMore_PRESENTER_H #define _TraingMore_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingMoreView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp index 95a10268e..903555d42 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp @@ -5,7 +5,7 @@ #include "ui_resource_string.h" #include "NativeAbility.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_other/include/TraingOtherPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_other/include/TraingOtherPresenter.h index fdedb9b68..271bb7bd8 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_other/include/TraingOtherPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_other/include/TraingOtherPresenter.h @@ -10,6 +10,7 @@ #ifndef _TraingOther_PRESENTER_H #define _TraingOther_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingOtherView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp index 8562f2d24..337c59d39 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp @@ -20,7 +20,7 @@ #include "ui_resource_string.h" #include "NativeAbility.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_rest/include/TraingRestPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_rest/include/TraingRestPresenter.h index 167a8bd31..6b7c95772 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_rest/include/TraingRestPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_rest/include/TraingRestPresenter.h @@ -10,6 +10,7 @@ #ifndef _TraingRest_PRESENTER_H #define _TraingRest_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingRestView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp index b6f02aeee..d099db459 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp @@ -4,7 +4,7 @@ #include "ui_resource_string.h" #include "NativeAbility.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/include/TraingRecordPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/include/TraingRecordPresenter.h index c91791b40..670b79ef4 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/include/TraingRecordPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/include/TraingRecordPresenter.h @@ -2,6 +2,7 @@ #ifndef _TraingRecord_PRESENTER_H #define _TraingRecord_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "TraingRecordView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/src/TraingRecordPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/src/TraingRecordPresenter.cpp index e346255e3..71ccac0e9 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/src/TraingRecordPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traingrecord/src/TraingRecordPresenter.cpp @@ -17,7 +17,7 @@ #include "traing/include/TraingEnddataView.h" #include "traing/include/TraingModel.h" -#include "KeyInputListener.h" +#include "key/include/KeyInputListener.h" #include "custom_utils.h" #include "common/key_code.h" // #include "TraingRecordView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/include/UISampleModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/include/UISampleModel.h index 45028caf6..a3683e8d7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/include/UISampleModel.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/include/UISampleModel.h @@ -12,7 +12,7 @@ #include #include "AppViewIDs.h" #include "UiConfig.h" -#include "UISamplePresenter.h" +#include "uisample/include/UISamplePresenter.h" namespace OHOS { class UISampleModel { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/include/UISamplePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/include/UISamplePresenter.h index 03d4e1342..95c1041d0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/include/UISamplePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/include/UISamplePresenter.h @@ -8,6 +8,7 @@ #ifndef UISAMPLE_PRESENTER_H #define UISAMPLE_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "components/ui_view.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISampleModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISampleModel.cpp index 433648409..2cd075c08 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISampleModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISampleModel.cpp @@ -5,7 +5,7 @@ * Create: 2021-11-23 */ -#include "UISampleModel.h" +#include "uisample/include/UISampleModel.h" namespace OHOS { UISampleModel::UISampleModel() {} diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISamplePresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISamplePresenter.cpp index db908c71a..26b5d1e96 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISamplePresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISamplePresenter.cpp @@ -5,10 +5,10 @@ * Create: 2021-11-23 */ -#include "UISampleView.h" -#include "UISampleModel.h" -#include "UISamplePresenter.h" -#include "ui_service.h" +#include "uisample/include/UISampleView.h" +#include "uisample/include/UISampleModel.h" +#include "uisample/include/UISamplePresenter.h" +#include "uiservice/include/ui_service.h" #include "NativeRegisterManager.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISampleView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISampleView.cpp index 85b6feff8..66dace231 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISampleView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/src/UISampleView.cpp @@ -7,8 +7,8 @@ #include -#include "UISampleView.h" -#include "UISamplePresenter.h" +#include "uisample/include/UISampleView.h" +#include "uisample/include/UISamplePresenter.h" #include "ui_test_group.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/uitest/framework/src/test_case_list_adapter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/uitest/framework/src/test_case_list_adapter.cpp index 6e6fb1bbf..fe58f9101 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/uitest/framework/src/test_case_list_adapter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uisample/uitest/framework/src/test_case_list_adapter.cpp @@ -19,7 +19,7 @@ #include "components/ui_label_button.h" #include "gfx_utils/list.h" #include "ui_test.h" -#include "UISampleView.h" +#include "uisample/include/UISampleView.h" #include "ui_test_group.h" #include "wearable_log.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uiservice/src/ui_service.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uiservice/src/ui_service.cpp index 96dab4ba5..78c68bbad 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uiservice/src/ui_service.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uiservice/src/ui_service.cpp @@ -13,10 +13,10 @@ * limitations under the License. */ -#include "ui_service.h" +#include "uiservice/include/ui_service.h" #include "wearable_log.h" #include "samgr_lite.h" -#include "SettingModel.h" +#include "settings/include/SettingModel.h" #include "UiServersMsg.h" #include "ohos_init.h" #include "memory_adapter.h" @@ -24,11 +24,11 @@ #include "service_id_define.h" #include "bundle_install_msg.h" #include "graphic_service.h" -#include "ApplistModel.h" +#include "applist/include/ApplistModel.h" #if defined(SUPPORT_POWER_MANAGER) #include "power_display_service.h" #endif -#include "ui_screennotify.h" +#include "screennotify/include/ui_screennotify.h" #include "HealthModel.h" #include "bts_br_gap.h" #include "bts_le_gap.h" @@ -53,11 +53,11 @@ #include "weather/include/WeatherModel.h" #include "alarm/include/AlarmClockModel.h" #include "uiservice/include/ui_service.h" -#include "MainModel.h" +#include "main/include/MainModel.h" #include "testModel.h" #include "goal/include/goalmodel.h" -#include "ui_serviceC.h" +#include "uiservice/include/ui_serviceC.h" #include "languagecode/include/LanguageSwitchModel.h" #include "custom_runtime.h" /* -------------------------------------------------------------------------- */ diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/include/WatchQRCodePresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/include/WatchQRCodePresenter.h index 059cbcaf5..8dec03dfd 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/include/WatchQRCodePresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/include/WatchQRCodePresenter.h @@ -1,6 +1,7 @@ #ifndef WATCH_QR_CODE_PRESENTER_H #define WATCH_QR_CODE_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "components/ui_view.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp index fd5bfe3cf..9a1a6479c 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/watchQRcode/src/WatchQRCodeView.cpp @@ -8,7 +8,7 @@ #include "graphic_service.h" #include #include - +#include "common/screen.h" namespace OHOS { static WatchQRCodeView *g_pWatchQRCodePresenter = nullptr; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/include/MainWeatherPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/include/MainWeatherPresenter.h index d149d71e5..49fb45e5a 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/include/MainWeatherPresenter.h +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/include/MainWeatherPresenter.h @@ -8,6 +8,7 @@ #ifndef MAIN_WEATHER_PRESENTER_H #define MAIN_WEATHER_PRESENTER_H +#include "key/include/KeyInputListener.h" #include "Presenter.h" #include "View.h" #include "MainWeatherView.h" diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/WeatherModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/WeatherModel.cpp index d0fc5db79..69592a5fa 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/WeatherModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/weather/src/WeatherModel.cpp @@ -13,7 +13,7 @@ #include "custom_runtime.h" #ifdef FD230_650 -#include "DialModelWeather.h" +#include "main/include/dial/DialModelWeather.h" #include "DialModelWeatherStr.h" #endif diff --git a/code/sdk/application/wearable/fd230/service/app_store/app_store.cpp b/code/sdk/application/wearable/fd230/service/app_store/app_store.cpp index c7cef194c..ff5e2fa57 100644 --- a/code/sdk/application/wearable/fd230/service/app_store/app_store.cpp +++ b/code/sdk/application/wearable/fd230/service/app_store/app_store.cpp @@ -8,7 +8,7 @@ #include "bundle_install_msg.h" #include "bundlems_slite_client.h" #include "appexecfwk_errors.h" -#include "ui_service.h" +#include "uiservice/include/ui_service.h" void AppStoreReplyAck(uint8_t cmd_id, uint8_t type, uint32_t ack) diff --git a/code/sdk/application/wearable/fd230/service/device_msg/device_proxy.cpp b/code/sdk/application/wearable/fd230/service/device_msg/device_proxy.cpp index 336cfd7ed..8407ca533 100644 --- a/code/sdk/application/wearable/fd230/service/device_msg/device_proxy.cpp +++ b/code/sdk/application/wearable/fd230/service/device_msg/device_proxy.cpp @@ -9,7 +9,7 @@ #include "wearable_log.h" #include "common_def.h" #include "cpp/audio_manager.h" -#include "uiservice/ui_service.h" +#include "uiservice/include/ui_service.h" #include "ui_resource_string.h" #include #include @@ -227,7 +227,9 @@ OTA_ERR device_proxy::ota_update(ota_info &info) void device_proxy::call_ui_ota_update() { // 发送升级请求到uiservice + #ifdef FD230_650_0723 SendMsgToUIService(UI_OTA_UPDATE, 0, nullptr, 0); + #endif } int device_proxy::delete_file_with_cleanup(const char *ppath, const char *path) diff --git a/code/sdk/application/wearable/fd230/service/device_msg/msg_center_device.cpp b/code/sdk/application/wearable/fd230/service/device_msg/msg_center_device.cpp index 56f89c1a8..5ef6fe6c3 100644 --- a/code/sdk/application/wearable/fd230/service/device_msg/msg_center_device.cpp +++ b/code/sdk/application/wearable/fd230/service/device_msg/msg_center_device.cpp @@ -11,9 +11,9 @@ #include "device_location.h" #include "AppViewIDs.h" #include "NativeAbility.h" -#include "sports/SportsModel.h" -#include "findphone/FindPhoneMainPage.h" -#include "camera/CameraMainPage.h" +// #include "sports/SportsModel.h" +// #include "findphone/FindPhoneMainPage.h" +// #include "camera/CameraMainPage.h" #ifdef __cplusplus extern "C" { @@ -369,6 +369,7 @@ errcode_t msg_center_sport_action(uint8_t cmd_id, uint8_t type, void *usr_data, WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "msg_center_sport_action : %d\r\n", action); + #ifdef FD230_650_0723 switch (action) { case SPORT_ACTION_START: OHOS::NativeAbility::GetInstance().ChangeSlice(VIEW_SPORTS); @@ -389,12 +390,13 @@ errcode_t msg_center_sport_action(uint8_t cmd_id, uint8_t type, void *usr_data, break; case SPORT_ACTION_STOP: OHOS::SportsModel::GetInstance()->StopSportsTimer(false); - OHOS::NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE); + OHOS::NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); break; default: ret = ERRCODE_FAIL; break; } + #endif ret = msg_center_send_data(cmd_id, type, &ack, sizeof(ack)); if (ret != ERRCODE_SUCC) { @@ -412,12 +414,14 @@ errcode_t msg_center_sport_get_data(uint8_t cmd_id, uint8_t type, void *usr_data errcode_t ret = ERRCODE_SUCC; WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER, "msg_center_sport_get_data\r\n"); + #ifdef FD230_650_0723 OHOS::sport_data_t *sportData = OHOS::SportsModel::GetInstance()->GetSportsData(); ret = msg_center_send_data(cmd_id, type, sportData, sizeof(OHOS::sport_data_t)); if (ret != ERRCODE_SUCC) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "msg_center_sport_get_data end data failed\r\n"); return ERRCODE_FAIL; } + #endif return ERRCODE_SUCC; } @@ -436,6 +440,7 @@ errcode_t msg_center_camera_exit(uint8_t cmd_id, uint8_t type, void *usr_data, u errcode_t msg_center_camera_online(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "recv connect success from phone"); + #ifdef FD230_650_0723 if (OHOS::CameraMainPage::GetInstance() != nullptr) { OHOS::CameraMainPage::GetInstance()->Refresh_page(); return ERRCODE_SUCC; @@ -443,6 +448,8 @@ errcode_t msg_center_camera_online(uint8_t cmd_id, uint8_t type, void *usr_data, WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "CameraMainPage not exist\r\n"); return ERRCODE_FAIL; } + #endif + return ERRCODE_SUCC; } errcode_t msg_center_offline_log_switch(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) @@ -505,6 +512,7 @@ errcode_t msg_center_device_findphone(uint8_t cmd_id, uint8_t type, void *usr_da uint16_t payload_len = usr_len - tl_len; uint8_t *tlv_payload = (uint8_t *)msg_center_get_tlv_payload(usr_data); bool ret = true; + #ifdef FD230_650_0723 if ( OHOS::FindPhoneMainPage::GetInstance() != nullptr) { ret = OHOS::FindPhoneMainPage::GetInstance()->StopFindPhone(); } else { @@ -513,6 +521,7 @@ errcode_t msg_center_device_findphone(uint8_t cmd_id, uint8_t type, void *usr_da if (!ret) { return ERRCODE_FAIL; } + #endif return ERRCODE_SUCC; } #ifdef __cplusplus diff --git a/code/sdk/application/wearable/fd230/service/dial_market/CMakeLists.txt b/code/sdk/application/wearable/fd230/service/dial_market/CMakeLists.txt index 8c61862ab..c65e5bcec 100644 --- a/code/sdk/application/wearable/fd230/service/dial_market/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230/service/dial_market/CMakeLists.txt @@ -11,6 +11,7 @@ set(PRIVATE_HEADER ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/kits/gfx_utils ${ROOT_DIR}/open_source/openharmony/base/startup/syspara_lite/include ${ROOT_DIR}/open_source/openharmony/drivers/peripheral/format/interfaces/include + ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/main/include/ ) set(SOURCES diff --git a/code/sdk/application/wearable/fd230/service/dial_market/dial_market.cpp b/code/sdk/application/wearable/fd230/service/dial_market/dial_market.cpp index 5d6de8491..e58e1646c 100644 --- a/code/sdk/application/wearable/fd230/service/dial_market/dial_market.cpp +++ b/code/sdk/application/wearable/fd230/service/dial_market/dial_market.cpp @@ -12,7 +12,7 @@ #include "common_def.h" #include "dial_market.h" #include "parameter.h" -#include "main/dial/WatchInterface.h" +#include "main/include/dial/WatchInterface.h" #ifdef __cplusplus extern "C" { @@ -130,7 +130,9 @@ errcode_t msg_center_dial_market_install_watch(uint8_t cmd_id, uint8_t type, voi path[payload_len] = '\0'; WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER, "path = %s\r\n", path); + #ifdef FD230_650_0723 op_ret = GetUuidByPath(path, &uuid); + #endif if (op_ret == false) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "install fail.\r\n"); free(path); @@ -196,7 +198,9 @@ errcode_t msg_center_dial_market_get_all_watch_info(uint8_t cmd_id, uint8_t type bool op_ret = false; WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER, "get_all_watch_info\r\n"); + #ifdef FD230_650_0723 op_ret = GetAllWatchFaceInfo(&info, &watch_num); + #endif if (op_ret == false) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "GetAllWatchFaceInfo fail\r\n"); watch_num = 0; diff --git a/code/sdk/application/wearable/fd230/service/msg_center/brandy-native-js-fd230/libmsg_center.a b/code/sdk/application/wearable/fd230/service/msg_center/brandy-native-js-fd230/libmsg_center.a index 0e24be78a..b1e105a9c 100644 Binary files a/code/sdk/application/wearable/fd230/service/msg_center/brandy-native-js-fd230/libmsg_center.a and b/code/sdk/application/wearable/fd230/service/msg_center/brandy-native-js-fd230/libmsg_center.a differ diff --git a/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp index 5890416a5..e5f387492 100644 --- a/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp +++ b/code/sdk/application/wearable/fd230/service/msg_center/src/msg_center_customer.cpp @@ -14,7 +14,7 @@ #include "wearable_log.h" #include "service_id_define.h" #include "broadcast_service.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "AlarmPopUpPresenter.h" #include "CallerLogModel.h" #include "notification_manager.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 5588afcba..6734006e0 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 @@ -29,7 +29,7 @@ #include #include -#include "BluetoothModel.h" +#include "bluetooth/include/BluetoothModel.h" #include #include "diag_log.h" #include "ConfigModelC.h" diff --git a/code/sdk/application/wearable/fd230/service/msg_center/src/notify/ketinput/src/NotifyOnKeyListener.cpp b/code/sdk/application/wearable/fd230/service/msg_center/src/notify/ketinput/src/NotifyOnKeyListener.cpp index bfcc29b0b..740582bf1 100644 --- a/code/sdk/application/wearable/fd230/service/msg_center/src/notify/ketinput/src/NotifyOnKeyListener.cpp +++ b/code/sdk/application/wearable/fd230/service/msg_center/src/notify/ketinput/src/NotifyOnKeyListener.cpp @@ -18,9 +18,9 @@ #include "dock/input_device.h" #include "notification_manager.h" #include "AlarmPopUpPresenter.h" -#include "CallerLogModel.h" -#include "MainCallingPresenter.h" -#include "ApplistModel.h" +#include "callerlog/include/CallerLogModel.h" +#include "makephone/include/MainCallingPresenter.h" +#include "applist/include/ApplistModel.h" namespace OHOS { static bool IsNotifyCallStatus() { diff --git a/code/sdk/application/wearable/fd230/service/msg_center/src/notify/phone_msg_notification.cpp b/code/sdk/application/wearable/fd230/service/msg_center/src/notify/phone_msg_notification.cpp index eb6a40883..73000e332 100644 --- a/code/sdk/application/wearable/fd230/service/msg_center/src/notify/phone_msg_notification.cpp +++ b/code/sdk/application/wearable/fd230/service/msg_center/src/notify/phone_msg_notification.cpp @@ -8,7 +8,7 @@ #include "ohos_timer.h" #include "wearable_log.h" #include -#include "main/MessageModel.h" +#include "message/include/MessageModel.h" namespace OHOS { // 三方应用名 @@ -159,7 +159,9 @@ void PhoneMsgView::UpDatePhoneMsg(std::string appName, std::string titile, std:: phoneMsg_.appName = appName; phoneMsg_.msgTitle = titile; phoneMsg_.msgContent = content; + #ifdef FD230_650_0723 MessageModel::GetInstance().GetMessageInfo(appName, titile, content); + #endif } PhoneMsgViewEventListener::PhoneMsgViewEventListener() diff --git a/code/sdk/application/wearable/fd230/service/power_manager/src/actions/display_action.c b/code/sdk/application/wearable/fd230/service/power_manager/src/actions/display_action.c index f869cf3a0..451fc1bb7 100644 --- a/code/sdk/application/wearable/fd230/service/power_manager/src/actions/display_action.c +++ b/code/sdk/application/wearable/fd230/service/power_manager/src/actions/display_action.c @@ -23,7 +23,7 @@ #include "nandflash_to_os.h" #endif #ifdef SUPPORT_OHOSFWK -#include "screennotify/ui_screennotify.h" +#include "screennotify/include/ui_screennotify.h" #endif #include "sys/time.h" #include "touch_screen_def.h" diff --git a/code/sdk/application/wearable/fd230/service/xiaodu_voice/xiaodu_voice.cpp b/code/sdk/application/wearable/fd230/service/xiaodu_voice/xiaodu_voice.cpp index 9e88a4365..e1d030279 100644 --- a/code/sdk/application/wearable/fd230/service/xiaodu_voice/xiaodu_voice.cpp +++ b/code/sdk/application/wearable/fd230/service/xiaodu_voice/xiaodu_voice.cpp @@ -21,7 +21,7 @@ #include "js_ability.h" #include "recording_module.h" #ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE -#include "bluetooth/BluetoothChangeBle.h" +#include "bluetooth/include/BluetoothChangeBle.h" #endif #ifdef __cplusplus diff --git a/code/sdk/application/wearable/nativeapp/brandy-native-js-fd230/libuikit_fwk.a b/code/sdk/application/wearable/nativeapp/brandy-native-js-fd230/libuikit_fwk.a index b1ab9d2d0..e3ce469ad 100644 Binary files a/code/sdk/application/wearable/nativeapp/brandy-native-js-fd230/libuikit_fwk.a and b/code/sdk/application/wearable/nativeapp/brandy-native-js-fd230/libuikit_fwk.a differ diff --git a/code/sdk/application/wearable/service/dial_market/dial_market.cpp b/code/sdk/application/wearable/service/dial_market/dial_market.cpp index 5d6de8491..5d3e18207 100644 --- a/code/sdk/application/wearable/service/dial_market/dial_market.cpp +++ b/code/sdk/application/wearable/service/dial_market/dial_market.cpp @@ -190,6 +190,7 @@ errcode_t msg_center_dial_market_set_watch(uint8_t cmd_id, uint8_t type, void *u errcode_t msg_center_dial_market_get_all_watch_info(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) { + #ifdef FD230_650_0723 errcode_t ret = ERRCODE_SUCC; watch_dial_info *info = nullptr; uint8_t watch_num = 0; @@ -213,6 +214,8 @@ errcode_t msg_center_dial_market_get_all_watch_info(uint8_t cmd_id, uint8_t type free(info); return ERRCODE_SUCC; + #endif + return ERRCODE_FAIL; } errcode_t msg_center_dial_market_get_cur_watch_info(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len) diff --git a/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230/libmsg_center.a b/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230/libmsg_center.a new file mode 100644 index 000000000..b1e105a9c Binary files /dev/null and b/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230/libmsg_center.a differ diff --git a/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230/libuikit_fwk.a b/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230/libuikit_fwk.a deleted file mode 100644 index b1ab9d2d0..000000000 Binary files a/code/sdk/application/wearable/service/msg_center/brandy-native-js-fd230/libuikit_fwk.a and /dev/null differ diff --git a/code/sdk/application/wstp/at_service/ohosfwk/ohosfwk_at_process.cpp b/code/sdk/application/wstp/at_service/ohosfwk/ohosfwk_at_process.cpp index 46c28fcb4..9ec183954 100644 --- a/code/sdk/application/wstp/at_service/ohosfwk/ohosfwk_at_process.cpp +++ b/code/sdk/application/wstp/at_service/ohosfwk/ohosfwk_at_process.cpp @@ -13,14 +13,15 @@ #include "bundlems_slite_client.h" #include "abilityms_slite_client.h" #include "gt_bundle_manager_service.h" -#include "uiservice/ui_service.h" +// #include "uiservice/ui_service.h" +#include "uiservice/include/ui_service.h" #include "sign_mode.h" #include "NativeAbility.h" #include "ability_manager.h" #include "js_fwk_common.h" #include "global.h" #include "msg_center_customer.h" -#include "applist/ApplistModel.h" +#include "applist/include/ApplistModel.h" #include "bundle_manager.h" #include #ifdef SUPPORT_AT_LOCATION diff --git a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a index f86fdc31b..c02957674 100644 Binary files a/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a and b/code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_audio_manager_wrapper.a differ diff --git a/code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h b/code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h index 276f50a9a..a5635b850 100644 --- a/code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h +++ b/code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h @@ -113,6 +113,10 @@ typedef struct { uint8_t size; uint8_t name[NV_SYS_PRODUCT_INFO_NAME_LEN]; } sys_product_info_t; +typedef struct { + uint8_t size; /* 序列号长度 */ + uint8_t sn[NV_SYS_PRODUCT_INFO_NAME_LEN]; /* 序列号数组 */ +} custom_key_sn_t; #endif /* __COMMON_H__ */ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230-r/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230-r/libgfx_rm.a index 441cef80f..a73130193 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230-r/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230-r/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230/libgfx_rm.a b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230/libgfx_rm.a index 441cef80f..7337ef01e 100644 Binary files a/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230/libgfx_rm.a and b/code/sdk/middleware/services/gpu/api/rm/brandy-native-js-fd230/libgfx_rm.a differ diff --git a/code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd230/libdisplay_gfx.a b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd230/libdisplay_gfx.a index 5b7a5036a..8864f8e31 100644 Binary files a/code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd230/libdisplay_gfx.a and b/code/sdk/middleware/services/gui/hal/display/brandy-native-js-fd230/libdisplay_gfx.a differ diff --git a/code/sdk/middleware/services/gui/uikit/brandy-native-js-fd230/libuikit_ext.a b/code/sdk/middleware/services/gui/uikit/brandy-native-js-fd230/libuikit_ext.a index aa77c6800..9d278be5b 100644 Binary files a/code/sdk/middleware/services/gui/uikit/brandy-native-js-fd230/libuikit_ext.a and b/code/sdk/middleware/services/gui/uikit/brandy-native-js-fd230/libuikit_ext.a differ diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service.cpp index f358979e3..128f8e3b6 100644 --- a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service.cpp +++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/src/graphic_service.cpp @@ -33,7 +33,7 @@ #include "common/screen.h" #include "components/root_view.h" #ifdef SUPPORT_OHOSFWK -#include "screennotify/ui_screennotify.h" +#include "screennotify/include/ui_screennotify.h" #endif #ifdef SUPPORT_GPU_JPEG #include "drv_jpeg_intf.h" diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/dfx_cmd.cpp b/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/dfx_cmd.cpp index 16155d890..741812acf 100644 --- a/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/dfx_cmd.cpp +++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/ui/frameworks/dfx/dfx_cmd.cpp @@ -44,7 +44,7 @@ #include "events/key_event.h" #endif #if defined (SUPPORT_DIAL_DEBUG) -#include "main/dial/WatchInterface.h" +#include "main/include/dial/WatchInterface.h" #endif // defined (SUPPORT_DIAL_DEBUG) namespace OHOS { @@ -443,6 +443,7 @@ void PrintWatchDialInfo(const watch_dial_info &info) void DebugGetAllWatchFaceInfo(int argc, char *argv[]) { + #ifdef FD230_650_0723 GraphicService::GetInstance()->PostGraphicEvent([]() { watch_dial_info *info = nullptr; uint8_t num = 0; @@ -456,6 +457,7 @@ void DebugGetAllWatchFaceInfo(int argc, char *argv[]) } free(info); }); + #endif } void DebugGetWatchFaceInfo(int argc, char *argv[]) @@ -544,6 +546,7 @@ void DebugUninstallWatch(int argc, char *argv[]) void DebugGetUuidByPath(int argc, char *argv[]) { + #ifdef FD230_650_0723 if (argc != 1) { printf("fmt: AT^UIKIT_DFX=debug_get_uuid \n"); return; @@ -564,6 +567,7 @@ void DebugGetUuidByPath(int argc, char *argv[]) return; } printf("Succuss to get file %s, uuid %u\n", path.c_str(), uuid); + #endif } #endif // defined (SUPPORT_DIAL_DEBUG) diff --git a/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.cpp b/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.cpp index e8781a684..0a3e466f4 100644 --- a/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.cpp +++ b/code/sdk/middleware/services/gui/uikit/sample/uitest/components/ui_test_video_play/ui_test_video_play.cpp @@ -18,7 +18,7 @@ #include "ui_test_video_play.h" #include "components/root_view.h" #ifdef SUPPORT_OHOSFWK -#include "screennotify/ui_screennotify.h" +#include "screennotify/include/ui_screennotify.h" #endif namespace OHOS { diff --git a/code/sdk/middleware/services/gui/uikit/ui/interfaces/kits/components/ui_picker.h b/code/sdk/middleware/services/gui/uikit/ui/interfaces/kits/components/ui_picker.h index 8a4521068..cd4e88bb2 100644 --- a/code/sdk/middleware/services/gui/uikit/ui/interfaces/kits/components/ui_picker.h +++ b/code/sdk/middleware/services/gui/uikit/ui/interfaces/kits/components/ui_picker.h @@ -603,6 +603,7 @@ private: char* backgroundFontName_; char* highlightFontName_; + uint8_t lineBreakMode_ = UILabel::LINE_BREAK_CLIP; uint16_t itemsWidth_; uint16_t itemsHeight_; const char** rangeValue_; diff --git a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_dst.c b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_dst.c index 1a4ec414a..b4c80ff9c 100644 --- a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_dst.c +++ b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_dst.c @@ -15,7 +15,8 @@ #include "errcode.h" #include "transmit_resume.h" #ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE -#include "bluetooth/BluetoothChangeBle.h" +#include "bluetooth/include/BluetoothChangeBle.h" + #endif #ifdef CONFIG_DFX_SUPPORT_PARTITION #if (CONFIG_DFX_SUPPORT_PARTITION == DFX_YES) diff --git a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_item.c b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_item.c index a92a75394..8f3f39fdf 100644 --- a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_item.c +++ b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_item.c @@ -22,7 +22,7 @@ #include "diag_msg.h" #include "diag_dfx.h" #ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE -#include "bluetooth/BluetoothChangeBle.h" +#include "bluetooth/include/BluetoothChangeBle.h" #endif #define TRANSMIT_ITEM_CNT 3 diff --git a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_src.c b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_src.c index 0975efbbb..d2732f7d6 100644 --- a/code/sdk/middleware/utils/dfx/diag_transmit/transmit_src.c +++ b/code/sdk/middleware/utils/dfx/diag_transmit/transmit_src.c @@ -20,7 +20,7 @@ #include "zdiag_adapt_layer.h" #include "errcode.h" #ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE -#include "bluetooth/BluetoothChangeBle.h" +#include "bluetooth/include/BluetoothChangeBle.h" #endif STATIC uint32_t transmit_data_read(transmit_item_t *item, uint32_t offset, uint8_t *buf, uint32_t size) diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230-r/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230-r/libx_vfs_private.a index 319a37815..ef8c37d47 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230-r/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230-r/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230/libx_vfs_private.a b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230/libx_vfs_private.a index 319a37815..1c08fcb6b 100644 Binary files a/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230/libx_vfs_private.a and b/code/sdk/middleware/utils/fs/vfs/brandy-native-js-fd230/libx_vfs_private.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230-r/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230-r/libfs_yaffs2.a index b9ee51284..00beb36cd 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230-r/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230-r/libfs_yaffs2.a differ diff --git a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230/libfs_yaffs2.a b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230/libfs_yaffs2.a index b9ee51284..50e244ad8 100644 Binary files a/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230/libfs_yaffs2.a and b/code/sdk/middleware/utils/fs/yaffs2/brandy-native-js-fd230/libfs_yaffs2.a differ diff --git a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-fd230/libams.a b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-fd230/libams.a index 8279bdf6c..b294a766d 100644 Binary files a/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-fd230/libams.a and b/code/sdk/open_source/openharmony/foundation/aafwk/aafwk_lite/brandy-native-js-fd230/libams.a differ diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libace.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libace.a index f829a5801..e807091dc 100644 Binary files a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libace.a and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libace.a differ diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libace_http.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libace_http.a new file mode 100644 index 000000000..cdfdb3135 Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libace_http.a differ diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libnetstack_http.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libnetstack_http.a new file mode 100644 index 000000000..b9c1bb00b Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libnetstack_http.a differ diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libwebsocket.a b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libwebsocket.a new file mode 100644 index 000000000..93b5e6f80 Binary files /dev/null and b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/brandy-native-js-fd230/libwebsocket.a differ diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/app_module.h b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/app_module.h index 50dca7468..87a2efd74 100644 --- a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/app_module.h +++ b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/app_module.h @@ -23,7 +23,8 @@ #include "product_adapter.h" #include "abilityms_slite_client.h" #include "NativeAbility.h" -#include "settings/SetDesktopModel.h" +// #include "settings/SetDesktopModel.h" +#include "themestyle/include/ThemeStyleModel.h" namespace OHOS { namespace ACELite { @@ -69,10 +70,10 @@ void TerminateWrapper(uint32_t token, bool forceStop) (void)forceStop; uint16_t preSliceId = NativeAbility::GetInstance().GetPreSliceId(); if (preSliceId == VIEW_APPLIST) { - if (SetDesktopModel::GetInstance().GetDesktopStyle() == HEXAGONS_STYLE) { + if (ThemeStyleModel::GetInstance().GetAppListDisplayStyle() == HEXAGONS_STYLE) { AbilityMsClient::GetInstance().TerminateAbility(token, TransitionType::TRANSITION_BACK_TO_HEXAGONS); return; - } else if (SetDesktopModel::GetInstance().GetDesktopStyle() == WATERFALL_STYLE) { + } else if (ThemeStyleModel::GetInstance().GetAppListDisplayStyle() == WATERFALL_STYLE) { AbilityMsClient::GetInstance().TerminateAbility(token, TransitionType::TRANSITION_BACK_TO_WATERFALL); return; } diff --git a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/network/network_module.cpp b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/network/network_module.cpp index c6363c052..54c14ccac 100644 --- a/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/network/network_module.cpp +++ b/code/sdk/open_source/openharmony/foundation/ace/ace_engine_lite/modules/network/network_module.cpp @@ -20,7 +20,7 @@ #include #include #include "network_module.h" -#include "bluetooth/BluetoothModel.h" +#include "bluetooth/include/BluetoothModel.h" #include "msg_center_protocol.h" #include "bts_le_gap.h" #include "network_listener.h" diff --git a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-fd230/libbms.a b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-fd230/libbms.a index ac4194c38..f262ad882 100644 Binary files a/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-fd230/libbms.a and b/code/sdk/open_source/openharmony/foundation/appexecfwk/appexecfwk_lite/brandy-native-js-fd230/libbms.a differ diff --git a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-fd230/libjerryscript.a b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-fd230/libjerryscript.a index 00de31cdc..bafd4fc5f 100644 Binary files a/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-fd230/libjerryscript.a and b/code/sdk/open_source/openharmony/third_party/jerryscript/brandy-native-js-fd230/libjerryscript.a differ diff --git a/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/include/lwip/def.h b/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/include/lwip/def.h index dfb266d18..6a2b9bb45 100644 --- a/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/include/lwip/def.h +++ b/code/sdk/open_source/openharmony/third_party/lwip/lwip_v2.1.3/src/include/lwip/def.h @@ -115,7 +115,8 @@ u32_t lwip_htonl(u32_t x); #endif /* BYTE_ORDER == BIG_ENDIAN */ /* Provide usual function names as macros for users, but this can be turned off */ -#ifndef LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS +// #ifndef LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS //为了编译能过屏蔽 +#ifdef LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS #define htons(x) lwip_htons(x) #define ntohs(x) lwip_ntohs(x) #define htonl(x) lwip_htonl(x) diff --git a/code/sdk/zhihui/UI/producttest/src/testA5133.cpp b/code/sdk/zhihui/UI/producttest/src/testA5133.cpp index 9ed8d2fd2..d37e7eeff 100644 --- a/code/sdk/zhihui/UI/producttest/src/testA5133.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testA5133.cpp @@ -2,7 +2,7 @@ #include "custom_utils.h" #include "producttest/include/testPresenter.h" #include "producttest/include/testA5133.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "cmsis_os2.h" #include "cat1_server.h" #include "cat1_ctl.h" @@ -11,7 +11,7 @@ #include "bts_br_gap.h" #include "bts_le_gap.h" #include "bleService.h" -#include "BluetoothModel.h" +#include "bluetooth/include/BluetoothModel.h" #include "producttest/include/testView.h" #ifdef SUPPORT_A5133_SERVICE #include "service/a5133_service.h" diff --git a/code/sdk/zhihui/UI/producttest/src/testGPS.cpp b/code/sdk/zhihui/UI/producttest/src/testGPS.cpp index af625e222..02cb844e5 100644 --- a/code/sdk/zhihui/UI/producttest/src/testGPS.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testGPS.cpp @@ -2,7 +2,7 @@ #include "custom_utils.h" #include "producttest/include/testPresenter.h" // #include "producttest/include/testcat1.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "cmsis_os2.h" #if defined(SUPPORT_GNSS) diff --git a/code/sdk/zhihui/UI/producttest/src/testPing.cpp b/code/sdk/zhihui/UI/producttest/src/testPing.cpp index 70a4714a2..52432558a 100644 --- a/code/sdk/zhihui/UI/producttest/src/testPing.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testPing.cpp @@ -2,7 +2,7 @@ #include "custom_utils.h" #include "producttest/include/testPresenter.h" #include "producttest/include/testPing.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "cmsis_os2.h" #ifdef SUPPORT_CAT1_SERVICE #include "cat1_server.h" diff --git a/code/sdk/zhihui/UI/producttest/src/testbt.cpp b/code/sdk/zhihui/UI/producttest/src/testbt.cpp index 1122db387..fb79422dd 100644 --- a/code/sdk/zhihui/UI/producttest/src/testbt.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testbt.cpp @@ -2,7 +2,7 @@ #include "custom_utils.h" #include "producttest/include/testPresenter.h" #include "producttest/include/testbt.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "cmsis_os2.h" #ifdef SUPPORT_CAT1_SERVICE #include "cat1_server.h" @@ -17,7 +17,7 @@ #include "bleService.h" #endif -#include "BluetoothModel.h" +#include "bluetooth/include/BluetoothModel.h" #include "producttest/include/testView.h" #ifdef __cplusplus #if __cplusplus diff --git a/code/sdk/zhihui/UI/producttest/src/testbutton.cpp b/code/sdk/zhihui/UI/producttest/src/testbutton.cpp index 087b6ea39..fcd269b99 100644 --- a/code/sdk/zhihui/UI/producttest/src/testbutton.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testbutton.cpp @@ -2,7 +2,7 @@ #include "custom_utils.h" #include "producttest/include/testPresenter.h" #include "producttest/include/testbutton.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "cmsis_os2.h" #include "producttest/include/testView.h" #ifdef __cplusplus diff --git a/code/sdk/zhihui/UI/producttest/src/testcat1.cpp b/code/sdk/zhihui/UI/producttest/src/testcat1.cpp index 8c1171645..824499b72 100644 --- a/code/sdk/zhihui/UI/producttest/src/testcat1.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testcat1.cpp @@ -2,7 +2,7 @@ #include "custom_utils.h" #include "producttest/include/testPresenter.h" #include "producttest/include/testcat1.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "cmsis_os2.h" #ifdef SUPPORT_CAT1_SERVICE #include "cat1_server.h" diff --git a/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp index bcde2a16f..80f411c8b 100644 --- a/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp @@ -2,7 +2,7 @@ #include "custom_utils.h" #include "producttest/include/testPresenter.h" #include "producttest/include/testhrsenson.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "cmsis_os2.h" #include "producttest/include/testView.h" #ifdef __cplusplus diff --git a/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp b/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp index 97b482655..e3c762801 100644 --- a/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp @@ -2,7 +2,7 @@ #include "custom_utils.h" #include "producttest/include/testPresenter.h" #include "producttest/include/testmicrophone.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "cmsis_os2.h" #include "audio_capture_wrapper.h" #include "producttest/include/testView.h" diff --git a/code/sdk/zhihui/UI/producttest/src/testmotor.cpp b/code/sdk/zhihui/UI/producttest/src/testmotor.cpp index a71ff4c85..e5fbe78c6 100644 --- a/code/sdk/zhihui/UI/producttest/src/testmotor.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testmotor.cpp @@ -2,7 +2,7 @@ #include "custom_utils.h" #include "producttest/include/testPresenter.h" #include "producttest/include/testmotor.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "cmsis_os2.h" #include "dock/vibrator_manager.h" #include "vibrator_service.h" diff --git a/code/sdk/zhihui/UI/producttest/src/testold.cpp b/code/sdk/zhihui/UI/producttest/src/testold.cpp index 3de638e60..c97d33119 100644 --- a/code/sdk/zhihui/UI/producttest/src/testold.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testold.cpp @@ -2,7 +2,7 @@ #include "custom_utils.h" #include "producttest/include/testPresenter.h" #include "producttest/include/testold.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "cmsis_os2.h" #include "producttest/include/testView.h" diff --git a/code/sdk/zhihui/UI/producttest/src/testspeak.cpp b/code/sdk/zhihui/UI/producttest/src/testspeak.cpp index 182ae419d..0824da990 100644 --- a/code/sdk/zhihui/UI/producttest/src/testspeak.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testspeak.cpp @@ -2,7 +2,7 @@ #include "custom_utils.h" #include "producttest/include/testPresenter.h" #include "producttest/include/testspeak.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" #include "cmsis_os2.h" #include "producttest/include/testView.h" #ifdef __cplusplus diff --git a/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp b/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp index cf555db63..e815f57a8 100644 --- a/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp +++ b/code/sdk/zhihui/services/ble_service/blemoder/ble_instruct_init.cpp @@ -6,7 +6,7 @@ #include "MusicPlayerModel.h" #include "phoneaddressmodel.h" #include "TraingModel.h" -#include "AlarmClockModel.h" +#include "alarm/include/AlarmClockModel.h" // #include "SetDialModel.h" #include "SleepModel.h" #include "PlayersModel.h" diff --git a/code/sdk/zhihui/services/ble_service/blemoder/bleinstruct_sample.cpp b/code/sdk/zhihui/services/ble_service/blemoder/bleinstruct_sample.cpp index 2e9c9dad1..49a3b6872 100644 --- a/code/sdk/zhihui/services/ble_service/blemoder/bleinstruct_sample.cpp +++ b/code/sdk/zhihui/services/ble_service/blemoder/bleinstruct_sample.cpp @@ -54,7 +54,7 @@ #include "SetDialModel.h" #include "AiVoiceModel.h" #include "SleepModel.h" -#include "BluetoothModel.h" +#include "bluetooth/include/BluetoothModel.h" #include "MusicPlayerModel.h" #include "UiConfig.h"