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 c394f7c..2d59dca 100644 (file)
--- 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"\r
 #include "cmsis_os2.h"\r
 #ifdef SUPPORT_OHOSFWK\r
-#include "bluetooth/BluetoothWrapper.h"\r
+#include "bluetooth/include/BluetoothWrapper.h"\r
 #endif\r
 \r
 /* Gatt service UUID */\r

diff --git a/code/sdk/application/wearable/fd230/nativeabilityfwk/CMakeLists.txt b/code/sdk/application/wearable/fd230/nativeabilityfwk/CMakeLists.txt
index 63e56e8..b59c597 100644 (file)
--- 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 a28bd30..8c03756 100644 (file)
--- 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 37810c7..4133b66 100644 (file)
--- 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 da9c421..1544233 100644 (file)
--- 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 a5bb730..7defcd4 100644 (file)
--- 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 371208b..025be94 100644 (file)
--- 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 b1ab9d2..e3ce469 100644 (file)
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 67c8400..0a7158e 100644 (file)
--- 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 9f5e3a5..920e99a 100644 (file)
--- 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 67ca8c2..c9d8f20 100644 (file)
--- 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 <cstdint>
-namespace OHOS {
-enum UIResourceTextId : uint16_t {
+/*\r
+* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.\r
+* Description: language\r
+* Author: Graphic develop team\r
+* Create: 2021-07-06\r
+*/\r
+\r
+#ifndef UI_RESOURCE_STRING_H\r
+#define UI_RESOURCE_STRING_H\r
+#include <cstdint>\r
+namespace OHOS {\r
+enum UIResourceTextId : uint16_t {\r
     STR_EXERCISE_OUTDOORWALKING = 0,\r
     STR_EXERCISE_OUTDOORRUNNING = 1,\r
     STR_EXERCISE_OUTDOORBIKING = 2,\r
@@ -659,8 +659,8 @@ enum UIResourceTextId : uint16_t {
     STR_AOD_REMIND = 646,\r
     STR_MAX_ID = 647,\r
 }; // UIResourceTextId\r
-
-enum FontLanguageId : uint8_t {
+\r
+enum FontLanguageId : uint8_t {\r
     LANGUAGE_ID_AR,\r
     LANGUAGE_ID_AZ,\r
     LANGUAGE_ID_CS,\r

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 7542e82..ba3a83e 100644 (file)
--- 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 db661a3..dc46b15 100644 (file)
--- 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 <ctime>\r
 #include <cstdio>\r
 #include "ohos_types.h"\r
-#include "RtcService.h"\r
+#include "rtcservice/include/RtcService.h"\r
 #include "samgr_lite.h"\r
 \r
 namespace OHOS {\r

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 7ff632e..b69a517 100644 (file)
--- 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\r
 \r
 #include <ctime>\r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "MainActivityView.h"\r
 \r

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 06a8c75..bce288c 100644 (file)
--- 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"\r
 #include "wearable_log.h"\r
 #include "components/ui_card_page.h"\r
-#include "ActivityModel.h"\r
+#include "activity/include/ActivityModel.h"\r
 \r
 namespace OHOS {\r
 #define DAYS 7\r

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 ff02406..778074d 100644 (file)
--- 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"\r
 #include "graphic_config.h"\r
 #include "ModelListenerSample.h"\r
-#include "ActivityModel.h"\r
+#include "activity/include/ActivityModel.h"\r
 #include "ActivityPresenter.h"\r
 #include "ActivityWeekView.h"\r
 \r

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 b0b6d02..83939ea 100644 (file)
--- 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 c381e72..e1b3507 100644 (file)
--- 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"\r
 #include "components/ui_checkbox.h"\r
 #include "UiConfig.h"\r
-#include "ActivityPresenter.h"\r
+#include "activity/include/ActivityPresenter.h"\r
 #include "NativeRegisterManager.h"\r
 \r
 namespace OHOS {\r

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 abf06b5..757be33 100644 (file)
--- 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\r
  */\r
 \r
-#include "ActivityWeekView.h"\r
-#include "ActivityPresenter.h"\r
+#include "activity/include/ActivityWeekView.h"\r
+#include "activity/include/ActivityPresenter.h"\r
 #include "common/image_cache_manager.h"\r
 \r
 namespace OHOS {\r

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 d9f3075..9da37aa 100644 (file)
--- 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 @@
  */\r
 \r
 #include "components/ui_label.h"\r
-#include "MainActivityView.h"\r
+#include "activity/include/MainActivityView.h"\r
 \r
 namespace OHOS {\r
 \r

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 8f18d42..61191e6 100644 (file)
--- 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 22a2490..a590d4c 100644 (file)
--- 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 <map>
 #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 212efc2..f5802cd 100644 (file)
--- 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 2b6c1a2..e82b8cd 100644 (file)
--- 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 d92f38d..d3420b5 100644 (file)
--- 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 6e68bca..31d9c23 100644 (file)
--- 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\r
  */\r
 \r
-#include "AddCardItem.h"\r
-#include "AddCardPresenter.h"\r
+#include "add_card/include/AddCardItem.h"\r
+#include "add_card/include/AddCardPresenter.h"\r
 #include "wearable_log.h"\r
 #include "components/ui_canvas_ext.h"\r
 \r

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 fd0c9d6..db2daf3 100644 (file)
--- 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 f71866e..ec70283 100644 (file)
--- 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 62fe5ba..0da9759 100644 (file)
--- 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 <string>
-#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 2b162ea..d432da2 100644 (file)
--- 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 16631fb..88bd1bc 100644 (file)
--- 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 @@
 \r
 #include "ohos_types.h"\r
 #include "list.h"\r
-#include "AlmmgrAlarmClockManage.h"\r
+#include "alarmclockmanage/include/AlarmClockManage.h"\r
 #include "player.h"\r
 #include "source.h"\r
 #include "broadcast_feature.h"\r

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 c5cfb00..440013a 100644 (file)
--- 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"\r
 #include "components/ui_label_button.h"\r
 #include "UiConfig.h"\r
-#include "AlarmClockModel.h"\r
+#include "alarm/include/AlarmClockModel.h"\r
 #include "ChangeSliceListener.h"\r
 #include "components/ui_label_ext.h"\r
 \r

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 3982b02..59d8463 100644 (file)
--- 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"\r
 #include "common/screen.h"\r
 #include "gfx_utils/graphic_log.h"\r
-#include "AlarmClockModel.h"\r
+#include "alarm/include/AlarmClockModel.h"\r
 #include "components/ui_label_button_ext.h"\r
 #include "components/ui_label_ext.h"\r
 \r

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 e13d6e6..66be07f 100644 (file)
--- 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\r
 #define ALARM_JUDGE_VIEW_H\r
 \r
+#include "common/screen.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
@@ -21,7 +22,7 @@
 #include "font/ui_font.h"\r
 #include "common/screen.h"\r
 #include "AlarmPresenter.h"\r
-#include "AlarmClockModel.h"\r
+#include "alarm/include/AlarmClockModel.h"\r
 #include "components/ui_label_ext.h"\r
 #include "components/ui_label_button_ext.h"\r
 namespace OHOS {\r

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 fb1eef0..07881b7 100644 (file)
--- 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"\r
 #include "common/screen.h"\r
 #include "AlarmPresenter.h"\r
-#include "AlarmClockModel.h"\r
+#include "alarm/include/AlarmClockModel.h"\r
 #include "components/ui_label_ext.h"\r
 \r
 namespace OHOS {\r

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 9aac650..19a1a3b 100644 (file)
--- 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"\r
 #include "View.h"\r
 #include "AlarmPresenter.h"\r
-#include "AlarmClockModel.h"\r
+#include "alarm/include/AlarmClockModel.h"\r
 #include "components/ui_label_button_ext.h"\r
 \r
 namespace OHOS {\r

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 632c010..7010d07 100644 (file)
--- 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 @@
 \r
 #include <string>\r
 #include "View.h"\r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "ChangeSliceListener.h"\r
 #include "UiConfig.h"\r
@@ -27,10 +28,10 @@
 #include "components/ui_digital_clock.h"\r
 #include "gfx_utils/graphic_log.h"\r
 #include "ModelListenerSample.h"\r
-#include "AlarmCloseRingView.h"\r
+#include "alarm/include/AlarmCloseRingView.h"\r
 #include "AlarmRingView.h"\r
 #include "AlarmPopUpView.h"\r
-#include "AlarmClockModel.h"\r
+#include "alarm/include/AlarmClockModel.h"\r
 #include "wearable_log.h"\r
 \r
 namespace OHOS {\r

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 107c4a6..ef2421b 100644 (file)
--- 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"\r
 #include "components/ui_digital_clock.h"\r
 #include "AlarmSetTimeView.h"\r
-#include "AlarmCloseRingView.h"\r
+#include "alarm/include/AlarmCloseRingView.h"\r
 #include "AlarmRingView.h"\r
-#include "AlarmClockModel.h"\r
+#include "alarm/include/AlarmClockModel.h"\r
 #include "UiConfig.h"\r
 \r
 namespace OHOS {\r

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 c28a0c1..e7e0287 100644 (file)
--- 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\r
 #define ALARM_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "ChangeSliceListener.h"\r
 #include "UiConfig.h"\r
@@ -24,7 +25,7 @@
 #include "components/ui_time_picker.h"\r
 #include "components/ui_digital_clock.h"\r
 #include "gfx_utils/graphic_log.h"\r
-#include "AlarmClockModel.h"\r
+#include "alarm/include/AlarmClockModel.h"\r
 #include "wearable_log.h"\r
 #include "color.h"\r
 \r

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 b79eb12..399bdce 100644 (file)
--- 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"\r
 #include "components/ui_digital_clock.h"\r
 #include "UiConfig.h"\r
-#include "AlarmClockModel.h"\r
+#include "alarm/include/AlarmClockModel.h"\r
 #include "ChangeSliceListener.h"\r
 \r
 namespace OHOS {\r

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 a21cc54..ac08435 100644 (file)
--- 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"\r
 #include "View.h"\r
 #include "AlarmPresenter.h"\r
-#include "AlarmClockModel.h"\r
+#include "alarm/include/AlarmClockModel.h"\r
 #include "wearable_log.h"\r
 #include "components/ui_label_button_ext.h"\r
 \r

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 04d3719..4df0bbe 100644 (file)
--- 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"\r
 #include "components/ui_time_picker.h"\r
 #include "AlarmPresenter.h"\r
-#include "AlarmClockModel.h"\r
+#include "alarm/include/AlarmClockModel.h"\r
 #include "components/ui_label_ext.h"\r
 #include "components/ui_label_button_ext.h"\r
 \r

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 13ac3db..c6c1e38 100644 (file)
--- 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 22b1cf7..7169f75 100644 (file)
--- 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 16813e1..51dfcce 100644 (file)
--- 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\r
  */\r
 \r
-#include "AlarmCloseRingView.h"\r
+#include "alarm/include/AlarmCloseRingView.h"\r
 #include "common/screen.h"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
@@ -13,7 +13,7 @@
 #include "ohos_timer.h"\r
 #include "graphic_timer.h"\r
 \r
-#include "AlarmPopUpPresenter.h"\r
+#include "alarm/include/AlarmPopUpPresenter.h"\r
 \r
 namespace OHOS {\r
 #define CLOSE "关闭"\r

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 320be47..c3fae04 100644 (file)
--- 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\r
  */\r
 \r
-#include "AlarmConfigView.h"\r
+#include "alarm/include/AlarmConfigView.h"\r
 #include "UiConfig.h"\r
 #include <string>\r
-#include "AlarmPresenter.h"\r
+#include "alarm/include/AlarmPresenter.h"\r
 #include <sstream>\r
 #include "color.h"\r
 #include "ConfigModel.h"\r

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 570da74..5567d74 100644 (file)
--- 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\r
  */\r
 \r
-#include "AlarmMaxClock.h"\r
+#include "alarm/include/AlarmMaxClock.h"\r
 #include "UiConfig.h"\r
 #include <string>\r
 #include "ohos_timer.h"\r
 #include "graphic_timer.h"\r
 \r
-#include "AlarmPresenter.h"\r
-#include "MainAlarmView.h"\r
+#include "alarm/include/AlarmPresenter.h"\r
+#include "alarm/include/MainAlarmView.h"\r
 #include "ui_resource_string.h"\r
 \r
 namespace OHOS {\r

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 e514488..1253b9a 100644 (file)
--- 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\r
  */\r
 \r
-#include "AlarmNewTimeView.h"\r
+#include "alarm/include/AlarmNewTimeView.h"\r
 #include "common/screen.h"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r

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 2ae51d2..86b24ac 100644 (file)
--- 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 @@
  */\r
 \r
 \r
-#include "AlarmPopUpPresenter.h"\r
-#include "MainAlarmView.h"\r
+#include "alarm/include/AlarmPopUpPresenter.h"\r
+#include "alarm/include/MainAlarmView.h"\r
 #include "ChangeSliceListener.h"\r
-#include "PhoneService.h"\r
-#include "PlayersModel.h"\r
+#include "phoneservice/include/PhoneService.h"\r
+#include "player/include/PlayersModel.h"\r
 #include "NativeRegisterManager.h"\r
 \r
 namespace OHOS {\r

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 29ad7f6..a28f43e 100644 (file)
--- 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\r
  */\r
 \r
-#include "AlarmPopUpView.h"\r
-#include "AlarmPopUpPresenter.h"\r
+#include "alarm/include/AlarmPopUpView.h"\r
+#include "alarm/include/AlarmPopUpPresenter.h"\r
 #include "common/screen.h"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r

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 bb44932..feadd1e 100644 (file)
--- 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\r
  */\r
 \r
-#include "AlarmRingView.h"\r
+#include "alarm/include/AlarmRingView.h"\r
 #include "common/screen.h"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
 #include <string>\r
-#include "AlarmPopUpPresenter.h"\r
+#include "alarm/include/AlarmPopUpPresenter.h"\r
 #include "ohos_timer.h"\r
 #include "graphic_timer.h"\r
-#include "PhoneService.h"\r
+#include "phoneservice/include/PhoneService.h"\r
 \r
 namespace OHOS {\r
 #define RING_AGAIN "响铃将在十分钟后再次响起"\r

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 90923c1..febc742 100644 (file)
--- 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\r
  */\r
 \r
-#include "AlarmSetTimeView.h"\r
+#include "alarm/include/AlarmSetTimeView.h"\r
 #include "common/screen.h"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r

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 2843658..bfbb8ab 100644 (file)
--- 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\r
  */\r
 \r
-#include "AlarmSetWeekView.h"\r
+#include "alarm/include/AlarmSetWeekView.h"\r
 #include "common/screen.h"\r
 #include "components/ui_digital_clock.h"\r
 #include "ui_resource_string.h"\r

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 e836e06..037f7c3 100644 (file)
--- 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 869857e..46023c4 100644 (file)
--- 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 <climits>\r
 \r
 #include "ohos_types.h"\r
-#include "AlarmClockTimerConfig.h"\r
+#include "alarmclocktimerconfig/include/AlarmClockTimerConfig.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

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 6d91ca9..10b89af 100644 (file)
--- 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 22d65b3..eace029 100644 (file)
--- 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"\r
 #include "graphic_service.h"\r
 \r
-#include "AlarmClockTimerConfig.h"\r
+#include "alarmclocktimerconfig/include/AlarmClockTimerConfig.h"\r
 \r
 #include "ConfigModelC.h"\r
 #include "ConfigModel.h"\r

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 12426d6..55e5c86 100644 (file)
--- 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"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_barcode.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 \r
 namespace OHOS {\r
 class AlipayBarCode : public UIViewGroup {\r

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 bfe2153..1357149 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 #include "components/ui_qrcode.h"\r
 \r
 namespace OHOS {\r

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 d8c0cf6..2ef321d 100644 (file)
--- 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"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_image_animator.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 \r
 #define ALIPAY_BIND_SEARCH_IMAGE_NUM 8\r
 \r

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 5b7f9a6..4102c99 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 \r
 namespace OHOS {\r
 class AlipayBindRes : public UIViewGroup {\r

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 95ae61c..72489dd 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 \r
 namespace OHOS {\r
 class AlipayExitBind : public UIViewGroup {\r

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 350da21..a759ae3 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 #include "components/ui_qrcode.h"\r
 \r
 namespace OHOS {\r

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 60442a8..5b8dbfc 100644 (file)
--- 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 a5ffbd8..4ca06dc 100644 (file)
--- 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"\r
 #include "ChangeSliceListener.h"\r
 #include "components/ui_swipe_view.h"\r
-#include "AlipayPresenter.h"\r
-#include "AlipayModel.h"\r
-#include "AlipayBind.h"\r
-#include "AlipayExitBind.h"\r
-#include "AlipayBindRes.h"\r
-#include "AlipayBindAni.h"\r
-#include "AlipayListView.h"\r
-#include "AlipayBarCode.h"\r
-#include "AlipayPayCode.h"\r
-#include "AlipaySetting.h"\r
-#include "AlipayHelp.h"\r
-#include "AlipayUnbindFinish.h"\r
-#include "AlipayUnbind.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
+#include "alipay/include/AlipayModel.h"\r
+#include "alipay/include/AlipayBind.h"\r
+#include "alipay/include/AlipayExitBind.h"\r
+#include "alipay/include/AlipayBindRes.h"\r
+#include "alipay/include/AlipayBindAni.h"\r
+#include "alipay/include/AlipayList/AlipayListView.h"\r
+#include "alipay/include/AlipayBarCode.h"\r
+#include "alipay/include/AlipayPayCode.h"\r
+#include "alipay/include/AlipaySetting.h"\r
+#include "alipay/include/AlipayHelp.h"\r
+#include "alipay/include/AlipayUnbindFinish.h"\r
+#include "alipay/include/AlipayUnbind.h"\r
 \r
-#include "AlipayGetTransList.h"\r
-#include "AlipayTransTips.h"\r
-#include "AlipayTransCode.h"\r
-#include "AlipayTransEnable.h"\r
-#include "AlipayTransRes.h"\r
-#include "AlipayTransListView.h"\r
-#include "AlipayTransAni.h"\r
+#include "alipay/include/AlipayTrans/AlipayGetTransList.h"\r
+#include "alipay/include/AlipayTrans/AlipayTransTips.h"\r
+#include "alipay/include/AlipayTrans/AlipayTransCode.h"\r
+#include "alipay/include/AlipayTrans/AlipayTransEnable.h"\r
+#include "alipay/include/AlipayTrans/AlipayTransRes.h"\r
+#include "alipay/include/AlipayTrans/AlipayTransListView.h"\r
+#include "alipay/include/AlipayTrans/AlipayTransAni.h"\r
 \r
 namespace OHOS {\r
 class AlipayMainView;\r

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 6ef24cb..ae5964f 100644 (file)
--- 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"\r
 #include "components/ui_button.h"\r
 #include "components/ui_qrcode.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 \r
 namespace OHOS {\r
 class AlipayPayCode : public UIViewGroup {\r

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 1c038b9..eda67f7 100644 (file)
--- 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\r
 #define ALIPAY_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "UiConfig.h"\r
 #include "wearable_log.h"\r
 #include "color.h"\r
-#include "AlipayModel.h"\r
+#include "alipay/include/AlipayModel.h"\r
 \r
-#include "KeyInputListener.h"\r
+#include "key/include/KeyInputListener.h"\r
 #include "common/key_code.h"\r
 \r
 namespace OHOS {\r

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 fe03e30..c69792d 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 #include "components/ui_qrcode.h"\r
 \r
 namespace OHOS {\r

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 0f9d314..16c310e 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 #include "components/ui_qrcode.h"\r
 \r
 namespace OHOS {\r

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 a5c6714..755fbed 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
+\r
 \r
 namespace OHOS {\r
 class AlipayGetTransList : public UIViewGroup {\r

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 fc577b8..af81791 100644 (file)
--- 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"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_image_animator.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 \r
 #define ALIPAY_TRANS_SEARCH_IMAGE_NUM 8\r
 \r

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 d4ba750..303ffe9 100644 (file)
--- 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"\r
 #include "components/ui_button.h"\r
 #include "components/ui_qrcode.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 \r
 namespace OHOS {\r
 class AlipayTransCode : public UIViewGroup {\r

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 e2af18b..f237983 100644 (file)
--- 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"\r
 #include "components/ui_button.h"\r
 #include "components/ui_qrcode.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 \r
 namespace OHOS {\r
 class AlipayTransEnable : public UIViewGroup {\r

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 2331930..13dffb7 100644 (file)
--- 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 ca6886b..fe0f6b9 100644 (file)
--- 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 23cb4fe..9caaf45 100644 (file)
--- 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 57a93a1..8df25a5 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 \r
 namespace OHOS {\r
 class AlipayTransRes : public UIViewGroup {\r

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 0254ab8..7f533ac 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 \r
 namespace OHOS {\r
 class AlipayTransTips : public UIViewGroup {\r

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 8118d59..02f9c38 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 \r
 namespace OHOS {\r
 class AlipayUnbind : public UIViewGroup {\r

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 9221d78..34e940f 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
-#include "AlipayPresenter.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
 #include "components/ui_qrcode.h"\r
 \r
 namespace OHOS {\r

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 5e8723d..daabbfa 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "AlipayBarCode.h"\r
-#include "AlipayModel.h"\r
+#include "alipay/include/AlipayBarCode.h"\r
+#include "alipay/include/AlipayModel.h"\r
 \r
 namespace OHOS {\r
 #define ALIPAY_BARCODE_SPACE 32\r

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 7809495..19997d4 100644 (file)
--- 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 @@
  */\r
 #include "UiConfig.h"\r
 #include <string>\r
-#include "AlipayBind.h"\r
-#include "AlipayModel.h"\r
+#include "alipay/include/AlipayBind.h"\r
+#include "alipay/include/AlipayModel.h"\r
 \r
 namespace OHOS {\r
 static const char *BIND_TITLE = (char *)"使用支付宝扫码绑定";\r

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 b5da85e..e6a6121 100644 (file)
--- 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"\r
 #include "font/ui_font.h"\r
 #include <string>\r
-#include "AlipayBindAni.h"\r
+#include "alipay/include/AlipayBindAni.h"\r
 #include "common/image_cache_manager.h"\r
 #include "graphic_service.h"\r
 \r

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 acde3eb..f6ffa97 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "AlipayBindRes.h"\r
-#include "AlipayModel.h"\r
+#include "alipay/include/AlipayBindRes.h"\r
+#include "alipay/include/AlipayModel.h"\r
 \r
 namespace OHOS {\r
 static const int16 EXIT_LABEL_X_FIRST = 83;\r

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 c24d184..6368e21 100644 (file)
--- 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"\r
 #include "font/ui_font.h"\r
 #include <string>\r
-#include "AlipayExitBind.h"\r
+#include "alipay/include/AlipayExitBind.h"\r
+\r
 \r
 namespace OHOS {\r
 \r

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 a772a5c..cfe9c6e 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "AlipayHelp.h"\r
-#include "AlipayModel.h"\r
+#include "alipay/include/AlipayHelp.h"\r
+#include "alipay/include/AlipayModel.h"\r
 \r
 namespace OHOS {\r
 static const char *HELP_TITLE = (char*)"使用支付宝扫码求助";\r

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 75b2d2d..2af3bab 100644 (file)
--- 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 c772264..fab1a83 100644 (file)
--- 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 91be991..aa0b120 100644 (file)
--- 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 <string>
-// #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 8757eb6..9fb10f1 100644 (file)
--- 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:\r
  */\r
 \r
-#include "AlipayMainView.h"\r
+#include "alipay/include/AlipayMainView.h"\r
 #include "UiConfig.h"\r
 #include "alipay_feature.h"\r
 #include "custom_utils.h"\r
-#include "AlipayC.h"\r
+#include "alipay/include/AlipayC.h"\r
 \r
 bool is_Alipay_bind(void)\r
 {\r

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 e583eed..45e53be 100644 (file)
--- 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 @@
 \r
 #include "UiConfig.h"\r
 #include "alipay_feature.h"\r
-#include "AlipayModel.h"\r
-#include "AlipayMainView.h"\r
+#include "alipay/include/AlipayModel.h"\r
+#include "alipay/include/AlipayMainView.h"\r
 #include "graphic_service.h"\r
 \r
 #include "power_display_service.h"\r

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 80f52fa..0a6364a 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "AlipayPayCode.h"\r
-#include "AlipayModel.h"\r
+#include "alipay/include/AlipayPayCode.h"\r
+#include "alipay/include/AlipayModel.h"\r
 \r
 namespace OHOS {\r
 static AlipayPayCode *g_alipayPayCode = nullptr;\r

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 e95c202..f4c0789 100644 (file)
--- 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:\r
  */\r
 \r
-#include "AlipayPresenter.h"\r
-#include "AlipayMainView.h"\r
+#include "alipay/include/AlipayPresenter.h"\r
+#include "alipay/include/AlipayMainView.h"\r
 #include "ChangeSliceListener.h"\r
 #include "graphic_service.h"\r
 #include "string"\r
@@ -14,15 +14,15 @@
 #include "sstream"\r
 #include "errcode.h"\r
 #include "pm_definition.h"\r
-#include "AlipayListView.h"\r
-#include "AlipayListItemView.h"\r
-#include "AlipayTransListItemView.h"\r
-#include "AlipayTransListView.h"\r
+#include "alipay/include/AlipayList/AlipayListView.h"\r
+#include "alipay/include/AlipayList/AlipayListItemView.h"\r
+#include "alipay/include/AlipayTrans/AlipayTransListItemView.h"\r
+#include "alipay/include/AlipayTrans/AlipayTransListView.h"\r
 #include "NativeRegisterManager.h"\r
 #include "custom_utils.h"\r
 #include "common/key_code.h"\r
 #include "gfx_utils/mem_check.h"\r
-#include "AlipayC.h"\r
+#include "alipay/include/AlipayC.h"\r
 #include "ui_resource_string.h"\r
 namespace OHOS {\r
 \r

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 1431015..ef7ec2d 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-// #include "AlipaySetting.h"\r
-// #include "AlipayModel.h"\r
 #include "alipay/include/AlipaySetting.h"\r
 #include "alipay/include/AlipayModel.h"\r
 #include "uicomponents/UIComponents.h"\r

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 0bdadd0..b44bbb0 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "AlipayGetTransList.h"\r
+#include "alipay/include/AlipayTrans/AlipayGetTransList.h"\r
 \r
 namespace OHOS {\r
 static const int16 EXIT_LABEL_X_FIRST = 60;\r

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 37adb66..7f9eb53 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "AlipayTransAni.h"\r
+#include "alipay/include/AlipayTrans/AlipayTransAni.h"\r
 #include "common/image_cache_manager.h"\r
 #include "graphic_service.h"\r
 \r

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 b32347c..923fa41 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "AlipayTransCode.h"\r
-#include "AlipayModel.h"\r
+#include "alipay/include/AlipayTrans/AlipayTransCode.h"\r
+#include "alipay/include/AlipayModel.h"\r
 \r
 namespace OHOS {\r
 static const char *TRANSCODE_BUTTON = (char *)"切换交通卡";\r

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 8b42995..c26979c 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "AlipayTransEnable.h"\r
-#include "AlipayModel.h"\r
+#include "alipay/include/AlipayTrans/AlipayTransEnable.h"\r
+#include "alipay/include/AlipayModel.h"\r
 \r
 namespace OHOS {\r
 static const char *TRANSCODE_TITLE = (char *)"乘车码未开通";\r

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 703c4b2..4d80ad7 100644 (file)
--- 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 96fe00d..961956e 100644 (file)
--- 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 b5307c5..3299bfa 100644 (file)
--- 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 <string>
-#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 c7b5558..4bf1a90 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "AlipayTransRes.h"\r
-#include "AlipayModel.h"\r
+#include "alipay/include/AlipayTrans/AlipayTransRes.h"\r
+#include "alipay/include/AlipayModel.h"\r
 \r
 namespace OHOS {\r
 static const int16 EXIT_LABEL_X_FIRST = 38;\r

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 79ffdd8..ce15d75 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-// #include "AlipayTransTips.h"\r
-// #include "AlipayModel.h"\r
 #include "alipay/include/AlipayTrans/AlipayTransTips.h"\r
 #include "alipay/include/AlipayModel.h"\r
 \r

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 0107e26..7c6749a 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-// #include "AlipayUnbind.h"\r
 #include "alipay/include/AlipayUnbind.h"\r
 \r
 namespace OHOS {\r

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 9a3c629..ce66792 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-// #include "AlipayUnbindFinish.h"\r
 #include "alipay/include/AlipayUnbindFinish.h"\r
 namespace OHOS {\r
 static AlipayUnbindFinish *g_alipayUnbindFinish = nullptr;\r

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 6958685..c1ec92b 100644 (file)
--- 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 969fc9c..35d4565 100644 (file)
--- 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 0bcf7af..85b6ac3 100644 (file)
--- 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<AodPresenter> {

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 e06b38c..6e88211 100644 (file)
--- 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 c08a747..863c11b 100644 (file)
--- 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 7943c5a..f56d0d4 100644 (file)
--- 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 bd89ec7..eebb4af 100644 (file)
--- 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 b66b151..6ccb3a3 100644 (file)
--- 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 d9e8f68..95d4510 100644 (file)
--- 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 9185875..0945800 100644 (file)
--- 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 8663911..fbe5b16 100644 (file)
--- 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 39c67f3..3ce95f3 100644 (file)
--- 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 c570478..eb0a839 100644 (file)
--- 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 673315a..146a17f 100644 (file)
--- 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 6fc004c..4943053 100644 (file)
--- 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 4c72998..336e77f 100644 (file)
--- 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 26f2da7..ec6ea74 100644 (file)
--- 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 <vector>
 
 // #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 b83083c..8fa3b66 100644 (file)
--- 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 2eb9ed4..821b2d9 100644 (file)
--- 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 b02ba0b..ca5bc38 100644 (file)
--- 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 b514467..99600ad 100644 (file)
--- 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 835b328..075f8be 100644 (file)
--- 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 b0fdf85..2e117ce 100644 (file)
--- 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 a37656b..7407406 100644 (file)
--- 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 7cb38d8..53cbdd3 100644 (file)
--- 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 <ui_scroll_view.h>
 #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 5edaa12..17de25f 100644 (file)
--- 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 (file)
index 0000000..fb6b043
--- /dev/null
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothChangeBle.h
@@ -0,0 +1,17 @@
+/*\r
+ * Copyright (c) @CompanyNameMagicTag 2021-2023. All rights reserved.\r
+ * Description: transmit header file\r
+ * This file should be changed only infrequently and with great care.\r
+ */\r
+#ifndef BLUETOOTH_CHANGE_BLE_H\r
+#define BLUETOOTH_CHANGE_BLE_H\r
+\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif\r
+void ChangeBleConnectToMax(void);\r
+void ChangeBleConnectToDefault(void);\r
+#ifdef __cplusplus\r
+}\r
+#endif\r
+#endif\r

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 2f8784a..e03938a 100644 (file)
--- 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 03ebbe1..2a7e4f7 100644 (file)
--- 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"\r
 #include "components/ui_label_button_ext.h"\r
 #include "components/ui_list.h"\r
-#include "BluetoothDeviceCaseListAdapter.h"\r
+#include "bluetooth/include/BluetoothDeviceCaseListAdapter.h"\r
 #include "components/ui_scroll_view.h"\r
 namespace OHOS {\r
 class BluetoothDeviceCaseListAdapter;\r

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 8106fc8..8d9719f 100644 (file)
--- 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"\r
 #include "components/ui_image_animator.h"\r
 #include "components/ui_list.h"\r
-#include "BluetoothCaseListAdapter.h"\r
+#include "bluetooth/include/BluetoothCaseListAdapter.h"\r
 \r
 namespace OHOS {\r
 class BluetoothCaseListAdapter;\r

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 4af2a23..23d4cbb 100644 (file)
--- 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"\r
 #include "components/ui_image_animator.h"\r
 #include "cmsis_os.h"\r
-#include "BluetoothModel.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
 #define BLUETOOTH_SEARCH_IMAGE_NUM 8\r
 \r
 namespace OHOS {\r

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 9ff78ba..e23213d 100644 (file)
--- 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"\r
 #include "components/ui_image_animator.h"\r
 \r
-#include "BluetoothModel.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
 #include "UiConfig.h"\r
 #define BLUETOOTH_CONNECT_IMAGE_NUM 8\r
 \r

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 1611290..eb402bf 100644 (file)
--- 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"\r
 #include <string>\r
 namespace OHOS {\r
-\r
+constexpr uint16_t BLUETOOTH_CONN_HANDLE = 64;\r
+constexpr uint16_t BLUETOOTH_INTERVAL_TOMAX_MIN = 12;\r
+constexpr uint16_t BLUETOOTH_INTERVAL_TOMAX_MAX = 12;\r
+constexpr uint16_t BLUETOOTH_INTERVAL_TODEFAULT_MIN = 24;\r
+constexpr uint16_t BLUETOOTH_INTERVAL_TODEFAULT_MAX = 48;\r
+constexpr uint16_t BLUETOOTH_LATENCY = 0;\r
+constexpr uint16_t BLUETOOTH_TIMEOUT_MUTIPLIER = 500;\r
 \r
 \r
 typedef enum : uint16_t {\r

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 ae1157b..776784b 100644 (file)
--- 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"\r
 #include "components/ui_label_button_ext.h"\r
 #include "components/ui_image_animator.h"\r
-#include "BluetoothCaseListAdapter.h"\r
+#include "bluetooth/include/BluetoothCaseListAdapter.h"\r
 \r
 namespace OHOS\r
 {\r

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 6c84d5f..20453ad 100644 (file)
--- 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\r
 #define BLUETOOTH_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "View.h"\r
-#include "MainBluetoothView.h"\r
+#include "bluetooth/include/MainBluetoothView.h"\r
 #include "components/ui_view.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_view_group.h"\r
-#include "VolumeSettingView.h"\r
-#include "BluetoothModel.h"\r
+#include "main/include/VolumeSettingView.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
 \r
 #include "UiViewId.h"\r
 #include "cmsis_os.h"\r

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 e899d08..1864090 100644 (file)
--- 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"\r
 #include "UiConfig.h"\r
 #include "ChangeSliceListener.h"\r
-#include "BluetoothPresenter.h"\r
-#include "BluetoothCaseListAdapter.h"\r
-#include "BluetoothEarListView.h"\r
-#include "BluetoothEarPhoneView.h"\r
-#include "BluetoothOptionsView.h"\r
-#include "BluetoothReconnectView.h"\r
-#include "TipsConnFailMessageView.h"\r
-#include "TipsSuccMessageView.h"\r
-#include "TipsFailMessageView.h"\r
-#include "BluetoothDeviceListView.h"\r
-#include "BluetoothItemView.h"\r
+#include "bluetooth/include/BluetoothPresenter.h"\r
+#include "bluetooth/include/BluetoothCaseListAdapter.h"\r
+#include "bluetooth/include/BluetoothEarListView.h"\r
+#include "bluetooth/include/BluetoothEarPhoneView.h"\r
+#include "bluetooth/include/BluetoothOptionsView.h"\r
+#include "bluetooth/include/BluetoothReconnectView.h"\r
+#include "bluetooth/include/TipsConnFailMessageView.h"\r
+#include "bluetooth/include/TipsSuccMessageView.h"\r
+#include "bluetooth/include/TipsFailMessageView.h"\r
+#include "bluetooth/include/BluetoothDeviceListView.h"\r
+#include "bluetooth/include/BluetoothItemView.h"\r
 \r
 namespace OHOS {\r
 constexpr int16_t NUM_CONTAINER = 9; // NUM_CONTAINER ：蓝牙耳机连接的9个界面容器\r

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 b5acb85..8fa4b49 100644 (file)
--- 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 <string>
-#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 5478357..074d4c4 100644 (file)
--- 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 <string>
-#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 428f9a4..799128a 100644 (file)
--- 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:\r
  * Create: 2021-10-13\r
  */\r
-#include "BluetoothDeviceListView.h"\r
+#include "bluetooth/include/BluetoothDeviceListView.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
-#include "PlayersPresenter.h"\r
-#include "BluetoothPresenter.h"\r
-#include "BluetoothModel.h"\r
+#include "player/include/PlayersPresenter.h"\r
+#include "bluetooth/include/BluetoothPresenter.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
 #include "ui_resource_string.h"\r
 namespace OHOS\r
 {\r

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 31bd0e8..e2137ac 100644 (file)
--- 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:\r
  * Create: 2021-10-13\r
  */\r
-#include "BluetoothModel.h"\r
-#include "BluetoothEarListView.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
+#include "bluetooth/include/BluetoothEarListView.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
-#include "PlayersPresenter.h"\r
-#include "BluetoothPresenter.h"\r
-#include "SettingModel.h"\r
+#include "player/include/PlayersPresenter.h"\r
+#include "bluetooth/include/BluetoothPresenter.h"\r
+#include "settings/include/SettingModel.h"\r
 #include "ui_resource_string.h"\r
 \r
 namespace OHOS\r

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 3d246fc..f274f23 100644 (file)
--- 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\r
  */\r
 #include <functional>\r
-#include "BluetoothEarPhoneView.h"\r
+#include "bluetooth/include/BluetoothEarPhoneView.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
-#include "BluetoothPresenter.h"\r
-#include "PlayersPresenter.h"\r
-#include "BluetoothItemView.h"\r
-#include "SettingModel.h"\r
+#include "bluetooth/include/BluetoothPresenter.h"\r
+#include "player/include/PlayersPresenter.h"\r
+#include "bluetooth/include/BluetoothItemView.h"\r
+#include "settings/include/SettingModel.h"\r
 #include "common/image_cache_manager.h"\r
 #include "graphic_service.h"\r
 #include "uicomponents/UIComponents.h"\r

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 2b10bff..1d794db 100644 (file)
--- 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\r
  */\r
 \r
-#include <BluetoothHeadsetEvent.h>\r
+#include "bluetooth/include/BluetoothHeadsetEvent.h"\r
 #include "bts_avrcp_target.h"\r
 #include "bts_avrcp_controller.h"\r
-#include "PlayersModel.h"\r
+#include "player/include/PlayersModel.h"\r
 #include "service_id_define.h"\r
 #include "graphic_service.h"\r
 #include <bts_a2dp_source.h>\r

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 a7a350c..1562b62 100644 (file)
--- 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\r
  */\r
 \r
-#include "BluetoothItemView.h"\r
+#include "bluetooth/include/BluetoothItemView.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
 #include "player/include/PlayersView.h"\r
 #include "ui_resource_image.h"\r
 #include "ui_resource_string.h"\r
-#include "CallerLogModel.h"\r
+#include "callerlog/include/CallerLogModel.h"\r
 #include "custom_utils.h"\r
 #include "notification_manager.h"\r
 \r
 #ifdef SUPPORT_PHONE_SERVICE\r
-#include "PhoneAGService.h"\r
+#include "phoneservice/include/PhoneAGService.h"\r
 #endif\r
 \r
 #include "ConfigModel.h"\r

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 2bf7296..7fe7d4b 100644 (file)
--- 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\r
  */\r
 #include <cstdint>\r
-#include "BluetoothModel.h"\r
-#include "BluetoothModelC.h"\r
-#include "BluetoothWrapper.h"\r
-#include "BluetoothPresenter.h"\r
-#include "ConnectPhonePresenter.h"\r
-#include "MusicPlayerSourceView.h"\r
-#include "BluetoothItemView.h"\r
-#include "PlayersModel.h"\r
-#include "PhoneAudio.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
+#include "bluetooth/include/BluetoothModelC.h"\r
+#include "bluetooth/include/BluetoothWrapper.h"\r
+#include "bluetooth/include/BluetoothPresenter.h"\r
+#include "connectnewphone/include/ConnectPhonePresenter.h"\r
+#include "player/include/MusicPlayerSourceView.h"\r
+#include "bluetooth/include/BluetoothItemView.h"\r
+#include "player/include/PlayersModel.h"\r
+#include "phoneservice/include/PhoneAudio.h"\r
 #include "graphic_service.h"\r
 #include "msg_center.h"\r
 #include "bts_def.h"\r
@@ -41,7 +41,7 @@
 #include "msg_center_protocol.h"\r
 #include "dfx_channel.h"\r
 #include "tcxo.h"\r
-#include "ui_service.h"\r
+#include "uiservice/include/ui_service.h"\r
 #include "network/network_listener.h"\r
 #include "font/ui_font_header.h"\r
 \r
@@ -54,11 +54,12 @@
 \r
 //#include "hfp_hf_service.h"\r
 #include "uiservice/include/ui_service.h"\r
-#include "PhoneService.h"\r
+#include "phoneservice/include/PhoneService.h"\r
 #ifdef SUPPORT_OHOSFWK\r
-#include "BluetoothWrapper.h"\r
+#include "bluetooth/include/BluetoothWrapper.h"\r
 #endif\r
-#include "Bluetooyhpabpserver.h"\r
+#include "bluetooth/include/Bluetooyhpabpserver.h"\r
+#include "bluetooth/include/BluetoothChangeBle.h"\r
 \r
 \r
 \r
@@ -68,11 +69,11 @@
 #include "ConfigModel.h"\r
 \r
 #ifdef SUPPORT_PHONE_SERVICE\r
-#include "PhoneAGService.h"\r
+#include "phoneservice/include/PhoneAGService.h"\r
 #endif\r
 \r
 #include "custom_save_runtime.h"\r
-#include "BluetoothHeadsetEvent.h"\r
+#include "bluetooth/include/BluetoothHeadsetEvent.h"\r
 \r
 namespace OHOS {\r
 \r
@@ -1157,6 +1158,37 @@ void uapi_set_ACL_br_address(const bd_addr_t * bdAddr)
     memcpy(&ACL_bdAdd,bdAddr,sizeof(bd_addr_t));\r
 }\r
 \r
+void ChangeBleConnectToMax()\r
+{\r
+    if (msg_center_get_trans_channel() == DIAG_FRAME_FID_BT) {\r
+        gap_conn_param_update_t conn_param = { 0 };\r
+        conn_param.conn_handle = BLUETOOTH_CONN_HANDLE;\r
+        conn_param.interval_min = BLUETOOTH_INTERVAL_TOMAX_MIN;\r
+        conn_param.interval_max = BLUETOOTH_INTERVAL_TOMAX_MAX;\r
+        conn_param.slave_latency = BLUETOOTH_LATENCY;\r
+        conn_param.timeout_multiplier = BLUETOOTH_TIMEOUT_MUTIPLIER;\r
+        errcode_t ret = gap_ble_connect_param_update(&conn_param);\r
+        WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "BleConnectCallback change to max interval ret:%d : latency-min:%u latency-max:%u\n", \r
+                        ret, conn_param.interval_min, conn_param.interval_max);\r
+    }\r
+}\r
+\r
+void ChangeBleConnectToDefault()\r
+{\r
+    if (msg_center_get_trans_channel() == DIAG_FRAME_FID_BT) {\r
+        gap_conn_param_update_t conn_param = { 0 };\r
+        conn_param.conn_handle = BLUETOOTH_CONN_HANDLE;\r
+        conn_param.interval_min = BLUETOOTH_INTERVAL_TODEFAULT_MIN;\r
+        conn_param.interval_max = BLUETOOTH_INTERVAL_TODEFAULT_MAX;\r
+        conn_param.slave_latency = BLUETOOTH_LATENCY;\r
+        conn_param.timeout_multiplier = BLUETOOTH_TIMEOUT_MUTIPLIER;\r
+        errcode_t ret = gap_ble_connect_param_update(&conn_param);\r
+        WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "BleConnectCallback change to default interval ret:%d : latency-min:%u latency-max:%u\n", \r
+                        ret, conn_param.interval_min, conn_param.interval_max);\r
+    }\r
+}\r
+\r
+\r
 // 回调：ACL连接状态上报\r
 void GapAclStateChangedCallback(const bd_addr_t *bdAddr, gap_acl_state_t state, unsigned int reason)\r
 {\r

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 2d6e322..aa6bc5f 100644 (file)
--- 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 @@
 \r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
-#include "BluetoothPresenter.h"\r
-#include "BluetoothReconnectView.h"\r
-#include "MainBluetoothView.h"\r
+#include "bluetooth/include/BluetoothPresenter.h"\r
+#include "bluetooth/include/BluetoothReconnectView.h"\r
+#include "bluetooth/include/MainBluetoothView.h"\r
 #include "UiConfig.h"\r
-#include "BluetoothModel.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
 #include "custom_utils.h"\r
 #include "common/key_code.h"\r
 \r

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 4aa486f..acf3114 100644 (file)
--- 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\r
  */\r
 \r
-#include "BluetoothReconnectView.h"\r
-#include "BluetoothModel.h"\r
+#include "bluetooth/include/BluetoothReconnectView.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
-#include "PlayersPresenter.h"\r
-#include "BluetoothPresenter.h"\r
+#include "player/include/PlayersPresenter.h"\r
+#include "bluetooth/include/BluetoothPresenter.h"\r
 #include "common/image_cache_manager.h"\r
 #include "uicomponents/UIComponents.h"\r
 #include <custom_utils.h>\r
 #include "graphic_service.h"\r
-#include <ui_service.h>\r
+#include "uiservice/include/ui_service.h"\r
 namespace OHOS {\r
 static BluetoothReconnectView *g_pBluetoothReconnectView{nullptr};\r
 #define BLUETOOTH_IMAGE_X 183\r

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 eaaafec..2274cba 100644 (file)
--- 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 @@
  */\r
 \r
 #include <list>\r
-#include "BluetoothWrapper.h"\r
+#include "bluetooth/include/BluetoothWrapper.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

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 b09d34d..35aa8a7 100644 (file)
--- 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 <soc_osal.h>
 #include <td_base.h>
 #include "securec.h"
@@ -25,8 +25,8 @@
 #include <bleEvent.h>
 #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 bab8aed..1d2a1ce 100644 (file)
--- 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:\r
  * Create: 2021-10-13\r
  */\r
-#include "MainBluetoothView.h"\r
-#include "BluetoothModel.h"\r
+#include "bluetooth/include/MainBluetoothView.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
 #include "wearable_log.h"\r
 \r
 namespace OHOS {\r

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 78a9d07..10f363d 100644 (file)
--- 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:\r
  * Create: 2021-10-13\r
  */\r
-#include "TipsConnFailMessageView.h"\r
-#include "BluetoothModel.h"\r
+#include "bluetooth/include/TipsConnFailMessageView.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
-#include "PlayersPresenter.h"\r
-#include "BluetoothPresenter.h"\r
+#include "player/include/PlayersPresenter.h"\r
+#include "bluetooth/include/BluetoothPresenter.h"\r
 #include "ui_resource_string.h"\r
 namespace OHOS\r
 {\r

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 c8bd189..6e037d1 100644 (file)
--- 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:\r
  * Create: 2021-10-13\r
  */\r
-#include "TipsFailMessageView.h"\r
-#include "BluetoothModel.h"\r
+#include "bluetooth/include/TipsFailMessageView.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
 #include "player/include/PlayersPresenter.h"\r

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 89fb015..161fc04 100644 (file)
--- 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:\r
  * Create: 2021-10-13\r
  */\r
-#include "TipsSuccMessageView.h"\r
-#include "BluetoothModel.h"\r
+#include "bluetooth/include/TipsSuccMessageView.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
-#include "PlayersPresenter.h"\r
-#include "BluetoothPresenter.h"\r
+#include "player/include/PlayersPresenter.h"\r
+#include "bluetooth/include/BluetoothPresenter.h"\r
 #include "ui_resource_string.h"\r
 namespace OHOS\r
 {\r

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 bec9317..cad4f33 100644 (file)
--- 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 9412c33..ab603f7 100644 (file)
--- 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 709f544..5cb6919 100644 (file)
--- 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 27dc9da..89c96fa 100644 (file)
--- 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 c2a67bd..6a13c32 100644 (file)
--- 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 1e89cf6..7b2cacd 100644 (file)
--- 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 <math.h>
 #include <iostream>
 #include <iomanip>
+#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 144c820..44faf6f 100644 (file)
--- 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 4bb7c03..96dd611 100644 (file)
--- 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 f065963..c6465d2 100644 (file)
--- 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 d618642..3509665 100644 (file)
--- 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"\r
 #include "components/ui_label_button.h"\r
 \r
-#include "CallerLogModel.h"\r
+#include "callerlog/include/CallerLogModel.h"\r
 #include "UiConfig.h"\r
-#include "PhoneService.h"\r
+#include "phoneservice/include/PhoneService.h"\r
 \r
 \r
 namespace OHOS {\r

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 6aa7511..e533720 100644 (file)
--- 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 @@
 \r
 #include "los_mux.h"\r
 #include "string"\r
-#include "PhoneService.h"\r
+#include "phoneservice/include/PhoneService.h"\r
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
-#include"ui_resource_string.h"\r
+#include "ui_resource_string.h"\r
 #include "message.h"\r
 #include "msg_center.h"\r
 \r

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 dc049dc..fc62368 100644 (file)
--- 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\r
 #define CALLER_LOG_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "ohos_types.h"\r
-#include "CallerLogModel.h"\r
+#include "callerlog/include/CallerLogModel.h"\r
 \r
 #include "cmsis_os.h"\r
 \r

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 5fda17f..6651c00 100644 (file)
--- 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\r
 \r
 #include "View.h"\r
-#include "CallerLogPresenter.h"\r
-#include "CallerItemView.h"\r
+#include "callerlog/include/CallerLogPresenter.h"\r
+#include "callerlog/include/CallerItemView.h"\r
 \r
 #include "components/ui_view_group.h"\r
 #include "components/ui_image_animator.h"\r
@@ -20,7 +20,7 @@
 #include "components/ui_label_button.h"\r
 #include "components/ui_list.h"\r
 #include "components/abstract_adapter.h"\r
-#include "PhoneService.h"\r
+#include "phoneservice/include/PhoneService.h"\r
 #include "vector.h"\r
 #include "ChangeSliceListener.h"\r
 \r

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 c63f185..715f263 100644 (file)
--- 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\r
  */\r
 \r
-#include "CallerItemView.h"\r
-#include "CallerLogPresenter.h"\r
+#include "callerlog/include/CallerItemView.h"\r
+#include "callerlog/include/CallerLogPresenter.h"\r
 #include "wearable_log.h"\r
 \r
 namespace OHOS {\r

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 7a6e491..2774077 100644 (file)
--- 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 6150544..2d5e67d 100644 (file)
--- 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\r
  */\r
 \r
-#include "CallerLogPresenter.h"\r
-#include "CallerLogView.h"\r
+#include "callerlog/include/CallerLogPresenter.h"\r
+#include "callerlog/include/CallerLogView.h"\r
 #include "common/task_manager.h"\r
 #include "wearable_log.h"\r
-#include "PhoneService.h"\r
+#include "phoneservice/include/PhoneService.h"\r
 \r
 #include "NativeRegisterManager.h"\r
 \r

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 c6a04ae..bc0d0a1 100644 (file)
--- 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\r
  */\r
 \r
-#include "CallerLogView.h"\r
-#include "CallerLogPresenter.h"\r
-#include "CallerLogModel.h"\r
+#include "callerlog/include/CallerLogView.h"\r
+#include "callerlog/include/CallerLogPresenter.h"\r
+#include "callerlog/include/CallerLogModel.h"\r
 #include "wearable_log.h"\r
 \r
 namespace OHOS {\r

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 36134ba..a71db9e 100644 (file)
--- 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 0404af4..067c192 100644 (file)
--- 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 @@
  */\r
 #ifndef CLASSIC_BLUETOOTH_PRESENTER_H\r
 #define CLASSIC_BLUETOOTH_PRESENTER_H\r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "View.h"\r
 #include "classicbluetooth/include/ClassicBlueToothView.h"\r

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 0600416..ac64214 100644 (file)
--- 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 d28a10a..5589340 100644 (file)
--- 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 0f6487c..ba0db4b 100644 (file)
--- 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"\r
 #include "ConfigModel.h"\r
 #include <UiConfig.h>\r
-#include "BluetoothModel.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
 #include "custom_runtime.h"\r
 #include "ConfigModelC.h"\r
-#include "PhoneService.h"\r
+#include "phoneservice/include/PhoneService.h"\r
 #include "NativeRegisterManager.h"\r
 namespace OHOS\r
 {\r

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 90f492c..d6d2160 100644 (file)
--- 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"\r
 #include "UiConfig.h"\r
 #include "ui_resource_string.h"\r
+#include "common/screen.h"\r
 namespace OHOS\r
 {\r
     static ClassicBlueToothView *g_pClassicBlueToothView{nullptr};\r

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 44e9f36..85c01e0 100644 (file)
--- 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 5567c4f..9ce7d13 100644 (file)
--- 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 5ede0bc..3d48b92 100644 (file)
--- 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 140458b..f361413 100644 (file)
--- 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 1d37d8a..f3d9bb7 100644 (file)
--- 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 c10f09d..5f3f43c 100644 (file)
--- 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 <cctype>
 #include <algorithm>

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 4faba3a..ce75982 100644 (file)
--- 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 d8cffee..a846483 100644 (file)
--- 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 9c776e9..e286500 100644 (file)
--- 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 16a4641..771fae4 100644 (file)
--- 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 a139a25..fdf3fbf 100644 (file)
--- 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 0a4b2d4..227f97d 100644 (file)
--- 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 248fe4f..2bb3ac4 100644 (file)
--- 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 2bb8fe6..2167c08 100644 (file)
--- 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\r
 #define CONNECT_PHONE_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
-#include "ConnectOpenView.h"\r
+#include "connectnewphone/include/ConnectOpenView.h"\r
 #include "NativeLauncher.h"\r
 #include "NativeAbility.h"\r
 \r

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 d74226c..834ad8e 100644 (file)
--- 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\r
 \r
 #include "View.h"\r
-#include "ConnectPhonePresenter.h"\r
+#include "connectnewphone/include/ConnectPhonePresenter.h"\r
 #include "ConnectSelectView.h"\r
 #include "AppGroupView.h"\r
 \r

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 48d9695..263be0e 100644 (file)
--- 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\r
 \r
 #include "View.h"\r
-#include "ConnectPhonePresenter.h"\r
+#include "connectnewphone/include/ConnectPhonePresenter.h"\r
 #include "components/ui_label.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_view_group.h"\r

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 ac8fee5..23e80b2 100644 (file)
--- 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\r
  * Create: 2022-03-22\r
  */\r
-#include "ConnectOpenView.h"\r
+#include "connectnewphone/include/ConnectOpenView.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
-#include "ConnectPhonePresenter.h"\r
-#include "BluetoothModel.h"\r
+#include "connectnewphone/include/ConnectPhonePresenter.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
+#include "PageTransitionMgr.h"\r
 \r
 namespace OHOS {\r
 static ConnectOpenView *g_pConnectOpenView{nullptr};\r

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 7af848d..8d228da 100644 (file)
--- 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\r
  */\r
 \r
-#include "ConnectPhonePresenter.h"\r
-#include "ConnectPhoneView.h"\r
+#include "connectnewphone/include/ConnectPhonePresenter.h"\r
+#include "connectnewphone/include/ConnectPhoneView.h"\r
 #include "drag_event.h"\r
 #include "cmsis_os.h"\r
 #include "UiConfig.h"\r
 #include "wearable_log.h"\r
-#include "ui_service.h"\r
+#include "uiservice/include/ui_service.h"\r
 #include "NativeRegisterManager.h"\r
 \r
 namespace OHOS {\r

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 5e9c6b5..943b546 100644 (file)
--- 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\r
  */\r
 \r
-#include "ConnectPhoneView.h"\r
+#include "connectnewphone/include/ConnectPhoneView.h"\r
 #include "components/ui_label.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r

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 3a41961..0723cdb 100644 (file)
--- 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\r
  * Create: 2022-03-22\r
  */\r
-#include "ConnectSelectView.h"\r
+#include "connectnewphone/include/ConnectSelectView.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
-#include "ConnectPhonePresenter.h"\r
+#include "connectnewphone/include/ConnectPhonePresenter.h"\r
+#include "PageTransitionMgr.h"\r
 \r
 namespace OHOS {\r
 static ConnectSelectView *g_pConnectSelectView{nullptr};\r

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 e16f7fe..226a9c0 100644 (file)
--- 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\r
 \r
 #include "View.h"\r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "MainCountDownView.h"\r
 #include "ui_resource_string.h"\r

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 bf14d29..c454b00 100644 (file)
--- 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\r
 \r
 /*显示与亮度*/\r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "DisplayBrightnessView.h"\r
 #include "components/ui_slider.h"\r

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 4cf3ade..ba43095 100644 (file)
--- 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"\r
 #include "iostream"\r
 #include "vibrator_service.h"\r
+#include "common/screen.h"\r
 namespace OHOS\r
 {\r
     static BrightnessControlView *g_pBrightnessControlView{nullptr};\r

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 658ecbb..ea28a16 100644 (file)
--- 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"\r
 #include <UiConfig.h>\r
 #include "custom_runtime.h"\r
+#include "common/screen.h"\r
 \r
 namespace OHOS\r
 {\r

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 3507fc9..c10ca76 100644 (file)
--- 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"\r
 #include "ui_resource_string.h"\r
 #include <UiConfig.h>\r
+#include "common/screen.h"\r
 namespace OHOS\r
 {\r
 \r

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 ca7b7bf..3579df8 100644 (file)
--- 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 ed646ea..c033891 100644 (file)
--- 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 8983da0..f08dc56 100644 (file)
--- 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 8508e21..e8ee476 100644 (file)
--- 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 cd0b39b..03c3c4a 100644 (file)
--- 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 1a4c3a8..3de0885 100644 (file)
--- 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 91fc92c..af8d178 100644 (file)
--- 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 c14293e..a1f2388 100644 (file)
--- 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"\r
 #include <ui_scroll_view.h>\r
 #include "components/ui_button.h"\r
-#include "MainViewSample.h"\r
+#include "main/include/MainViewSample.h"\r
 #include "components/ui_view_group.h"\r
-#include "DialModelSPO2.h"\r
-#include "DialModelHeartRate.h"\r
+#include "main/include/dial/DialModelSPO2.h"\r
+#include "main/include/dial/DialModelHeartRate.h"\r
 \r
 #include "UiConfig.h"\r
 #include "uicomponents/UIComponents.h"\r
-#include "MainPresenterSample.h"\r
+#include "main/include/MainPresenterSample.h"\r
 \r
 #include "bloodoxygen/include/BloodResultPresenter.h"\r
 #include "bloodoxygen/include/BloodOxygenModel.h"\r

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 63c1cae..41359c6 100644 (file)
--- 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 19a5758..c3fb32b 100644 (file)
--- 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 c907127..4972775 100644 (file)
--- 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 <ui_scroll_view.h>
 #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 cb15361..848d6bd 100644 (file)
--- 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 b3a5f35..f8916ce 100644 (file)
--- 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 51a37cb..4fc464f 100644 (file)
--- 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 <ui_scroll_view.h>
 #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 876166b..01fb791 100644 (file)
--- 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 8c7ec93..4bd86cf 100644 (file)
--- 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 8117440..fe78b26 100644 (file)
--- 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"\r
 #include "ohos_types.h"\r
 #include "components/ui_card_page.h"\r
-#include "HeartModel.h"\r
+#include "heartrate/include/HeartModel.h"\r
 \r
 namespace OHOS\r
 {\r

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 a6d87c5..3203bc2 100644 (file)
--- 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 f60a66a..293959d 100644 (file)
--- 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 013cfd9..7fe8251 100644 (file)
--- 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 7d47169..b403e78 100644 (file)
--- 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 <cmsis_os.h>
 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 935818d..a43d6f6 100644 (file)
--- 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 fbc80a6..2d84d79 100644 (file)
--- 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"\r
-#include "IndoorWalkPreparedView.h"\r
-#include "IndoorWalkPresenter.h"\r
-#include "MainViewSample.h"\r
+#include "indoorwalk/include/IndoorWalkPreparedView.h"\r
+#include "indoorwalk/include/IndoorWalkPresenter.h"\r
+#include "main/include/MainViewSample.h"\r
 #include "graphic_service.h"\r
 #include "wearable_log.h"\r
 \r
-#include "DialModelHeartRate.h"\r
+#include "main/include/dial/DialModelHeartRate.h"\r
 #include "heartrate/include/HeartChartView.h"\r
 #include "heartrate/include/HeartDetectionPresenter.h"\r
 #include "heartrate/include/HeartRateView.h"\r
 #include "heartrate/include/HeartResultPresenter.h"\r
 \r
 #include "ConfigModel.h"\r
-#include "DialModelHeartRate.h"\r
+#include "main/include/dial/DialModelHeartRate.h"\r
 #include "custom_runtime.h"\r
 #include "custom_utils.h"\r
 \r
@@ -29,7 +29,7 @@
 #include "wearable_log.h"\r
 #include <algorithm>\r
 \r
-#include "MainClockView.h"\r
+#include "clock/include/MainClockView.h"\r
 \r
 #ifdef BLE_SERVER_ENABLE\r
 #include "bleEvent.h"\r
@@ -54,7 +54,7 @@
 #include "battery_hal.h"\r
 \r
 #include "languagecode/LanguageInit.h"\r
-#include "ui_service.h"\r
+#include "uiservice/include/ui_service.h"\r
 \r
 #include <custom_save_runtime.h>\r
 \r

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 2932eb5..6a4dc66 100644 (file)
--- 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 @@
  */\r
 \r
 #include <securec.h>\r
-#include "HeartRateView.h"\r
+#include "heartrate/include/HeartRateView.h"\r
 #include "common/screen.h"\r
 #include "UiConfig.h"\r
-#include "ScreenModels.h"\r
+#include "screensetting/include/ScreenModels.h"\r
 #include "ui_resource_image.h"\r
 #include "common/image_cache_manager.h"\r
 #include "health/health_service/health_service.h"\r

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 2869783..355a453 100644 (file)
--- 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 e467e17..736feb6 100644 (file)
--- 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 <ui_scroll_view.h>
 #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 40e0e45..1ae0dc9 100644 (file)
--- 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\r
 \r
 #include "View.h"\r
-#include "MotionPageFirst.h"\r
-#include "MotionPageSecond.h"\r
-#include "MotionPageThird.h"\r
-#include "MotionPageFourth.h"\r
-#include "MotionPageFifth.h"\r
+#include "indoorwalk/include/MotionPageFirst.h"\r
+#include "indoorwalk/include/MotionPageSecond.h"\r
+#include "indoorwalk/include/MotionPageThird.h"\r
+#include "indoorwalk/include/MotionPageFourth.h"\r
+#include "indoorwalk/include/MotionPageFifth.h"\r
 #include "components/ui_swipe_view.h"\r
 \r
 namespace OHOS {\r

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 1b7f956..5f3bb63 100644 (file)
--- 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\r
 #define INDOORWALK_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "components/ui_label.h"\r
 #include "NativeLauncher.h"\r

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 c89592a..2ce92d8 100644 (file)
--- 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\r
 #define INDOORWALK_VIEW_H\r
 \r
-#include "IndoorWalkEndView.h"\r
+#include "indoorwalk/include/IndoorWalkEndView.h"\r
 #include "View.h"\r
-#include "IndoorWalkPresenter.h"\r
-#include "IndoorWalkPreparedView.h"\r
-#include "CustomizationView.h"\r
-#include "IndoorWalkMotionView.h"\r
+#include "indoorwalk/include/IndoorWalkPresenter.h"\r
+#include "indoorwalk/include/IndoorWalkPreparedView.h"\r
+#include "indoorwalk/include/CustomizationView.h"\r
+#include "indoorwalk/include/IndoorWalkMotionView.h"\r
 #include "components/ui_view_group.h"\r
 \r
 namespace OHOS {\r

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 4e3e637..6f11832 100644 (file)
--- 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\r
  */\r
 \r
-#include "CustomizationView.h"\r
-#include "IndoorWalkPresenter.h"\r
+#include "indoorwalk/include/CustomizationView.h"\r
+#include "indoorwalk/include/IndoorWalkPresenter.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
 \r

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 bcaa1e7..90d7049 100644 (file)
--- 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\r
  */\r
 \r
-#include "IndoorWalkEndView.h"\r
-#include "IndoorWalkPresenter.h"\r
+#include "indoorwalk/include/IndoorWalkEndView.h"\r
+#include "indoorwalk/include/IndoorWalkPresenter.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
 \r

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 4afd157..f3d2a70 100644 (file)
--- 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\r
  */\r
 \r
-#include "IndoorWalkModel.h"\r
-#include "IndoorWalkPresenter.h"\r
+#include "indoorwalk/include/IndoorWalkModel.h"\r
+#include "indoorwalk/include/IndoorWalkPresenter.h"\r
 #include "ohos_timer.h"\r
 #include "graphic_timer.h"\r
 \r
@@ -293,7 +293,7 @@ void InitIndoorWalkTimer()
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "IndoorWalkModel::IndoorWalkTimer already exists!!");\r
         return;\r
     }\r
-    uint32 tick = GetOSTick(MS_ONE_SECONDS);\r
+    uint32_t tick = GetOSTick(MS_ONE_SECONDS);\r
     g_startCounting = new GraphicTimer(tick, IndoorWalkTimerCallback, nullptr, true);\r
     if (g_startCounting == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "IndoorWalkModel::IndoorWalkTimer new GraphicTimer failed!!");\r

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 a3350f2..3c25146 100644 (file)
--- 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\r
  */\r
 \r
-#include "IndoorWalkMotionView.h"\r
-#include "IndoorWalkPresenter.h"\r
+#include "indoorwalk/include/IndoorWalkMotionView.h"\r
+#include "indoorwalk/include/IndoorWalkPresenter.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
-#include "ScreenModels.h"\r
-#include "ActivityModel.h"\r
-#include "IndoorWalkModel.h"\r
+#include "screensetting/include/ScreenModels.h"\r
+#include "activity/include/ActivityModel.h"\r
+#include "indoorwalk/include/IndoorWalkModel.h"\r
 #include <iomanip>\r
 \r
 namespace OHOS {\r

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 4eff7a9..6aa8718 100644 (file)
--- 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\r
  */\r
 \r
-#include "IndoorWalkPreparedView.h"\r
-#include "IndoorWalkPresenter.h"\r
-#include "ScreenModels.h"\r
+#include "indoorwalk/include/IndoorWalkPreparedView.h"\r
+#include "indoorwalk/include/IndoorWalkPresenter.h"\r
+#include "screensetting/include/ScreenModels.h"\r
 #include "ui_resource_image.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r

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 8f295e3..b7eb9b1 100644 (file)
--- 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\r
  */\r
 \r
-#include "IndoorWalkPresenter.h"\r
-#include "IndoorWalkView.h"\r
-#include "IndoorWalkModel.h"\r
+#include "indoorwalk/include/IndoorWalkPresenter.h"\r
+#include "indoorwalk/include/IndoorWalkView.h"\r
+#include "indoorwalk/include/IndoorWalkModel.h"\r
 #include "drag_event.h"\r
 #include "UiConfig.h"\r
 #include "wearable_log.h"\r
 #include <sstream>\r
-#include "ActivityModel.h"\r
+#include "activity/include/ActivityModel.h"\r
 #include "NativeRegisterManager.h"\r
 \r
 namespace OHOS {\r

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 0308e98..48df76a 100644 (file)
--- 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\r
  */\r
 \r
-#include "IndoorWalkView.h"\r
-#include "IndoorWalkModel.h"\r
+#include "indoorwalk/include/IndoorWalkView.h"\r
+#include "indoorwalk/include/IndoorWalkModel.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
 \r

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 a3da2bb..59a7320 100644 (file)
--- 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\r
  * Create: 2022-03-02\r
  */\r
-#include "MotionPageFifth.h"\r
+#include "indoorwalk/include/MotionPageFifth.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
 \r

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 c16b941..0a0d6e1 100644 (file)
--- 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\r
  */\r
 \r
-#include "MotionPageFirst.h"\r
-#include "IndoorWalkPresenter.h"\r
-#include "IndoorWalkModel.h"\r
+#include "indoorwalk/include/MotionPageFirst.h"\r
+#include "indoorwalk/include/IndoorWalkPresenter.h"\r
+#include "indoorwalk/include/IndoorWalkModel.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
 \r

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 a43ab8f..8a96ee8 100644 (file)
--- 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\r
  * Create: 2022-03-02\r
  */\r
-#include "MotionPageFourth.h"\r
-#include "IndoorWalkPresenter.h"\r
-#include "IndoorWalkModel.h"\r
+#include "indoorwalk/include/MotionPageFourth.h"\r
+#include "indoorwalk/include/IndoorWalkPresenter.h"\r
+#include "indoorwalk/include/IndoorWalkModel.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
 \r

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 34e136d..ade800e 100644 (file)
--- 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\r
  * Create: 2022-03-02\r
  */\r
-#include "MotionPageSecond.h"\r
-#include "IndoorWalkPresenter.h"\r
-#include "IndoorWalkModel.h"\r
+#include "indoorwalk/include/MotionPageSecond.h"\r
+#include "indoorwalk/include/IndoorWalkPresenter.h"\r
+#include "indoorwalk/include/IndoorWalkModel.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
 \r

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 668d78c..1587822 100644 (file)
--- 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\r
  * Create: 2022-03-02\r
  */\r
-#include "MotionPageThird.h"\r
-#include "IndoorWalkPresenter.h"\r
-#include "IndoorWalkModel.h"\r
+#include "indoorwalk/include/MotionPageThird.h"\r
+#include "indoorwalk/include/IndoorWalkPresenter.h"\r
+#include "indoorwalk/include/IndoorWalkModel.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
 \r

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 5c0a1ea..8553851 100644 (file)
--- 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 423a66e..786a2fd 100644 (file)
--- 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 166ebbb..808ec39 100644 (file)
--- 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 50a9e4a..27d1585 100644 (file)
--- 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 <iostream>
 #include <cstring>
 #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 99d530e..af2d51d 100644 (file)
--- 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 5b4a2ad..8f2e780 100644 (file)
--- 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 a254648..16e20cd 100644 (file)
--- 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 ed77277..86fdc8a 100644 (file)
--- 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 540c491..d46001e 100644 (file)
--- 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 <cstdint>
 #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 52e4298..3d763b0 100644 (file)
--- 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 <cstdint>
 #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 df8f281..d5871c9 100644 (file)
--- 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 33bedbe..8347b29 100644 (file)
--- 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 <unordered_map>
 #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 f648a5d..c1a12da 100644 (file)
--- 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 9fe460c..9bc59a5 100644 (file)
--- 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 <ui_resource_image.h>
 #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 c9943f4..4912744 100644 (file)
--- 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 @@
  */\r
 \r
 #include "unistd.h"\r
-#include "MainModel.h"\r
+#include "main/include/MainModel.h"\r
 #include "kv_store.h"\r
 #include "securec.h"\r
 #include "wearable_log.h"\r
 #include "ConfigModel.h"\r
 #include <array>\r
 #include <stdexcept>\r
-#include "MainViewSample.h"\r
-#include "ui_service.h"\r
-#include "SetDialModel.h"\r
+#include "main/include/MainViewSample.h"\r
+#include "uiservice/include/ui_service.h"\r
+#include "set_dial/include/SetDialModel.h"\r
 #include "dnotdisturb/include/DnotDisturbModel.h"\r
 #include "custom_utils.h"\r
-#include "DialViewGroup.h"\r
+#include "main/include/MainModel.h"\r
 \r
 #ifdef SUPPORT_POWER_MANAGER\r
 #include "power_display_service.h"\r

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 355d8ad..3346ff2 100644 (file)
--- 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 <iostream>
 #include <map>
-#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<MainViewSample>::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 02a3647..29a89cd 100644 (file)
--- 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 ccb5860..7b684d5 100644 (file)
--- 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\r
  * Create: 2021-09-5\r
  */\r
-#include "VolumeSettingView.h"\r
+#include "main/include/VolumeSettingView.h"\r
 #include "VolumeSettingPresenter.h"\r
-#include "PlayersModel.h"\r
+#include "player/include/PlayersModel.h"\r
 #include "common/image_cache_manager.h"\r
 #include "UiConfig.h"\r
 #include "ui_resource_image.h"\r
 #include "drag_event.h"\r
-#include "MainCallingView.h"\r
-#include "PhoneService.h"\r
-#include "CallerLogModel.h"\r
+#include "makephone/include/MainCallingView.h"\r
+#include "phoneservice/include/PhoneService.h"\r
+#include "callerlog/include/CallerLogModel.h"\r
 #include "bts_avrcp_controller.h"\r
 #include "bts_avrcp_target.h"\r
 #include "notification_manager.h"\r
-#include "BluetoothHeadsetEvent.h"\r
+#include "bluetooth/include/BluetoothHeadsetEvent.h"\r
 #include "bts_avrcp_controller.h"\r
 #include "ConfigModel.h"\r
 #include "vibrator_service.h"\r

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 1f8a312..95e69cf 100644 (file)
--- 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\r
  * Create: 2021-09-5\r
  */\r
-#include "VolumeSettingView.h"\r
-#include "PlayersView.h"\r
+#include "main/include/VolumeSettingView.h"\r
+#include "player/include/PlayersView.h"\r
 #include "common/image_cache_manager.h"\r
 #include "UiConfig.h"\r
 #include "ui_resource_image.h"\r

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 02ce99c..4351871 100644 (file)
--- 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 b9ab854..43fff88 100644 (file)
--- 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 6b818c0..5cb89f8 100644 (file)
--- 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 5457370..45366d7 100644 (file)
--- 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 4f31617..c58063b 100644 (file)
--- 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 <cmath>
 #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 526d0a2..86cacc9 100644 (file)
--- 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 55f4b11..7c3c488 100644 (file)
--- 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 1e89666..aa78011 100644 (file)
--- 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 acb782b..8b092bf 100644 (file)
--- 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 <ctime>

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 801a445..7f8a9bd 100644 (file)
--- 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 <string>
 #include <ctime>
 #include <time.h>

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 872daee..c7b3667 100644 (file)
--- 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 <chrono>

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 66350f7..0bb0724 100644 (file)
--- 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 9f0e4d3..5d7683c 100644 (file)
--- 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 adb191d..b071562 100644 (file)
--- 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 <sys/time.h>
-#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 fd1524b..13227d5 100644 (file)
--- 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 <sys/time.h>
-#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 2f66e6e..3b44a5e 100644 (file)
--- 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 ce4993d..20f9767 100644 (file)
--- 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 f73360e..b6cd93f 100644 (file)
--- 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 ae0e26a..dc59658 100644 (file)
--- 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 <sys/time.h>
-#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 69af8f2..5d46a76 100644 (file)
--- 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 <sys/time.h>
-#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 057afe7..6db064d 100644 (file)
--- 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 <string>
 #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 7a11c7a..278ec65 100644 (file)
--- 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 <string>
 

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 ca53139..7a61675 100644 (file)
--- 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 <string>
 

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 bb2e07b..5bd70fc 100644 (file)
--- 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 2f023fe..46136a1 100644 (file)
--- 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 <ctime>
 #include <iomanip>

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 a87214d..cd82ad1 100644 (file)
--- 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 4229b70..06c713f 100644 (file)
--- 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 7de676d..ba45574 100644 (file)
--- 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 3eeb3ff..aff88b2 100644 (file)
--- 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 a08366b..e149236 100644 (file)
--- 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 <cmath>
 #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 f68c23f..a3e3e28 100644 (file)
--- 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 d360fed..8135db8 100644 (file)
--- 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 ec55241..077df17 100644 (file)
--- 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 <string>
 #include <ctime>
 #include <time.h>

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 72ff069..7f6762d 100644 (file)
--- 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 <ctime>

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 deb1e35..d0f960e 100644 (file)
--- 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 <ctime>

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 f076832..2ab69b7 100644 (file)
--- 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 <string>
 #include <ctime>
 #include <time.h>

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 980d438..2247a76 100644 (file)
--- 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 bec17ca..58d7060 100644 (file)
--- 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 c7d1c24..7574cdc 100644 (file)
--- 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 ffc87a7..d1f0a82 100644 (file)
--- 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 13113cd..4c25fd0 100644 (file)
--- 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 8ed4cf7..a977260 100644 (file)
--- 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 f172246..26d5fd4 100644 (file)
--- 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 <cstdio>
 #include <iostream>
 #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 d17de5b..39e3f9f 100644 (file)
--- 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 45e6359..2fc3509 100644 (file)
--- 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 e457e3b..aa0226c 100644 (file)
--- 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 ecae951..67d7e38 100644 (file)
--- 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 d16f41c..5873f99 100644 (file)
--- 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 beb1d83..b087c21 100644 (file)
--- 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 7bf58bc..760674c 100644 (file)
--- 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 1c11fc2..e7f0c8f 100644 (file)
--- 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 f0a0789..1da1807 100644 (file)
--- 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 a7fe868..2710198 100644 (file)
--- 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 9470a5c..5807a58 100644 (file)
--- 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 e3abc0b..fef2236 100644 (file)
--- 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 187229a..8f1d39a 100644 (file)
--- 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 2025cb0..2afedda 100644 (file)
--- 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 86a2f5d..d630382 100644 (file)
--- 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 2d242f2..a1ba5f1 100644 (file)
--- 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 f9c276f..dce979e 100644 (file)
--- 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 a7b6e63..fbf5d1c 100644 (file)
--- 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 41e5a6f..5494d9f 100644 (file)
--- 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 <ui_resource_string.h>
 #include <UiConfig.h>
+#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 a5e6ffa..7ae2a7d 100644 (file)
--- 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 2524b1e..9b7b2ae 100644 (file)
--- 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 e32c11c..79ecdb3 100644 (file)
--- 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 c039e79..c78a872 100644 (file)
--- 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\r
 \r
 #include "View.h"\r
-#include "VocassistModel.h"\r
-#include "VocassistView.h"\r
+#include "offlinevoice/include/VocassistModel.h"\r
+#include "offlinevoice/include/VocassistView.h"\r
 \r
 namespace OHOS {\r
 class VocassistPresenter;\r

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 e17d153..d90f196 100644 (file)
--- 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\r
 \r
 #include "smart_voice_service.h"\r
-#include "VocassistView.h"\r
+#include "offlinevoice/include/VocassistView.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

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 5c3abe4..94deac5 100644 (file)
--- 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\r
 #define VOCASSIST_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "NativeAbility.h"\r
-#include "VocassistView.h"\r
-#include "MainVocassistView.h"\r
+#include "offlinevoice/include/VocassistView.h"\r
+#include "offlinevoice/include/MainVocassistView.h"\r
 \r
 namespace OHOS {\r
 class MainVocassistView;\r

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 2b1eb6b..0166750 100644 (file)
--- 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\r
  */\r
 \r
-#include "MainVocassistView.h"\r
-#include "VocassistPresenter.h"\r
+#include "offlinevoice/include/MainVocassistView.h"\r
+#include "offlinevoice/include/VocassistPresenter.h"\r
 \r
 namespace OHOS {\r
 static MainVocassistView *g_pMainVocassistView = nullptr;\r

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 adae52d..648b8d7 100644 (file)
--- 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 9bd9f98..6f14806 100644 (file)
--- 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 14ace55..ab4382d 100644 (file)
--- 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"\r
 #include "graphic_timer.h"\r
 #include "AppViewIDs.h"\r
-#include "PlayersModel.h"\r
-#include "CallerLogModel.h"\r
-#include "VocassistModel.h"\r
-#include "VocassistView.h"\r
-#include "VocassistPresenter.h"\r
+#include "player/include/PlayersModel.h"\r
+#include "callerlog/include/CallerLogModel.h"\r
+#include "offlinevoice/include/VocassistModel.h"\r
+#include "offlinevoice/include/VocassistView.h"\r
+#include "offlinevoice/include/VocassistPresenter.h"\r
 \r
 static constexpr uint16_t SWITCH_MAP_NUM = 16;\r
 static constexpr uint16_t ANI_X = 84;\r

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 9d4354d..231b4ed 100644 (file)
--- 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 <list>
 #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 c61a63d..077a97b 100644 (file)
--- 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 fc64f7d..8eb9dbd 100644 (file)
--- 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 4cb9d67..0ee5bba 100644 (file)
--- 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 558f9ed..c96f521 100644 (file)
--- 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 54c4d3b..66fc974 100644 (file)
--- 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\r
 #define _PhoneCall_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "PhoneCallView.h"\r
 #include "string"\r

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 e63653e..fba0444 100644 (file)
--- 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\r
 #define _PhoneDir_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "PhoneDirView.h"\r
 \r

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 3d46515..b19d2ea 100644 (file)
--- 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\r
 #define _PHONE_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "PhoneView.h"\r
 \r

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 9493d25..a76fd50 100644 (file)
--- 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 <custom_utils.h>
 #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 8b05498..ec86a80 100644 (file)
--- 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 cc70b94..9887e0e 100644 (file)
--- 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 c3a63dc..4c6784e 100644 (file)
--- 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\r
 #include "cat1_server_hal.h"\r
 #endif\r
-#include "PhoneService.h"\r
+#include "phoneservice/include/PhoneService.h"\r
 #include "phone/include/PhoneCallView.h"\r
 #include "phone/include/TelephonyInitInterface.h"\r
 #include "common/key_code.h"\r

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 9b9857e..2164f32 100644 (file)
--- 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"\r
 #include "ui_resource_string.h"\r
 #include "common/image_cache_manager.h"\r
+#include "common/screen.h"\r
 \r
 #include "phone/include/phoneaddressmodel.h"\r
 #define PHONE_DIR_GIRL "/user/res/Phone/little-girl.bin"\r

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 85cbddc..8c0592a 100644 (file)
--- 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 <soc_osal.h>
 // #include <td_base.h>
 // #include <stdlib.h>
@@ -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 85a5ca9..9caea50 100644 (file)
--- 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 <iostream>
 #include <memory>
 #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 b19ce81..5e530a7 100644 (file)
--- 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 <cstdio>
 #include <cstdlib>
@@ -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 0894411..79fca53 100644 (file)
--- 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"\r
 #include "audio_manager.h"\r
 #include "audio_base_type.h"\r
-#include "MusicPlayerSourceView.h"\r
-#include "VolumeSettingView.h"\r
-#include "VolumeSettingPresenter.h"\r
-#include "BluetoothModel.h"\r
-#include "BluetoothEarPhoneView.h"\r
-#include "BluetoothEarListView.h"\r
-#include "BluetoothOptionsView.h"\r
-#include "BluetoothReconnectView.h"\r
-#include "TipsSuccMessageView.h"\r
-#include "TipsConnFailMessageView.h"\r
-#include "TipsFailMessageView.h"\r
-#include "BluetoothDeviceListView.h"\r
-#include "BluetoothItemView.h"\r
-#include "PlayersCaseListAdapter.h"\r
+#include "player/include/MusicPlayerSourceView.h"\r
+#include "main/include/VolumeSettingView.h"\r
+#include "main/include/VolumeSettingPresenter.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
+#include "bluetooth/include/BluetoothEarPhoneView.h"\r
+#include "bluetooth/include/BluetoothEarListView.h"\r
+#include "bluetooth/include/BluetoothOptionsView.h"\r
+#include "bluetooth/include/BluetoothReconnectView.h"\r
+#include "bluetooth/include/TipsSuccMessageView.h"\r
+#include "bluetooth/include/TipsConnFailMessageView.h"\r
+#include "bluetooth/include/TipsFailMessageView.h"\r
+#include "bluetooth/include/BluetoothDeviceListView.h"\r
+#include "bluetooth/include/BluetoothItemView.h"\r
+#include "player/include/PlayersCaseListAdapter.h"\r
 namespace OHOS {\r
 using OHOS::Media::Player;\r
 using namespace OHOS::Media;\r
@@ -144,6 +144,7 @@ public:
     bool IsResumed();\r
     bool IsBeginStopped();\r
     bool IsEndStopped();\r
+    bool IsInterruptedPaused();\r
     void OnInterrupt(int32_t type, int32_t hint) override;\r
     void PausePlayer(void);\r
     void ResumePlayer(void);\r
@@ -157,6 +158,7 @@ private:
     bool isResumed_{false};\r
     bool isBeginStopped_{false};\r
     bool isEndStopped_{false};\r
+    bool isInterruptedPause_{false};\r
 };\r
 \r
 // 滑动手势\r

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 b7556de..49f62dd 100644 (file)
--- 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"\r
 #include "components/ui_checkbox.h"\r
 #include "components/ui_list.h"\r
-\r
+#include "components/ui_scroll_view.h"\r
+#include "common/image_cache_manager.h"\r
 #include "font/ui_font_bitmap.h"\r
 #include "font/ui_font.h"\r
 #include "graphic_config.h"\r
 #include "components/ui_card_page.h"\r
 #include "player/include/PlayersPresenter.h"\r
-#include "components/ui_scroll_view.h"\r
-#include "PlayerListDelSongView.h"\r
-#include "common/image_cache_manager.h"\r
-#include "VolumeSettingView.h"\r
+#include "player/include/PlayerListDelSongView.h"\r
+#include "main/include/VolumeSettingView.h"\r
 #include "player/include/MusicPlayerSourceView.h"\r
 #include "player/include/MusicPlayerBluetoothDisConView.h"\r
 #include "player/include/MusicPlayerBTConnectFailedView.h"\r

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 c2bfe8a..65f47c1 100644 (file)
--- 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"\r
 #include "player/include/PlayersModel.h"\r
 #include "UiConfig.h"\r
-#include "BluetoothEarPhoneView.h"\r
+#include "bluetooth/include/BluetoothEarPhoneView.h"\r
 #include "player/include/PlayersPresenter.h"\r
 #include "ui_resource_image.h"\r
 #include "ui_resource_string.h"\r

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 84e0b2c..c76def7 100644 (file)
--- 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\r
  */\r
 #include <string>\r
-#include "PlayersCaseListAdapter.h"\r
+#include "player/include/PlayersCaseListAdapter.h"\r
 #include "gfx_utils/list.h"\r
 #include "player/include/PlayersView.h"\r
 #include "player/include/PlayersPresenter.h"\r

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 f4371a1..1193095 100644 (file)
--- 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 <cmsis_os2.h>
 #include <service/graphic_service.h>
-#include "MainViewSample.h"
+#include "main/include/MainViewSample.h"
 #include "settings/include/SettingModel.h"
 #include "bluetooth/include/BluetoothHeadsetEvent.h"
 #include <bts_a2dp_sink.h>

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 5b32738..08487a2 100644 (file)
--- 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"\r
 #include "player/include/PlayersView.h"\r
 #include "player/include/PlayersModel.h"\r
-#include "BluetoothPresenter.h"\r
+#include "bluetooth/include/BluetoothPresenter.h" \r
 #include "graphic_service.h"\r
 #include "phoneservice/include/PhoneService.h"\r
 \r
 #include "bts_avrcp_controller.h"\r
 #include "bts_avrcp_target.h"\r
-#include <PlayerListDelSongView.h>\r
+#include "player/include/PlayerListDelSongView.h"\r
 #include "ConfigModel.h"\r
 #include "ctype.h"\r
 #include <custom_utils.h>\r
 #include <custom_save_runtime.h>\r
 #include "NativeRegisterManager.h"\r
 \r
-#include "MainViewSample.h"\r
+#include "main/include/MainViewSample.h"\r
 \r
 \r
 namespace OHOS\r
@@ -993,6 +993,11 @@ bool PlayerInterruptListener::IsPaused()
     return isPaused_;\r
 }\r
 \r
+bool PlayerInterruptListener::IsInterruptedPaused()\r
+{\r
+    return isInterruptedPause_;\r
+}\r
+\r
 bool PlayerInterruptListener::IsDelayed()\r
 {\r
     return isDelayed_;\r
@@ -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);\r
 \r
     if (type == INTERRUPT_TYPE_BEGIN && hint == INTERRUPT_HINT_PAUSE) {\r
+        isInterruptedPause_ = true;\r
         PausePlayer();\r
     }\r
 \r
     if (type == INTERRUPT_TYPE_END && hint == INTERRUPT_HINT_RESUME) {\r
+        isInterruptedPause_ = false;\r
         ResumePlayer();\r
     }\r
 \r

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 913f1c2..aff4b44 100644 (file)
--- 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 65fabbb..062ceb5 100644 (file)
--- 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 <bleEvent.h>
 #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 8239ee2..38cf1c9 100644 (file)
--- 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\r
 #define REBOOT_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "NativeLauncher.h"\r
 #include "NativeAbility.h"\r

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 8627b62..2019136 100644 (file)
--- 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\r
 \r
 #include "View.h"\r
-#include "ShutdownDeviceView.h"\r
-#include "RebootDeviceView.h"\r
+#include "rebootdevice/include/ShutdownDeviceView.h"\r
+#include "rebootdevice/include/RebootDeviceView.h"\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
 #include "components/ui_button.h"\r

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 d2777a9..9575f2b 100644 (file)
--- 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\r
  */\r
 \r
-#include "RebootDeviceView.h"\r
+#include "rebootdevice/include/RebootDeviceView.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
-#include "RebootPresenter.h"\r
+#include "rebootdevice/include/RebootPresenter.h"\r
+#include "PageTransitionMgr.h"\r
 \r
 namespace OHOS {\r
 static RebootDeviceView *g_pRebootDeviceView{nullptr};\r

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 d974582..e5d19bc 100644 (file)
--- 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\r
  */\r
 \r
-#include "RebootModel.h"\r
+#include "rebootdevice/include/RebootModel.h"\r
 #include "dfx_reboot.h"\r
 \r
 namespace OHOS {\r

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 7de3989..db26c7b 100644 (file)
--- 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 efce7f8..92fc106 100644 (file)
--- 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 24ef4ef..4f37f2f 100644 (file)
--- 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\r
  */\r
 \r
-#include "ShutdownDeviceView.h"\r
+#include "rebootdevice/include/ShutdownDeviceView.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
-#include "RebootPresenter.h"\r
+#include "rebootdevice/include/RebootPresenter.h"\r
+#include "PageTransitionMgr.h"\r
 \r
 namespace OHOS {\r
 static ShutdownDeviceView *g_pShutdownDeviceView{nullptr};\r

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 936111c..59f0a36 100644 (file)
--- 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\r
 #define RECORD_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "RecordingView.h"\r
-#include "KeyInputListener.h"\r
+#include "key/include/KeyInputListener.h"\r
 #include "common/key_code.h"\r
 #include "record/include/RecordingModel.h"\r
 #include "media_thread_adapt.h"\r

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 e2060e8..362f72b 100644 (file)
--- 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 @@
 \r
 \r
 #include "View.h"\r
-\r
+#include "common/screen.h"\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r

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 b72a336..dff833f 100644 (file)
--- 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"\r
 #include "ui_resource_string.h"\r
 #include "ConfigModel.h"\r
+#include "common/screen.h"\r
 namespace OHOS\r
 {\r
     static RecordDeleteView *g_pRecordDeleteView{nullptr};\r

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 913e5fe..74b8b20 100644 (file)
--- 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 19e8763..a8caa39 100644 (file)
--- 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 <components/ui_label_button_ext.h>
 #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 962b347..1cff26a 100644 (file)
--- 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 eea5598..ff2e74b 100644 (file)
--- 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 eda2ede..f28fc79 100644 (file)
--- 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\r
 #define RESTORE_DEFAULTS_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "NativeLauncher.h"\r
 #include "NativeAbility.h"\r

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 18ac591..3b5c0ce 100644 (file)
--- 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\r
 \r
 #include "View.h"\r
-#include "RestoreDefaultsPresenter.h"\r
-#include "RestoreSelectView.h"\r
+#include "restoredefaults/include/RestoreDefaultsPresenter.h"\r
+#include "restoredefaults/include/RestoreSelectView.h"\r
 #include "AppGroupView.h"\r
 \r
 namespace OHOS {\r

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 8586175..38d75c1 100644 (file)
--- 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\r
 \r
 #include "View.h"\r
-#include "RestoreDefaultsPresenter.h"\r
+#include "restoredefaults/include/RestoreDefaultsPresenter.h"\r
 #include "components/ui_label.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_view_group.h"\r

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 707c2b7..7c5d606 100644 (file)
--- 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\r
  */\r
 \r
-#include "RestoreDefaultsView.h"\r
+#include "restoredefaults/include/RestoreDefaultsView.h"\r
 #include "components/ui_label.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r

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 8fb3a76..6419a47 100644 (file)
--- 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\r
  */\r
 \r
-#include "RestoreDefaultsPresenter.h"\r
-#include "RestoreDefaultsView.h"\r
-#include "BluetoothModel.h"\r
+#include "restoredefaults/include/RestoreDefaultsPresenter.h"\r
+#include "restoredefaults/include/RestoreDefaultsView.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
 #include "bts_br_gap.h"\r
 #include "drag_event.h"\r
 #include "cmsis_os.h"\r

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 9c04748..fa00339 100644 (file)
--- 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\r
  * Create: 2024-08-12\r
  */\r
-#include "RestoreSelectView.h"\r
+#include "restoredefaults/include/RestoreSelectView.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
-#include "RestoreDefaultsPresenter.h"\r
+#include "restoredefaults/include/RestoreDefaultsPresenter.h"\r
+#include "PageTransitionMgr.h"\r
 \r
 namespace OHOS {\r
 static RestoreSelectView *g_pRestoreSelectView { nullptr };\r

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 bbda60e..4b315a2 100644 (file)
--- 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"\r
 #include "iunknown.h"\r
 #include "broadcast_feature.h"\r
-#include "AlarmClockManage.h"\r
+#include "alarmclockmanage/include/AlarmClockManage.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

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 bd99bcd..aea5097 100644 (file)
--- 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"\r
 #include "broadcast_service.h"\r
 \r
-#include "AlmmgrAlarmClockManage.h"\r
-#include "RtcService.h"\r
+#include "alarmclockmanage/include/AlmmgrAlarmClockManage.h"\r
+#include "rtcservice/include/RtcService.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r

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 7af8ea9..b96ae95 100644 (file)
--- 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 7890a98..c7b91c6 100644 (file)
--- 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 9b02bd0..6fb4896 100644 (file)
--- 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\r
 #define _SAVEBAT_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "saveele/include/SaveBatPresenter.h"\r
 #include "saveele/include/SaveEleModel.h"\r
 #include "saveele/include/SaveBatView.h"\r
 #include "ModelListenerSample.h"\r
-#include "MainModel.h"\r
+#include "main/include/MainModel.h"\r
 \r
 namespace OHOS\r
 {\r

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 149604c..7e01407 100644 (file)
--- 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"\r
 #include "components/ui_label_button.h"\r
 #include "hal_tick.h"\r
+#include "common/screen.h"\r
 namespace OHOS\r
 {\r
     enum class countStage\r

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 6bc3ae9..533a351 100644 (file)
--- 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\r
 #define _SAVEELE_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "SaveEleView.h"\r
 \r

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 c8594f1..b679c0d 100644 (file)
--- 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 @@
 \r
 #include "AppViewIDs.h"\r
-#include "KeyInputListener.h"\r
-#include "MainModel.h"\r
+#include "key/include/KeyInputListener.h"\r
+#include "main/include/MainModel.h"\r
 #include "NativeAbility.h"\r
 #include "common/key_code.h"\r
 #include "cmsis_os.h"\r

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 bc9ac10..d692674 100644 (file)
--- 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 @@
 \r
 #include "AppViewIDs.h"\r
-#include "KeyInputListener.h"\r
+#include "key/include/KeyInputListener.h"\r
 #include "NativeAbility.h"\r
 #include "common/key_code.h"\r
 #include "components/ui_label_ext.h"\r

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 e60be86..a2cc40b 100644 (file)
--- 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 <list>
 
 namespace OHOS
 {
@@ -25,7 +25,7 @@ namespace OHOS
         void SetItemClickListener(UIView::OnClickListener *itemClickListener);
 
     private:
-        List<ScheduleListItemInfo> nodeList_;
+        std::list<ScheduleListItemInfo> 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 a4e9ed1..12a83ef 100644 (file)
--- 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__\r
 #define __SCHEDULEPRESENTER_H__\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "View.h"\r
 \r

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 83e52d7..8ebd835 100644 (file)
--- 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<ScheduleListItemInfo> * node = nodeList_.Begin();
+        std::list<ScheduleListItemInfo>::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 307f99e..c75a42c 100644 (file)
--- 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 82d5849..31f4d77 100644 (file)
--- 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 <unistd.h>
 #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 4192e0e..72ac0bf 100644 (file)
--- 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 a65cdc1..74211c1 100644 (file)
--- 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 d846656..0066e65 100644 (file)
--- 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 8f32943..af6a6a5 100644 (file)
--- 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 <ui_resource_string.h>
 #include <UiConfig.h>
-#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 75b9ba8..75c1822 100644 (file)
--- 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 6abfe4e..b3915c0 100644 (file)
--- 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\r
 \r
 #include "components/ui_label_button.h"\r
-#include "SetCardPresenter.h"\r
+#include "set_card/include/SetCardPresenter.h"\r
 \r
 namespace OHOS {\r
 class SetCardDeleteView : public UIViewGroup {\r

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 3926d93..3a9936b 100644 (file)
--- 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"\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_image_view.h"\r
-#include "MainModel.h"\r
+#include "main/include/MainModel.h"\r
 #include "UiConfig.h"\r
 \r
 namespace OHOS {\r

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 43ed70b..96de2b2 100644 (file)
--- 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 <map>
 #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 dc8ee12..4b02b85 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_button.h"\r
-#include "SetCardPresenter.h"\r
+#include "set_card/include/SetCardPresenter.h"\r
 \r
 namespace OHOS {\r
 class SetCardNoCardView : public UIViewGroup {\r

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 716ee87..5c711a6 100644 (file)
--- 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 ec161ca..32b60a9 100644 (file)
--- 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 f76e5f8..02d28b3 100644 (file)
--- 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 badbc10..2af84ea 100644 (file)
--- 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 195276e..6b062dc 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "SetCardDeleteView.h"\r
+#include "set_card/include/SetCardDeleteView.h"\r
+#include "wearable_log.h"\r
 \r
 namespace OHOS {\r
 \r

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 4bdd7ba..0afe749 100644 (file)
--- 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"\r
-#include "SetCardPresenter.h"\r
+#include "set_card/include/SetCardItem.h"\r
+#include "set_card/include/SetCardPresenter.h"\r
 #include "wearable_log.h"\r
 \r
 namespace OHOS {\r

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 4f32dbc..508854a 100644 (file)
--- 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 5ea9133..d469f0a 100644 (file)
--- 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"\r
 #include <string>\r
 #include "cmsis_os.h"\r
-#include "SetCardNoCardView.h"\r
+#include "set_card/include/SetCardNoCardView.h"\r
+#include "wearable_log.h"\r
 \r
 namespace OHOS {\r
 \r

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 2788958..19b9239 100644 (file)
--- 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 e48b69e..89e76c8 100644 (file)
--- 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 <string>
-#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 68f87a5..8c11acd 100644 (file)
--- 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 <ui_scroll_view.h>
 #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 93c0587..b098142 100644 (file)
--- 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 25c23a4..fb62432 100644 (file)
--- 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 68b000b..ab8f0bd 100644 (file)
--- 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 2a66157..69bc411 100644 (file)
--- 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 <string>
-#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 b65627a..b7ad59e 100644 (file)
--- 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 e2de873..d9080cb 100644 (file)
--- 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 b4a31e5..59b192b 100644 (file)
--- 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 a232024..551a0d8 100644 (file)
--- 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 45421f7..9f1e776 100644 (file)
--- 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 <string>
-#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 042c7c0..e6b5e3d 100644 (file)
--- 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 8ab1288..2a0955e 100644 (file)
--- 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 8f6852e..4b3476c 100644 (file)
--- 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 cd62e20..3ad89c2 100644 (file)
--- 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 e1e0edb..48e9320 100644 (file)
--- 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 2ba3b29..d0fc991 100644 (file)
--- 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 dd91b32..086b191 100644 (file)
--- 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 1da95d3..c2d7f15 100644 (file)
--- 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 abb5ca5..7487cdb 100644 (file)
--- 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 7efd6af..69a2ff9 100644 (file)
--- 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 82e1797..284800f 100644 (file)
--- 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 5f0ba23..dbc767f 100644 (file)
--- 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 bd3dcd3..136b2aa 100644 (file)
--- 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 f67b80d..da278de 100644 (file)
--- 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 29cfd42..998b974 100644 (file)
--- 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 5ab70e5..a8fe634 100644 (file)
--- 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 <vector>
 
 #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 <cmsis_os2.h>
 #include <service/graphic_service.h>
 

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 b33b338..f116f6d 100644 (file)
--- 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 2883400..34ca6a3 100644 (file)
--- 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 e330b9e..15c8c5d 100644 (file)
--- 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\r
 #define CALL_VOLUME_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "CallVolumeView.h"\r
 \r

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 19c6c8a..645da4d 100644 (file)
--- 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\r
 #define SOUND_AND_VIBRATION_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "View.h"\r
 #include "SoundAndVibrationView.h"\r

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 40cda08..d19bc7e 100644 (file)
--- 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\r
 #define SYSTEM_VOLUME_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "View.h"\r
 #include "SystemVolumeView.h"\r

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 e40f3f0..e6b678f 100644 (file)
--- 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"\r
 #include "ui_resource_string.h"\r
 #include <UiConfig.h>\r
+#include "common/screen.h"\r
 /*\r
 按优先级分为\r
 1.系统音量\r

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 ca30ca5..f98a117 100644 (file)
--- 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 1152b15..b873b51 100644 (file)
--- 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\r
 #define MAIN_STOPWATCH_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "View.h"\r
 #include "MainStopWatchView.h"\r

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 1f39e56..f1e63c0 100644 (file)
--- 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"\r
 #include "AppViewIDs.h"\r
 #include "wearable_log.h"\r
+#include "common/screen.h"\r
 /*秒表主视图*/\r
 namespace OHOS\r
 {\r

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 63c3ef8..9df11ba 100644 (file)
--- 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\r
 #define SYSTEM_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "SystemView.h"\r
 #include "system/include/SystemModel.h"\r
 #include "components/ui_radio_button.h"\r
-#include "KeyInputListener.h"\r
+#include "key/include/KeyInputListener.h"\r
 #ifdef SUPPORT_CAT1_SERVICE\r
 #include "cat1_ctl.h"\r
 #endif\r

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 5c0cffd..7d65c2d 100644 (file)
--- 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"\r
 #include "ConfigModel.h"\r
 #include "ui_resource_string.h"\r
+#include "common/screen.h"\r
 \r
 #define WATCH_ABOUT_TITLE_HEIGHT 50\r
 #define WATCH_ABOUT_VALUE_HEIGHT 80\r
@@ -135,7 +136,6 @@ namespace OHOS
             delete APNprotocol;\r
             APNprotocol = nullptr;\r
 \r
-            FocusManager::GetInstance()->ClearFocus();\r
             delete SystemAboutTheWatchScrollView;\r
             SystemAboutTheWatchScrollView = nullptr;\r
         }\r
@@ -193,8 +193,7 @@ namespace OHOS
         SystemAboutTheWatchScrollView->SetThrowDrag(true);\r
         SystemAboutTheWatchScrollView->SetMaxScrollDistance(1000);\r
         SystemAboutTheWatchScrollView->SetSwipeACCLevel(200); /*设置手指抬起屏幕后的补偿距离。*/\r
-        FocusManager::GetInstance()->RequestFocus(SystemAboutTheWatchScrollView);\r
-        FocusManager::GetInstance()->RequestFocusByDirection(FOCUS_DIRECTION_UP);\r
+        SystemAboutTheWatchScrollView->RequestFocus();\r
         SystemAboutTheWatchScrollView->SetRotateFactor(1.0);\r
         UIView::OnDragListener *draglistener = static_cast<UIView::OnDragListener *>(SystemPresenter::GetInstance());\r
         if (draglistener == nullptr)\r

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 e8553e7..ef37863 100644 (file)
--- 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"\r
 #include "UiConfig.h"\r
 #include "ui_resource_string.h"\r
+#include "common/screen.h"\r
 \r
 namespace OHOS\r
 {\r

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 4efd295..b30faed 100644 (file)
--- 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 3d407ca..1d335ff 100644 (file)
--- 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 79cbfc0..e7abb26 100644 (file)
--- 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"\r
 #include "system/include/SystemPresenter.h"\r
 #include "wearable_log.h"\r
+#include "common/screen.h"\r
 namespace OHOS\r
 {\r
 \r

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 9e5796d..5c275ad 100644 (file)
--- 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"\r
 \r
 #include "UiConfig.h"\r
-\r
+#include "common/screen.h"\r
 \r
 \r
 #include "ui_resource_string.h"\r
@@ -274,8 +274,7 @@ namespace OHOS
         SystemScrollView[SYSTEMVIEW]->SetThrowDrag(true);         // 设置手指抬起屏幕后是否继续滚动。\r
         SystemScrollView[SYSTEMVIEW]->SetMaxScrollDistance(1000); // 设置手指抬起屏幕后的最大滚动距离。\r
         SystemScrollView[SYSTEMVIEW]->SetSwipeACCLevel(200);      /*设置手指抬起屏幕后的补偿距离。*/\r
-        FocusManager::GetInstance()->RequestFocus(SystemScrollView[SYSTEMVIEW]);\r
-        FocusManager::GetInstance()->RequestFocusByDirection(FOCUS_DIRECTION_UP);\r
+        SystemScrollView[SYSTEMVIEW]->RequestFocus();\r
         SystemScrollView[SYSTEMVIEW]->SetRotateFactor(1.0);\r
         SystemScrollView[SYSTEMVIEW]->SetOnDragListener(presenter_);\r
         SystemScrollView[SYSTEMVIEW]->SetTouchable(true);\r

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 45ab336..6b81c5c 100644 (file)
--- 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 e835711..7f790f4 100644 (file)
--- 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 5353abf..0d40083 100644 (file)
--- 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 e0d584d..06a7c0f 100644 (file)
--- 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 7756ff7..9197eb9 100644 (file)
--- 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"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_scroll_view.h"\r
-#include "TempPresenter.h"\r
+#include "temperature/include/TempPresenter.h"\r
 \r
 namespace OHOS {\r
 class TempClickMea : public UIScrollView {\r

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 c6aca9e..841c3f7 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_view_group.h"\r
-#include "TempPresenter.h"\r
+#include "temperature/include/TempPresenter.h"\r
 \r
 namespace OHOS {\r
 class TempContinueWarn : public UIViewGroup {\r

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 81df814..c709523 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "AppGroupView.h"\r
-#include "TempPresenter.h"\r
+#include "temperature/include/TempPresenter.h"\r
 \r
 namespace OHOS {\r
 class TempExitInter : public AppGroupView {\r

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 6354377..a0ec725 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_scroll_view.h"\r
-#include "TempPresenter.h"\r
+#include "temperature/include/TempPresenter.h"\r
 \r
 namespace OHOS {\r
 class TempExitPrompt : public UIScrollView {\r

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 6de7982..30781c5 100644 (file)
--- 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"\r
 #include "components/ui_label_button.h"\r
 #include "AppGroupView.h"\r
-#include "TempPresenter.h"\r
+#include "temperature/include/TempPresenter.h"\r
 \r
 namespace OHOS {\r
 class TempInitInter : public AppGroupView {\r

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 6aec60c..71bbec5 100644 (file)
--- 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"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_scroll_view.h"\r
-#include "TempPresenter.h"\r
+#include "temperature/include/TempPresenter.h"\r
 \r
 namespace OHOS {\r
 class TempJoinStudy : public UIScrollView {\r

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 49320fc..7f34df3 100644 (file)
--- 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 @@
 \r
 #include "components/ui_label.h"\r
 #include "components/ui_scroll_view.h"\r
-#include "TempPresenter.h"\r
+#include "temperature/include/TempPresenter.h"\r
 \r
 namespace OHOS {\r
 class TempLittleTip : public UIScrollView {\r

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 2b34481..b6fa445 100644 (file)
--- 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"\r
 #include "ChangeSliceListener.h"\r
 #include "components/ui_swipe_view.h"\r
-#include "TempPresenter.h"\r
-#include "TempJoinStudy.h"\r
-#include "TempMeasure.h"\r
-#include "TempExitInter.h"\r
-#include "TempPromptWear.h"\r
-#include "TempClickMea.h"\r
-#include "TempRemindWear.h"\r
-#include "TempMeaProcess.h"\r
-#include "TempInitInter.h"\r
-#include "TempWarn.h"\r
-#include "TempLittleTip.h"\r
-#include "TempModel.h"\r
-#include "TempStudyAbout.h"\r
-#include "TempExitPrompt.h"\r
-#include "TempContinueWarn.h"\r
-#include "TempReport.h"\r
+#include "temperature/include/TempPresenter.h"\r
+#include "temperature/include/TempJoinStudy.h"\r
+#include "temperature/include/TempMeasure.h"\r
+#include "temperature/include/TempExitInter.h"\r
+#include "temperature/include/TempPromptWear.h"\r
+#include "temperature/include/TempClickMea.h"\r
+#include "temperature/include/TempRemindWear.h"\r
+#include "temperature/include/TempMeaProcess.h"\r
+#include "temperature/include/TempInitInter.h"\r
+#include "temperature/include/TempWarn.h"\r
+#include "temperature/include/TempLittleTip.h"\r
+#include "temperature/include/TempModel.h"\r
+#include "temperature/include/TempStudyAbout.h"\r
+#include "temperature/include/TempExitPrompt.h"\r
+#include "temperature/include/TempContinueWarn.h"\r
+#include "temperature/include/TempReport.h"\r
 \r
 namespace OHOS {\r
 class TempMainView;\r

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 ebd0ee4..2f13f85 100644 (file)
--- 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"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_circle_progress.h"\r
-#include "TempPresenter.h"\r
+#include "temperature/include/TempPresenter.h"\r
 \r
 namespace OHOS {\r
 class TempMeaProcess : public UIScrollView {\r

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 de6aa31..3919314 100644 (file)
--- 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"\r
 #include "components/ui_label_button.h"\r
 #include "AppGroupView.h"\r
-#include "TempPresenter.h"\r
+#include "temperature/include/TempPresenter.h"\r
 \r
 namespace OHOS {\r
 class TempMeasure : public AppGroupView {\r

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 f9b3520..dbfb392 100644 (file)
--- 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\r
 #define TEMP_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "UiConfig.h"\r
 #include "components/ui_image_view.h"\r

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 5f590e0..69ac5d2 100644 (file)
--- 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"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_scroll_view.h"\r
-#include "TempPresenter.h"\r
+#include "temperature/include/TempPresenter.h"\r
 \r
 namespace OHOS {\r
 class TempPromptWear : public UIScrollView {\r

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 24f10ed..48b5b64 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "components/ui_scroll_view.h"\r
-#include "TempPresenter.h"\r
+#include "temperature/include/TempPresenter.h"\r
 \r
 namespace OHOS {\r
 class TempRemindWear : public UIScrollView {\r

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 3faadd5..41ff679 100644 (file)
--- 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"\r
 #include "components/ui_label.h"\r
 #include "AppGroupView.h"\r
-#include "TempPresenter.h"\r
+#include "temperature/include/TempPresenter.h"\r
 \r
 namespace OHOS {\r
 class TempReport : public AppGroupView {\r

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 3d0deee..c26d51a 100644 (file)
--- 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 @@
 \r
 #include "components/ui_label.h"\r
 #include "components/ui_scroll_view.h"\r
-#include "TempPresenter.h"\r
+#include "temperature/include/TempPresenter.h"\r
 \r
 namespace OHOS {\r
 class TempStudyAbout : public UIScrollView {\r

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 821b4a4..5d185b5 100644 (file)
--- 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"\r
 #include "components/ui_label_button.h"\r
 #include "components/ui_scroll_view.h"\r
-#include "TempPresenter.h"\r
+#include "temperature/include/TempPresenter.h"\r
 \r
 namespace OHOS {\r
 class TempWarn : public UIScrollView {\r

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 f56dc3a..c0c1c86 100644 (file)
--- 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"\r
 #include <string>\r
 #include "font/ui_font.h"\r
-#include "TempClickMea.h"\r
+#include "temperature/include/TempClickMea.h"\r
 \r
 namespace OHOS {\r
 static TempClickMea *g_tempClickMea = nullptr;\r

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 25acea9..8d11e3a 100644 (file)
--- 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 @@
 \r
 #include "UiConfig.h"\r
 #include <string>\r
-#include "TempContinueWarn.h"\r
+#include "temperature/include/TempContinueWarn.h"\r
 \r
 namespace OHOS {\r
 static TempContinueWarn *g_tempContinueWarn = nullptr;\r

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 b2538b0..8ea18ec 100644 (file)
--- 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"\r
 #include "font/ui_font.h"\r
 #include <string>\r
-#include "TempExitInter.h"\r
+#include "temperature/include/TempExitInter.h"\r
 \r
 namespace OHOS {\r
 static TempExitInter *g_tempExitInter = nullptr;\r

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 34359aa..600b97f 100644 (file)
--- 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"\r
 #include "layout/grid_layout.h"\r
 #include <string>\r
-#include "TempExitPrompt.h"\r
+#include "temperature/include/TempExitPrompt.h"\r
 \r
 namespace OHOS {\r
 static TempExitPrompt *g_tempExitPrompt = nullptr;\r

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 dc00359..19a076c 100644 (file)
--- 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 @@
 \r
 #include "UiConfig.h"\r
 #include <string>\r
-#include "TempInitInter.h"\r
+#include "temperature/include/TempInitInter.h"\r
 \r
 namespace OHOS {\r
 static TempInitInter *g_tempInitInter = nullptr;\r

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 bf089b5..9dce745 100644 (file)
--- 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"\r
 #include "layout/grid_layout.h"\r
 #include <string>\r
-#include "TempJoinStudy.h"\r
+#include "temperature/include/TempJoinStudy.h"\r
 \r
 namespace OHOS {\r
 static TempJoinStudy *g_tempJoinStudy = nullptr;\r

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 8c6c018..b4e7378 100644 (file)
--- 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 @@
 \r
 #include "UiConfig.h"\r
 #include <string>\r
-#include "TempLittleTip.h"\r
+#include "temperature/include/TempLittleTip.h"\r
 \r
 namespace OHOS {\r
 static TempLittleTip *g_tempJoinStudy = nullptr;\r

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 5c533c7..61cd2b6 100644 (file)
--- 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\r
  */\r
 \r
-#include "TempMainView.h"\r
+#include "temperature/include/TempMainView.h"\r
 #include "UiConfig.h"\r
-#include "TempMeaProcess.h"\r
-#include "TempWarn.h"\r
+#include "temperature/include/TempMeaProcess.h"\r
+#include "temperature/include/TempWarn.h"\r
+#include "temperature/include/TempExitPrompt.h"\r
+\r
 \r
 namespace OHOS {\r
 static TempMainView *g_tempMainView = nullptr;\r

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 76918d1..7bb6460 100644 (file)
--- 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 @@
 \r
 #include "UiConfig.h"\r
 #include <string>\r
-#include "TempMeaProcess.h"\r
-#include "TempMainView.h"\r
+#include "temperature/include/TempMeaProcess.h"\r
+#include "temperature/include/TempMainView.h"\r
 \r
 namespace OHOS {\r
 static TempMeaProcess *g_tempMeaProcess = nullptr;\r

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 a3c01d9..d69ac21 100644 (file)
--- 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 @@
 \r
 #include "UiConfig.h"\r
 #include <string>\r
-#include "TempMeasure.h"\r
+#include "temperature/include/TempMeasure.h"\r
 \r
 namespace OHOS {\r
 static TempMeasure *g_tempMeasure = nullptr;\r

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 b52c38c..af1f613 100644 (file)
--- 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\r
  */\r
 \r
-#include "TempModel.h"\r
+#include "temperature/include/TempModel.h"\r
 #include "UiConfig.h"\r
-#include "TempModel.h"\r
+#include "temperature/include/TempModel.h"\r
 \r
 namespace OHOS {\r
 TempModel::TempModel()\r

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 7d70cc3..5f49e41 100644 (file)
--- 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\r
  */\r
 \r
-#include "TempPresenter.h"\r
-#include "TempMainView.h"\r
+#include "temperature/include/TempPresenter.h"\r
+#include "temperature/include/TempMainView.h"\r
 #include "ChangeSliceListener.h"\r
 #include "graphic_service.h"\r
-#include "ui_service.h"\r
+#include "uiservice/include/ui_service.h"\r
 #include "string"\r
 #include "iostream"\r
 #include "sstream"\r

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 47ec2b0..2cbdb64 100644 (file)
--- 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 @@
 \r
 #include "UiConfig.h"\r
 #include <string>\r
-#include "TempPromptWear.h"\r
+#include "temperature/include/TempPromptWear.h"\r
 \r
 namespace OHOS {\r
 static TempPromptWear *g_tempPromptWear = nullptr;\r

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 a6ffbf5..12a401b 100644 (file)
--- 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 @@
 \r
 #include "UiConfig.h"\r
 #include <string>\r
-#include "TempRemindWear.h"\r
+#include "temperature/include/TempRemindWear.h"\r
 \r
 namespace OHOS {\r
 static TempRemindWear *g_tempRemindWear = nullptr;\r

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 46cf911..43eeb7b 100644 (file)
--- 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"\r
 #include "font/ui_font.h"\r
 #include <string>\r
-#include "TempReport.h"\r
+#include "temperature/include/TempReport.h"\r
 \r
 namespace OHOS {\r
 static TempReport *g_tempReport = nullptr;\r

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 8db30bd..4c1a8ed 100644 (file)
--- 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 <string>
-#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 8df8eb9..985b0fe 100644 (file)
--- 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 @@
 \r
 #include "UiConfig.h"\r
 #include <string>\r
-#include "TempWarn.h"\r
+#include "temperature/include/TempWarn.h"\r
 \r
 namespace OHOS {\r
 static TempWarn *g_tempWarn = nullptr;\r

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 eb2c7e5..10545e3 100644 (file)
--- 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 c99ad8c..27bc5dc 100644 (file)
--- 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 9f2c02f..6dfd2fd 100644 (file)
--- 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 cc6134c..3ef2ab4 100644 (file)
--- 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 db1adc5..87fcd14 100644 (file)
--- 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 b963678..7df8f91 100644 (file)
--- 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 1e596c9..e238d92 100644 (file)
--- 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 f2d0157..795d6cb 100644 (file)
--- 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"\r
 #include "ui_resource_string.h"\r
 #include "NativeAbility.h"\r
-#include "KeyInputListener.h"\r
+#include "key/include/KeyInputListener.h"\r
 #include "custom_utils.h"\r
 #include "common/key_code.h"\r
 \r
@@ -13,7 +13,7 @@
 #include <thread>\r
 #include "traing/include/TraingNomalPresenter.h"\r
 #include "traing/training_card/include/TraingCardPresenter.h"\r
-#include "MainModel.h"\r
+#include "main/include/MainModel.h"\r
 #include "UiConfig.h"\r
 // #include "TraingNomalView.h"\r
 \r

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 a98635f..7887a3d 100644 (file)
--- 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 598f034..80c61ec 100644 (file)
--- 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"\r
 #include "ui_resource_string.h"\r
 #include "NativeAbility.h"\r
-#include "KeyInputListener.h"\r
+#include "key/include/KeyInputListener.h"\r
 #include "custom_utils.h"\r
 #include "common/key_code.h"\r
 \r

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 f6e1dfc..0cc44ac 100644 (file)
--- 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 980e070..6e26026 100644 (file)
--- 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 685444d..cf3f878 100644 (file)
--- 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 72042cc..3ca2578 100644 (file)
--- 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 c37597f..c7a5704 100644 (file)
--- 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 e090dd7..0bb93f5 100644 (file)
--- 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 8e46e56..32f1656 100644 (file)
--- 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\r
 \r
 #include "ModelListenerSample.h"\r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "TraingCardView.h"\r
 #include "traing/training_card/include/TrainingControlView.h"\r

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 a921c84..7533da3 100644 (file)
--- 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"\r
 #include "traing/training_card/include/TraingCardPresenter.h"\r
 \r
-#include "PlayersView.h"\r
+#include "player/include/PlayersView.h"\r
 #include "traing/training_card/include/TraingDataAllView.h"\r
 #include "traing/training_card/include/TrainingControlView.h"\r
 #include "traing/training_card/include/TrainingDataView.h"\r

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 9007204..52ad02c 100644 (file)
--- 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 f1ea135..ef0d888 100644 (file)
--- 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 0db6c4b..f5c9a11 100644 (file)
--- 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 f9c1cb8..7f20875 100644 (file)
--- 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 0a83c2a..969afad 100644 (file)
--- 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 399f793..49b8bf9 100644 (file)
--- 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 d1e3068..50459e9 100644 (file)
--- 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 50ecea7..8e3518a 100644 (file)
--- 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 6e0f6ff..3f17e8c 100644 (file)
--- 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 c1fb86f..8e9c71a 100644 (file)
--- 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 18e3113..470fa5b 100644 (file)
--- 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 fcb98df..f51a191 100644 (file)
--- 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 77601fa..143c5df 100644 (file)
--- 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"\r
 #include "NativeAbility.h"\r
 \r
-#include "KeyInputListener.h"\r
+#include "key/include/KeyInputListener.h"\r
 #include "custom_utils.h"\r
 #include "common/key_code.h"\r
 \r

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 2ac3925..1dac057 100644 (file)
--- 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 95a1026..903555d 100644 (file)
--- 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"\r
 #include "NativeAbility.h"\r
 \r
-#include "KeyInputListener.h"\r
+#include "key/include/KeyInputListener.h"\r
 #include "custom_utils.h"\r
 #include "common/key_code.h"\r
 \r

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 fdedb9b..271bb7b 100644 (file)
--- 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 8562f2d..337c59d 100644 (file)
--- 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 167a8bd..6b7c957 100644 (file)
--- 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 b6f02ae..d099db4 100644 (file)
--- 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 c91791b..670b79e 100644 (file)
--- 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 e346255..71ccac0 100644 (file)
--- 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 45028ca..a3683e8 100644 (file)
--- 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 <map>
 #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 03d4e13..95c1041 100644 (file)
--- 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 4336484..2cd075c 100644 (file)
--- 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 db908c7..26b5d1e 100644 (file)
--- 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 85b6fef..66dace2 100644 (file)
--- 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 <string>
 
-#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 6e6fb1b..fe58f91 100644 (file)
--- 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 96dab4b..78c68bb 100644 (file)
--- 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 059cbca..8dec03d 100644 (file)
--- 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 fd5bfe3..9a1a647 100644 (file)
--- 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 <cmsis_os2.h>
 #include <cmsis_os.h>
-
+#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 d149d71..49fb45e 100644 (file)
--- 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\r
 #define MAIN_WEATHER_PRESENTER_H\r
 \r
+#include "key/include/KeyInputListener.h"\r
 #include "Presenter.h"\r
 #include "View.h"\r
 #include "MainWeatherView.h"\r

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 d0fc5db..69592a5 100644 (file)
--- 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 c7cef19..ff5e2fa 100644 (file)
--- 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 336cfd7..8407ca5 100644 (file)
--- 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"\r
 #include "common_def.h"\r
 #include "cpp/audio_manager.h"\r
-#include "uiservice/ui_service.h"\r
+#include "uiservice/include/ui_service.h"\r
 #include "ui_resource_string.h"\r
 #include <sys/statfs.h>\r
 #include <algorithm>\r
@@ -227,7 +227,9 @@ OTA_ERR device_proxy::ota_update(ota_info &info)
 void device_proxy::call_ui_ota_update()\r
 {\r
     // 发送升级请求到uiservice\r
+    #ifdef FD230_650_0723\r
     SendMsgToUIService(UI_OTA_UPDATE, 0, nullptr, 0);\r
+    #endif\r
 }\r
 \r
 int device_proxy::delete_file_with_cleanup(const char *ppath, const char *path)\r

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 56f89c1..5ef6fe6 100644 (file)
--- 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"\r
 #include "AppViewIDs.h"\r
 #include "NativeAbility.h"\r
-#include "sports/SportsModel.h"\r
-#include "findphone/FindPhoneMainPage.h"\r
-#include "camera/CameraMainPage.h"\r
+// #include "sports/SportsModel.h"\r
+// #include "findphone/FindPhoneMainPage.h"\r
+// #include "camera/CameraMainPage.h"\r
 \r
 #ifdef __cplusplus\r
 extern "C" {\r
@@ -369,6 +369,7 @@ errcode_t msg_center_sport_action(uint8_t cmd_id, uint8_t type, void *usr_data,
 \r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "msg_center_sport_action : %d\r\n", action);\r
 \r
+    #ifdef FD230_650_0723\r
     switch (action) {\r
         case SPORT_ACTION_START:\r
             OHOS::NativeAbility::GetInstance().ChangeSlice(VIEW_SPORTS);\r
@@ -389,12 +390,13 @@ errcode_t msg_center_sport_action(uint8_t cmd_id, uint8_t type, void *usr_data,
             break;\r
         case SPORT_ACTION_STOP:\r
             OHOS::SportsModel::GetInstance()->StopSportsTimer(false);\r
-            OHOS::NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE);\r
+            OHOS::NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);\r
             break;\r
         default:\r
             ret = ERRCODE_FAIL;\r
             break;\r
     }\r
+    #endif\r
 \r
     ret = msg_center_send_data(cmd_id, type, &ack, sizeof(ack));\r
     if (ret != ERRCODE_SUCC) {\r
@@ -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;\r
 \r
     WEARABLE_LOGI(WEARABLE_LOG_MODULE_MSG_CENTER, "msg_center_sport_get_data\r\n");\r
+    #ifdef FD230_650_0723\r
     OHOS::sport_data_t *sportData = OHOS::SportsModel::GetInstance()->GetSportsData();\r
     ret = msg_center_send_data(cmd_id, type, sportData, sizeof(OHOS::sport_data_t));\r
     if (ret != ERRCODE_SUCC) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_MSG_CENTER, "msg_center_sport_get_data end data failed\r\n");\r
         return ERRCODE_FAIL;\r
     }\r
+    #endif\r
     return ERRCODE_SUCC;\r
 }\r
 \r
@@ -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)\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_MSG_CENTER, "recv connect success from phone");\r
+    #ifdef FD230_650_0723\r
     if (OHOS::CameraMainPage::GetInstance() != nullptr) {\r
         OHOS::CameraMainPage::GetInstance()->Refresh_page();\r
         return ERRCODE_SUCC;\r
@@ -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");\r
         return ERRCODE_FAIL;\r
     }\r
+    #endif\r
+    return ERRCODE_SUCC;\r
 }\r
 \r
 errcode_t msg_center_offline_log_switch(uint8_t cmd_id, uint8_t type, void *usr_data, uint16_t usr_len)\r
@@ -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;\r
     uint8_t *tlv_payload = (uint8_t *)msg_center_get_tlv_payload(usr_data);\r
     bool ret = true;\r
+    #ifdef FD230_650_0723\r
     if ( OHOS::FindPhoneMainPage::GetInstance() != nullptr) {\r
         ret = OHOS::FindPhoneMainPage::GetInstance()->StopFindPhone();\r
     } else {\r
@@ -513,6 +521,7 @@ errcode_t msg_center_device_findphone(uint8_t cmd_id, uint8_t type, void *usr_da
     if (!ret) {\r
         return ERRCODE_FAIL;\r
     }\r
+    #endif\r
     return ERRCODE_SUCC;\r
 }\r
 #ifdef __cplusplus\r

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 8c61862..c65e5bc 100644 (file)
--- 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 5d6de84..e58e164 100644 (file)
--- 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 0e24be7..b1e105a 100644 (file)
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 5890416..e5f3874 100644 (file)
--- 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 5588afc..6734006 100644 (file)
--- 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 <deque>
 #include <cerrno>
 
-#include "BluetoothModel.h"
+#include "bluetooth/include/BluetoothModel.h"
 #include <cstring>
 #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 bfcc29b..740582b 100644 (file)
--- 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 eb6a408..73000e3 100644 (file)
--- 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"\r
 #include "wearable_log.h"\r
 #include <string>\r
-#include "main/MessageModel.h"\r
+#include "message/include/MessageModel.h"\r
 \r
 namespace OHOS {\r
 // 三方应用名\r
@@ -159,7 +159,9 @@ void PhoneMsgView::UpDatePhoneMsg(std::string appName, std::string titile, std::
     phoneMsg_.appName = appName;\r
     phoneMsg_.msgTitle = titile;\r
     phoneMsg_.msgContent = content;\r
+    #ifdef FD230_650_0723\r
     MessageModel::GetInstance().GetMessageInfo(appName, titile, content);\r
+    #endif\r
 }\r
 \r
 PhoneMsgViewEventListener::PhoneMsgViewEventListener()\r

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 f869cf3..451fc1b 100644 (file)
--- 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"\r
 #endif\r
 #ifdef SUPPORT_OHOSFWK\r
-#include "screennotify/ui_screennotify.h"\r
+#include "screennotify/include/ui_screennotify.h"\r
 #endif\r
 #include "sys/time.h"\r
 #include "touch_screen_def.h"\r

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 9e88a43..e1d0302 100644 (file)
--- 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"\r
 #include "recording_module.h"\r
 #ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
-#include "bluetooth/BluetoothChangeBle.h"\r
+#include "bluetooth/include/BluetoothChangeBle.h"\r
 #endif\r
 \r
 #ifdef __cplusplus\r

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 b1ab9d2..e3ce469 100644 (file)
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 5d6de84..5d3e182 100644 (file)
--- 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 (file)
index 0000000..b1e105a
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 (file)
index b1ab9d2..0000000
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 46c28fc..9ec1839 100644 (file)
--- 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 <unistd.h>
 #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 f86fdc3..c029576 100644 (file)
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 276f50a..a5635b8 100644 (file)
--- 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;\r
     uint8_t name[NV_SYS_PRODUCT_INFO_NAME_LEN];\r
 } sys_product_info_t;\r
+typedef struct {\r
+    uint8_t size;                               /* 序列号长度 */\r
+    uint8_t sn[NV_SYS_PRODUCT_INFO_NAME_LEN];    /* 序列号数组 */\r
+} custom_key_sn_t;\r
 \r
 \r
 #endif /* __COMMON_H__ */\r

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 441cef8..a731301 100644 (file)
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 441cef8..7337ef0 100644 (file)
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 5b7a503..8864f8e 100644 (file)
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 aa77c68..9d278be 100644 (file)
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 f358979..128f8e3 100644 (file)
--- 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"\r
 #include "components/root_view.h"\r
 #ifdef SUPPORT_OHOSFWK\r
-#include "screennotify/ui_screennotify.h"\r
+#include "screennotify/include/ui_screennotify.h"\r
 #endif\r
 #ifdef SUPPORT_GPU_JPEG\r
 #include "drv_jpeg_intf.h"\r

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 16155d8..741812a 100644 (file)
--- 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 <num>\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 e8781a6..0a3e466 100644 (file)
--- 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"\r
 #include "components/root_view.h"\r
 #ifdef SUPPORT_OHOSFWK\r
-#include "screennotify/ui_screennotify.h"\r
+#include "screennotify/include/ui_screennotify.h"\r
 #endif\r
 \r
 namespace OHOS {\r

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 8a45210..cd4e88b 100644 (file)
--- 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 1a4ec41..b4c80ff 100644 (file)
--- 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"\r
 #include "transmit_resume.h"\r
 #ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
-#include "bluetooth/BluetoothChangeBle.h"\r
+#include "bluetooth/include/BluetoothChangeBle.h"\r
+\r
 #endif\r
 #ifdef CONFIG_DFX_SUPPORT_PARTITION\r
 #if (CONFIG_DFX_SUPPORT_PARTITION == DFX_YES)\r

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 a92a753..8f3f39f 100644 (file)
--- 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"\r
 #include "diag_dfx.h"\r
 #ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
-#include "bluetooth/BluetoothChangeBle.h"\r
+#include "bluetooth/include/BluetoothChangeBle.h"\r
 #endif\r
 \r
 #define TRANSMIT_ITEM_CNT 3\r

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 0975efb..d2732f7 100644 (file)
--- 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"\r
 #include "errcode.h"\r
 #ifdef CONFIG_BRANDY_BLE_TRANS_OPTIMIZE\r
-#include "bluetooth/BluetoothChangeBle.h"\r
+#include "bluetooth/include/BluetoothChangeBle.h"\r
 #endif\r
 \r
 STATIC uint32_t transmit_data_read(transmit_item_t *item, uint32_t offset, uint8_t *buf, uint32_t size)\r

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 319a378..ef8c37d 100644 (file)
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 319a378..1c08fcb 100644 (file)
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 b9ee512..00beb36 100644 (file)
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 b9ee512..50e244a 100644 (file)
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 8279bdf..b294a76 100644 (file)
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 f829a58..e807091 100644 (file)
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 (file)
index 0000000..cdfdb31
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 (file)
index 0000000..b9c1bb0
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 (file)
index 0000000..93b5e6f
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 50dca74..87a2efd 100644 (file)
--- 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 c6363c0..54c14cc 100644 (file)
--- 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 <securec.h>\r
 #include <unistd.h>\r
 #include "network_module.h"\r
-#include "bluetooth/BluetoothModel.h"\r
+#include "bluetooth/include/BluetoothModel.h"\r
 #include "msg_center_protocol.h"\r
 #include "bts_le_gap.h"\r
 #include "network_listener.h"\r

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 ac4194c..f262ad8 100644 (file)
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 00de31c..bafd4fc 100644 (file)
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 dfb266d..6a2b9bb 100644 (file)
--- 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 9ed8d2f..d37e7ee 100644 (file)
--- 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 af625e2..02cb844 100644 (file)
--- 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 70a4714..5243255 100644 (file)
--- 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 1122db3..fb79422 100644 (file)
--- 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 087b6ea..fcd269b 100644 (file)
--- 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 8c11716..824499b 100644 (file)
--- 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 bcde2a1..80f411c 100644 (file)
--- 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 97b4826..e3c7628 100644 (file)
--- 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 a71ff4c..e5fbe78 100644 (file)
--- 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 3de638e..c97d331 100644 (file)
--- 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 182ae41..0824da9 100644 (file)
--- 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 cf555db..e815f57 100644 (file)
--- 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 2e9c9da..49a3b68 100644 (file)
--- 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"