修复部分更改

diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt
index f3bfc54..0ff6aea 100644 (file)
--- a/code/sdk/application/wearable/fd230app/CMakeLists.txt
+++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt
@@ -464,6 +464,7 @@ set(SOURCES
     ${UI_SAMPLE_ROOT}/components/ui_test_cube_rotate/cube_rotate_view.cpp
     ${UI_SAMPLE_ROOT}/components/ui_test_cube_rotate/ui_test_cube_rotate.cpp
     ${UI_SAMPLE_ROOT}/components/ui_test_video_play/ui_test_video_play.cpp
+    ${UI_SAMPLE_ROOT}/components/ui_test_keyboard/ui_test_keyboard.cpp
     ${UI_SAMPLE_ROOT}/components/ui_test_hexagons_list/ui_test_hexagons_list.cpp
     ${UI_SAMPLE_ROOT}/components/ui_test_coverflow/ui_test_coverflow.cpp
     ${UI_SAMPLE_ROOT}/components/ui_test_kaleidoscope/ui_test_kaleidoscope.cpp
@@ -686,6 +687,8 @@ set(COMPONENT_CCFLAGS
     -nostdlib
     -Wno-c++11-narrowing
     -Wno-error=unused-function
+    -Wno-missing-field-initializers
+    -Werror=return-type
 )
 
 set(WHOLE_LINK

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index a89559e..4369eff 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -118,7 +118,7 @@
 // #include "dialupdate/include/DialUpdatePresenter.h"
 // #include "dialupdate/include/DialUpdateView.h"
 
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include "rebootdevice/include/RebootModel.h"
 
 #include "phone/include/PhoneView.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h
index ee07730..762ba31 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h
@@ -45,7 +45,7 @@ public:
         if ((event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) &&
             (event.GetDeltaX() > X_DRAG_OFFSET) && (event.GetDeltaX() > (DOUBLES * MATH_ABS(event.GetDeltaY())))) {
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Applist Ondrag!!");
-            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE, TransitionType::TRANSITION_ZOOM);
+            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN, TransitionType::TRANSITION_ZOOM);
         }
 
         return false;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp
index 79e4eea..8bc3fd2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistPresenter.cpp
@@ -8,7 +8,7 @@
 #include "ApplistPresenter.h"
 #include "ability_manager.h"
 #include "securec.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include "traing/include/TraingModel.h"
 #include "components/ui_hexagons_list.h"
 #include "TransitionType.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
index 638122d..19174a6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/src/CallerLogModel.cpp
@@ -277,7 +277,7 @@ static void WaitingOpreate()
     CallerLogModel::GetInstance()->SetWaitingStatus(true);
     // If the call is handling in the notification, the slice is not switched
     if (CallerLogModel::GetInstance()->GetNotifyFlag() == false) {
-        NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL, TRANSITION_INVALID, PRIORITY_ONE);
+        NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL, TransitionType::TRANSITION_INVALID, PRIORITY_ONE);
     }
 }
 
@@ -375,7 +375,7 @@ static bool MultiplePhonesViewDisplay()
             DisableCallingTimer();
             CallerLogModel::GetInstance()->SetMulitplePhoneStatus(true);
             CallerLogModel::GetInstance()->SetCallStatus(true);
-            NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL, TRANSITION_INVALID, PRIORITY_ONE);
+            NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL, TransitionType::TRANSITION_INVALID, PRIORITY_ONE);
             return true;
         }
         if (MulitplePhoneTextReplaces() == false) {
@@ -407,7 +407,7 @@ static void NonWatchFinishHandle(int laststatus)
             }
             // If the call is handling in the notification, the slice is not switched
             if (CallerLogModel::GetInstance()->GetNotifyFlag() == false) {
-                NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL, TRANSITION_INVALID, PRIORITY_ONE);
+                NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL, TransitionType::TRANSITION_INVALID, PRIORITY_ONE);
             }
         }
         CallerLogModel::GetInstance()->SetNotifyFlag(false);
@@ -458,7 +458,7 @@ static void ChangeStatusScreendisplay(int lastStatus)
     }
     // If the call is handling in the notification, the slice is not switched
     if (g_callOperate != OPERATE_PHONE_ACTIVE && CallerLogModel::GetInstance()->GetNotifyFlag() != true) {
-        NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL, TRANSITION_INVALID, PRIORITY_ONE);
+        NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL, TransitionType::TRANSITION_INVALID, PRIORITY_ONE);
     }
 }
 
@@ -581,7 +581,7 @@ static void ScoConnectHandle(void)
     }
     // If the call is handling in the notification, the slice is not switched
     if (CallerLogModel::GetInstance()->GetNotifyFlag() == false) {
-        NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL, TRANSITION_INVALID, PRIORITY_ONE);
+        NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL, TransitionType::TRANSITION_INVALID, PRIORITY_ONE);
     }
 }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothModel.h b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothModel.h
index 27573aa..070a985 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/include/ClassicBlueToothModel.h
@@ -2,7 +2,7 @@
 #define CLASSIC_BLUETOOTH_MODEL_H\r
 \r
 #include "wearable_log.h"\r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 namespace OHOS\r
 {\r
     class ClassicBlueToothModel\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
index e7012e0..e1d2e64 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
@@ -4,7 +4,7 @@
 #include <custom_utils.h>
 #include <ohos_types.h>
 #include "wearable_log.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include "iostream"
 #include "map"
 #include "classicbluetooth/include/BluetoothServiceOptionsPresenter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
index 6f9beb8..6dd5679 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsView.cpp
@@ -1,6 +1,6 @@
 #include "classicbluetooth/include/BluetoothServiceOptionsView.h"
 #include "classicbluetooth/include/BluetoothServiceOptionsPresenter.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include "UiConfig.h"
 #include "wearable_log.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
index 99e08fd..26c1839 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
@@ -13,7 +13,7 @@
 #include "common/key_code.h"\r
 #include <ohos_types.h>\r
 #include "wearable_log.h"\r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 namespace OHOS\r
 {\r
     // 当前Presenter属性实例化的内存指针\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp
index 84fbc45..16398d6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothView.cpp
@@ -1,6 +1,6 @@
 #include "classicbluetooth/include/ClassicBlueToothView.h"\r
 #include "classicbluetooth/include/ClassicBlueToothPresenter.h"\r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 #include "UiConfig.h"\r
 #include "uicomponents/UIComponents.h"\r
 namespace OHOS\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/dialupdate/include/DialUpdateModel.h b/code/sdk/application/wearable/fd230app/nativeui/dialupdate/include/DialUpdateModel.h
index e1dc61e..b5604e8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/dialupdate/include/DialUpdateModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/dialupdate/include/DialUpdateModel.h
@@ -1,7 +1,7 @@
 #ifndef DIALUPDATE_MODEL_H
 #define DIALUPDATE_MODEL_H
 
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include <string>
 
 #define MAX_DIALNUM 4

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h
index 06c5865..570346a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h
@@ -8,7 +8,7 @@
 #ifndef DISPLAY_BRIGHTNESS_MODEL_H_\r
 #define DISPLAY_BRIGHTNESS_MODEL_H_\r
 \r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 namespace OHOS\r
 {\r
     class DisplayBrightnessModel\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp
index 100d2fc..aace0d4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp
@@ -3,7 +3,7 @@
 #include "wearable_log.h"\r
 #include <custom_utils.h>\r
 #include "power_display_service.h"\r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 #include "map"\r
 #include "iostream"\r
 namespace OHOS\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp
index 6cf09d5..3784b82 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp
@@ -8,7 +8,7 @@
 #include "displaybrightness/include/DisplayBrightnessModel.h"
 #include "displaybrightness/include/DisplayBrightnessPresenter.h"
 #include "wearable_log.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
index 5d22d90..60f0dc2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
@@ -19,7 +19,7 @@
 #include <custom_utils.h>\r
 #include "map"\r
 #include "iostream"\r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 namespace OHOS\r
 {\r
     // 当前Presenter属性实例化的内存指针\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp
index d32cfff..d205e17 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp
@@ -1,7 +1,7 @@
 #include "displaybrightness/include/DisplayBrightnessView.h"\r
 #include "displaybrightness/include/DisplayBrightnessModel.h"\r
 #include "wearable_log.h"\r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 namespace OHOS\r
 {\r
     static DisplayBrightnessView *g_pDisplayBrightnessView{nullptr};\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbModel.cpp
index 480ebf5..b46c4bd 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbModel.cpp
@@ -6,7 +6,7 @@
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbModel.cpp
  */
 #include "dnotdisturb/include/DnotDisturbModel.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 namespace OHOS
 {
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/src/IndoorWalkPreparedView.cpp b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/src/IndoorWalkPreparedView.cpp
index 6f3efcd..4eff7a9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/src/IndoorWalkPreparedView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/indoorwalk/src/IndoorWalkPreparedView.cpp
@@ -135,7 +135,7 @@ bool IndoorWalkPreparedView::InitBatteryView() // 加载电量
         return false;\r
     }\r
     battery->SetPosition(BATTERY_X, BATTERY_Y);\r
-    ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, battery, DROPDOWN_DROPDOWN_BATTERY);\r
+    // ScreenModels::GetInstance()->LoadAppImages(DROPDOWN_IAMGES, battery, DROPDOWN_DROPDOWN_BATTERY);\r
     group->Add(battery);\r
 \r
     batteryLable = new UILabel();\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
index 684b0f9..726f171 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
@@ -26,7 +26,7 @@ namespace OHOS
     static bool IsCallingNotify()
     {
         uint16_t notifyId = NotificationManager::GetInstance()->GetShowingNotifyId();
-        if (NotificationManager::GetInstance()->hasNotifyShowing() == true &&
+        if (NotificationManager::GetInstance()->HasNotifyShowing() == true &&
             (notifyId == TOPIC_EVENT_HFP_INCOMMING ||
              notifyId == TOPIC_EVENT_HFP_WATCH_ACTIVE ||
              notifyId == TOPIC_EVENT_HFP_PHONE_TO_WATCH))
@@ -42,7 +42,7 @@ namespace OHOS
     static bool IsNotifyCallStatus()
     {
         uint16_t notifyId = NotificationManager::GetInstance()->GetShowingNotifyId();
-        if (NotificationManager::GetInstance()->hasNotifyShowing() == true &&
+        if (NotificationManager::GetInstance()->HasNotifyShowing() == true &&
             (notifyId == TOPIC_EVENT_HFP_WATCH_ACTIVE ||
              notifyId == TOPIC_EVENT_HFP_PHONE_TO_WATCH))
         {
@@ -57,7 +57,7 @@ namespace OHOS
     static void PressAlarmNotify()
     {
         uint16_t notifyId = NotificationManager::GetInstance()->GetShowingNotifyId();
-        if (NotificationManager::GetInstance()->hasNotifyShowing() == true && notifyId == TOPIC_EVENT_ALARM_RING)
+        if (NotificationManager::GetInstance()->HasNotifyShowing() == true && notifyId == TOPIC_EVENT_ALARM_RING)
         {
             AlarmClockModel::GetInstance()->AlarmGetClockNum();
             AlarmPopUpPresenter::GetInstance()->DelayAlarmRing();
@@ -141,7 +141,7 @@ void KeyInputListener::CallVolumeDipSwitchControl(VolumeChangeStatus status)
                     if (mcu_pms_is_screen_on())
                     {
                         PressAlarmNotify();
-                        NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN, TRANSITION_ZOOM);
+                        NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN, TransitionType::TRANSITION_ZOOM);
                     }
                 }
                 else // 如果当前页面是主表盘：
@@ -155,7 +155,7 @@ void KeyInputListener::CallVolumeDipSwitchControl(VolumeChangeStatus status)
                         }
                         else
                         {
-                            NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST, TRANSITION_ZOOM);
+                            NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST, TransitionType::TRANSITION_ZOOM);
                         }
                     }
                 }
@@ -176,7 +176,7 @@ void KeyInputListener::CallVolumeDipSwitchControl(VolumeChangeStatus status)
                     if (mcu_pms_is_screen_on())
                     {
                         PressAlarmNotify();
-                        NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN, TRANSITION_ZOOM);
+                        NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN, TransitionType::TRANSITION_ZOOM);
                     }
                 }
                 else // 如果当前页面是主表盘,如果屏幕亮起，则先处理闹钟通知再切换到用户配置的快捷卡片
@@ -186,12 +186,12 @@ void KeyInputListener::CallVolumeDipSwitchControl(VolumeChangeStatus status)
                         PressAlarmNotify(); // 当前为闹钟通知页面时，先处理闹钟再切换页面
                         if (SecondaryFunctionModel::GetInstance()->GetHeartRateOrBloodOxygenQuickAccessSwitch() == true)
                         {
-                            NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST, TRANSITION_ZOOM);
+                            NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST, TransitionType::TRANSITION_ZOOM);
                         }
                         else
                         {
                             // 之后需要将VIEW_APPLIST改成心率的SliceID
-                            NativeAbility::GetInstance().ChangeSlice(VIEW_BLOODOXY, TRANSITION_ZOOM);
+                            NativeAbility::GetInstance().ChangeSlice(VIEW_BLOODOXY, TransitionType::TRANSITION_ZOOM);
                         }
                     }
                 }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp b/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp
index af8a619..ef8fb9c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp
@@ -13,7 +13,7 @@
 #include "font/font_global_manager.h"
 #include "wearable_log.h"
 #include "language/LanguageInit.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include <NativeAbility.h>
 
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchModel.cpp
index d0090b6..9729f76 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchModel.cpp
@@ -8,7 +8,7 @@
 #include "language/include/LanguageSwitchModel.h"
 #include "wearable_log.h"
 #include "language/LanguageInit.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 namespace OHOS
 {
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
index daa3e73..7ece8f9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainViewSample.h
@@ -34,7 +34,7 @@
 #include "SetCardModel.h"
 #include "heart_blood/include/BloodCardView.h"
 #include "traing/training_card/include/Training_CardView.h"
-#include "ApplistCardView.h"
+// #include "ApplistCardView.h"
 #include "weather/include/WeatherControlView.h"
 #include "message/include/MessageCardView.h"
 namespace OHOS
@@ -104,7 +104,7 @@ namespace OHOS
         BloodCardView *bloodView{nullptr};
         WeatherControlView *weatherControlView{nullptr};
         Training_CardView *traingView{nullptr};
-        ApplistCardView *applistCardView{nullptr};
+        // ApplistCardView *applistCardView{nullptr};
         UIButton *changebut{nullptr};
         UIImageView *disturbIcon{nullptr}; // 勿扰图标
         /* -------------------------------------------------------------------------- */

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHeartRate.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHeartRate.h
index 3c3f8b9..51fd884 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHeartRate.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHeartRate.h
@@ -10,18 +10,21 @@
 
 #include "DialBaseModel.h"
 
-namespace OHOS {
-class DialModelHeartRate : public DialBaseModel {
-public:
-    DialModelHeartRate() {}
-    ~DialModelHeartRate() override {}
-    static DialModelHeartRate* GetInstance()
+namespace OHOS
+{
+    class DialModelHeartRate : public DialBaseModel
     {
-        static DialModelHeartRate instance;
-        return &instance;
-    }
-    bool GetDialFloatData(DialDataType& type, float& out) override;
-    void UpdateHeartRate(int16_t heartRate);
+    public:
+        DialModelHeartRate() {}
+        ~DialModelHeartRate() override {}
+        static DialModelHeartRate *GetInstance()
+        {
+            static DialModelHeartRate instance;
+            return &instance;
+        }
+        bool GetDialFloatData(DialDataType &type, float &out) override;
+        void UpdateHeartRate(int16_t heartRate);
+        int GetHeartData();
 
     private:
         float heartRate_ = 0; // 67.0: default heart value as reference

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPower.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPower.h
index ed9f7f0..67ad319 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPower.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelPower.h
@@ -16,7 +16,7 @@
 
 #include "DialBaseModel.h"
 
-namespace OHOS {
+namespace OHOS 
 {
     class DialModelPower : public DialBaseModel
     {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelTime.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelTime.h
index 7da252b..2f36c40 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelTime.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelTime.h
@@ -24,7 +24,7 @@ public:
     void UpdateTime();
 
 private:
-    struct tm *tblock_;
+    struct tm tblock_;
     uint16_t angleH_ = 0;
     uint16_t angleM_ = 0;
     uint16_t angleS_ = 0;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
index 38b74f7..8cbab9f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -36,7 +36,7 @@
 namespace OHOS
 {
 
-    map<string, AppViewId> g_jumpView = {
+    std:: map<std::string, AppViewId> g_jumpView = {
         {DROPDOWN_CLICK_SETTING, VIEW_SETTING},            // 设置
         {DROPDOWN_CLICK_LIGHTING, VIEW_CLASSIC_BLUETOOTH}, // 蓝牙
         {DROPDOWN_CLICK_DNOTDISTURB, VIEW_DNOTDISTURB},    // 勿扰
@@ -106,7 +106,7 @@ namespace OHOS
     {
         UNUSED(event);
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "StatusButtonClickListener: %s", view.GetViewId());
-        string curViewId = view.GetViewId();
+        std::string curViewId = view.GetViewId();
 
         UIImageView *imgView = static_cast<UIImageView *>(&view);
         if (HealthModel::GetInstance() == nullptr)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
index 298289e..5590ae7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
@@ -132,11 +132,11 @@ namespace OHOS
             delete traingView;
             traingView = nullptr;
         }
-        if (applistCardView != nullptr)
-        {
-            delete applistCardView;
-            applistCardView = nullptr;
-        }
+        // if (applistCardView != nullptr)
+        // {
+        //     delete applistCardView;
+        //     applistCardView = nullptr;
+        // }
         if (mainSwipeGroup != nullptr)
         {
             delete mainSwipeGroup;
@@ -329,7 +329,7 @@ namespace OHOS
         RootView::GetInstance()->RemoveAll();
         return;
     }
-    UICardPage *MainViewSample::InitWathOffDial(DialSetting &setting)
+UICardPage *MainViewSample::InitWatchOffDial(DialSetting &setting)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitWathOffDial");
         DialViewGroup *dial = new DialViewGroup();
@@ -337,7 +337,7 @@ namespace OHOS
         // dial->SetDial(DEFAULT_DIAL_PATH);
         return dial;
     }
-    UICardPage *MainViewSample::InitWathDial(DialSetting &setting)
+UICardPage *MainViewSample::InitWatchDial(DialSetting &setting)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainViewSample::InitWathDial");
         switch (setting.dialId)
@@ -357,11 +357,11 @@ namespace OHOS
         DialSetting &setting = presenter_->GetDialSetting();
         if (setting.dialFlag)
         {
-            mainClockView = InitWathOffDial(setting);
+            mainClockView = InitWatchOffDial(setting);
         }
         else
         {
-            mainClockView = InitWathDial(setting);
+            mainClockView = InitWatchDial(setting);
         }
         if (mainClockView == nullptr)
         {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/makephone/src/MainCallingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/makephone/src/MainCallingPresenter.cpp
index 6c85f80..1f8a2e7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/makephone/src/MainCallingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/makephone/src/MainCallingPresenter.cpp
@@ -174,7 +174,7 @@ bool MainCallingPresenter::HintsHandupClick()
     }
     CallerLogModel::GetInstance()->SetWaitingStatus(false);
     CallerLogModel::GetInstance()->SetCallStatus(true);
-    NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL, PRIORITY_ONE);
+    NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL, TransitionType::TRANSITION_ZOOM ,PRIORITY_ONE);
     return true;
 }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp
index ae0e817..46cf3c7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp
@@ -11,7 +11,7 @@
 #include "motionrecognition/include/MotionRecognitionView.h"
 #include "common/key_code.h"
 #include <custom_utils.h>
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp
index 1aa165a..a618084 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp
@@ -8,7 +8,7 @@
 #include "motionrecognition/include/MotionRecognitionPresenter.h"
 #include "motionrecognition/include/MotionRecognitionView.h"
 #include "wearable_log.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 namespace OHOS
 {
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
index 8553ced..de9e89f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
@@ -14,7 +14,7 @@
 #include "map"
 #include "functional"
 #include "iostream"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include "networkandcall/include/NetworkAndCallC.h"
 #include "cat1_ctl.h"
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp
index a04cc01..c2d8214 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp
@@ -2,7 +2,7 @@
 #include "networkandcall/include/NetworkAndCallView.h"
 #include "wearable_log.h"
 #include "UiConfig.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include "cat1_ctl.h"
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testabout.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testabout.cpp
index 898ed3b..b81514d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testabout.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testabout.cpp
@@ -2,7 +2,7 @@
 #include "custom_utils.h"
 #include "producttest/include/testPresenter.h"
 #include "producttest/include/testabout.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 
 
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testluminance.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testluminance.cpp
index d4df051..e47fbe4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testluminance.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testluminance.cpp
@@ -2,7 +2,7 @@
 #include "custom_utils.h"
 #include "producttest/include/testPresenter.h"
 #include "producttest/include/testluminance.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include "cmsis_os2.h"
 
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootView.h b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootView.h
index 309a62a..9898ebd 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/RebootView.h
@@ -18,7 +18,7 @@
 #include "components/ui_label_ext.h"
 #include "components/ui_button.h"
 #include "components/ui_image_animator.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 namespace OHOS {
 constexpr int16_t NUM_REBOOT_CONTAINER = 4;
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/SecondaryFunctionModel.h b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/SecondaryFunctionModel.h
index 1bcb732..c0f5ea3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/SecondaryFunctionModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/include/SecondaryFunctionModel.h
@@ -1,7 +1,7 @@
 #ifndef SECONDARY_FUNCTION_MODEL_H
 #define SECONDARY_FUNCTION_MODEL_H
 
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 namespace OHOS
 {
     class SecondaryFunctionModel

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumeView.cpp
index ac099d0..7c657dd 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumeView.cpp
@@ -4,7 +4,7 @@
 #include <audio_manager.h>\r
 #include "phoneservice/include/PhoneAudio.h"\r
 #include "phoneservice/include/PhoneService.h"\r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 namespace OHOS\r
 {\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationModel.cpp
index 05ee085..30746d3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationModel.cpp
@@ -8,7 +8,7 @@
 #include "soundandvibration/include/SoundAndVibrationModel.h"
 #include "soundandvibration/include/SoundAndVibrationPresenter.h"
 #include "wearable_log.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 namespace OHOS
 {
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
index d2a3eab..d238381 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
@@ -15,7 +15,7 @@
 #include "soundandvibration/include/SoundAndVibrationPresenter.h"\r
 #include "common/key_code.h"\r
 #include "custom_utils.h"\r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 #include <ohos_types.h>\r
 #include "soundandvibration/include/SoundAndVibrationVolumeSettingC.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp
index cbca798..bfd70a1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingPresenter.cpp
@@ -14,7 +14,7 @@
 #include "phoneservice/include/PhoneService.h"
 #include "../../../../../../middleware/services/media/foundation/audiomanager/frameworks/audioservice/include/audio_service.h"
 #include "vibrator_service.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp
index c759049..d0bd5b7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationVolumeSettingView.cpp
@@ -1,7 +1,7 @@
 #include "soundandvibration/include/SoundAndVibrationVolumeSettingView.h"
 #include "soundandvibration/include/SoundAndVibrationVolumeSettingPresenter.h"
 #include "wearable_log.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 namespace OHOS
 {
     static SoundAndVibrationVolumeSettingView *g_pSoundAndVibrationVolumeSettingView{nullptr};

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumeView.cpp
index 5b1a02f..f34c875 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumeView.cpp
@@ -2,7 +2,7 @@
 #include "soundandvibration/include/SystemVolumePresenter.h"\r
 #include "wearable_log.h"\r
 #include <audio_manager.h>\r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 /*\r
 系统音量：\r
 通话，提醒，查找手表的音量\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp
index e1bcde6..107a5c7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/VibrationModeView.cpp
@@ -8,7 +8,7 @@
 #include "soundandvibration/include/VibrationModeView.h"
 #include "soundandvibration/include/SoundAndVibrationPresenter.h"
 #include "wearable_log.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
index 50964aa..50b806a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp
@@ -2,7 +2,7 @@
 #include "system/include/SystemPresenter.h"\r
 #include "wearable_log.h"\r
 #include "custom_utils.h"\r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 \r
 #define WATCH_ABOUT_TITLE_HEIGHT 50\r
 #define WATCH_ABOUT_VALUE_HEIGHT 80\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp
index 908a359..dd49248 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemModel.cpp
@@ -8,7 +8,7 @@
 #include <iostream>
 #include <fstream>
 #include "cJSON.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include "lwip/err.h"
 #include "power_display_service.h"
 #include "cmsis_os2.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
index 26cd71e..88991f0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
@@ -13,7 +13,7 @@
 #include "custom_utils.h"\r
 #include "language/LanguageInit.h"\r
 #include "language/font/ui_resource_string.h"\r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 namespace OHOS\r
 {\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp
index 4a5693b..857b2c2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <fstream>
 #include "cJSON.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include "lwip/err.h"
 #include "power_display_service.h"
 #include "cmsis_os2.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp
index 3c0c316..4e10ead 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp
@@ -12,7 +12,7 @@
 #include "custom_utils.h"
 #include "stdio.h"
 #include "cJSON.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include "lwip/err.h"
 #include "power_display_service.h"
 #include "cmsis_os2.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp
index 0262dde..0f7096e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp
@@ -10,7 +10,7 @@
 #include "systemupdate/include/SystemUpdateView.h"
 #include "wearable_log.h"
 #include "language/font/ui_resource_string.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include "systemupdate/include/SystemUpdateModel.h"
 #include "UiConfig.h"
 #include "custom_utils.h"
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <fstream>
 #include "cJSON.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include "lwip/err.h"
 #include "power_display_service.h"
 #include "cmsis_os2.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
index 93f71dc..9414602 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -23,7 +23,7 @@
 #include "broadcast_feature.h"
 #include "broadcast_service.h"
 #include "bletest.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include "samgr_lite.h"
 #include "vibrator_service.h"
 #include <mutex>

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
index 86394b3..adbcc07 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
@@ -17,7 +17,7 @@
 #include "traing/training_card/include/TrainingControlView.h"\r
 #include "traing/include/TraingModel.h"\r
 #include "uicomponents/UIComponents.h"\r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 #include "custom_utils.h"\r
 #include "vibrator_service.h"\r
 #include <iomanip>\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
index b320479..e1b5e41 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
@@ -16,7 +16,7 @@
 \r
 #include "traing/include/TraingModel.h"\r
 #include "uicomponents/UIComponents.h"\r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 #include "custom_utils.h"\r
 \r
 extern "C"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherReportView.h b/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherReportView.h
index 295fe46..f8b5bc5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherReportView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherReportView.h
@@ -16,7 +16,7 @@
 #include "components/ui_label_ext.h"\r
 #include "language/font/ui_resource_string.h"\r
 #include "components/ui_image_animator.h"\r
-#include "config/include/ConfigModel.h"\r
+#include "ConfigModel.h"\r
 namespace OHOS\r
 {\r
     class WeatherReportView : public AppGroupView\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp
index 243837e..b3c01d0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp
@@ -1,5 +1,5 @@
 #include "weather/include/WeatherView.h"
-#include "config/include/ConfigModel.h"
+#include "ConfigModel.h"
 #include "weather/include/WeatherModel.h"
 #include "common/image_cache_manager.h"
 /*

diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index 2d7e15f..f252e73 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@ -315,7 +315,7 @@ void MsgCenterNotifyLowPowerAlarmProc(const Topic topic, Request* req)
     {
         //提醒低电充电
         set_lowpower_falg(0);
-        if (NotificationManager::GetInstance()->hasNotifyShowing())
+        if (NotificationManager::GetInstance()->HasNotifyShowing())
             NotificationManager::GetInstance()->StopNotify();
         NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_TWO);
         NotificationManager::GetInstance()->ShowNotify(showlowpowerNotify, (uint16_t)topic, true);
@@ -324,7 +324,7 @@ void MsgCenterNotifyLowPowerAlarmProc(const Topic topic, Request* req)
     {
         //电量过低,直接提醒关机
         set_lowpower_falg(1);
-        if (NotificationManager::GetInstance()->hasNotifyShowing())
+        if (NotificationManager::GetInstance()->HasNotifyShowing())
             NotificationManager::GetInstance()->StopNotify();
         NotificationManager::GetInstance()->SetNotifyPriority(PRIORITY_TWO);
         NotificationManager::GetInstance()->ShowNotify(showlowpowerNotify, (uint16_t)topic, true);

diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp
index a7c9f3f..a68a205 100755 (executable)
--- a/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/makephone_notification.cpp
@@ -596,7 +596,7 @@ static bool DrawPhoneCallViewLabel(void)
     const char *number=CallerLogModel::GetInstance()->GetPhoneNumber().c_str();
     char name[32]={0};
     #ifdef FD230
-    OHOS::get_phone_addrss_name(name,number);
+    get_phone_addrss_name(name,number);
     #endif
     callername->SetText(name);
     callername->SetAlign(TEXT_ALIGNMENT_CENTER);