修复FD230启动问题

diff --git a/code/sdk/application/wearable/fd230/CustomUIComponentTool/CMakeLists.txt b/code/sdk/application/wearable/fd230/CustomUIComponentTool/CMakeLists.txt
index 27b7ba6..54abeae 100644 (file)
--- a/code/sdk/application/wearable/fd230/CustomUIComponentTool/CMakeLists.txt
+++ b/code/sdk/application/wearable/fd230/CustomUIComponentTool/CMakeLists.txt
@@ -67,7 +67,7 @@ set(PRIVATE_HEADER
     ${ROOT_DIR}/open_source/openharmony/utils/native/lite/include
     ${ROOT_DIR}/open_source/openharmony/utils/native/lite/kv_store/innerkits
 )
-if("FD230" IN_LIST DEFINES)
+
 set(PRIVATE_HEADER
     ${PRIVATE_HEADER}
     ${ROOT_DIR}/application/wearable/fd230/nativeabilityfwk/include
@@ -77,17 +77,7 @@ set(PRIVATE_HEADER
     ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/themestyle/include
     ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/applist/include/
 )
-else()
-set(PRIVATE_HEADER
-    ${PRIVATE_HEADER}
-    ${ROOT_DIR}/application/wearable/nativeabilityfwk/include
-    ${ROOT_DIR}/application/wearable/nativeapp/nativelauncher/include
-    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/
-    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/themestyle
-    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/themestyle/include
-    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/applist/include/
-)
-endif()
+
 set(SOURCES
     #UI组件初始化
     ${CMAKE_CURRENT_SOURCE_DIR}/uicomponents/UIComponents.cpp

diff --git a/code/sdk/application/wearable/fd230/CustomUIComponentTool/uicomponents/UIComponents.cpp b/code/sdk/application/wearable/fd230/CustomUIComponentTool/uicomponents/UIComponents.cpp
index b2313a5..1666e2b 100644 (file)
--- a/code/sdk/application/wearable/fd230/CustomUIComponentTool/uicomponents/UIComponents.cpp
+++ b/code/sdk/application/wearable/fd230/CustomUIComponentTool/uicomponents/UIComponents.cpp
@@ -178,7 +178,6 @@ bool InitLabelAdapt(UILabelExt *&label, int left, int top, int width,
   label->SetRollSpeed(0);
   return true;
 }
-#ifdef FD230
 /***
  * @description:
  * @param {UILabelExt} *
@@ -376,7 +375,7 @@ void SetLabelId(UILabel *&label, UIResourceTextId id) {
 
   delete labelext;
 }
-#endif
+
 /***
  * @description:
  * @param {UIButton} *

diff --git a/code/sdk/application/wearable/fd230/CustomUIComponentTool/uicomponents/UIComponents.h b/code/sdk/application/wearable/fd230/CustomUIComponentTool/uicomponents/UIComponents.h
index 6c232ac..78a0827 100644 (file)
--- a/code/sdk/application/wearable/fd230/CustomUIComponentTool/uicomponents/UIComponents.h
+++ b/code/sdk/application/wearable/fd230/CustomUIComponentTool/uicomponents/UIComponents.h
@@ -24,10 +24,8 @@
 #include "ohos_types.h"
 #include "common/image_cache_manager.h"
 
-#ifdef FD230
 #include "traing/include/TraingModel.h"
 #include "ui_resource_string.h"
-#endif
 
 namespace OHOS
 {
@@ -240,7 +238,6 @@ namespace OHOS
      */
     void ReleaseImageAnimatorSource(ImageAnimatorInfo *&imageAnimatorInfo, int numFrames);
 
-#ifdef FD230
     // 扩展功能
     // =======================
     /**
@@ -309,7 +306,6 @@ namespace OHOS
 
     bool IsFileAccessibleAndNotEmpty(const std::string& filePath);
 
-#endif
 
 } // namespace OHOS
 

diff --git a/code/sdk/application/wearable/fd230/nativeabilityfwk/CMakeLists.txt b/code/sdk/application/wearable/fd230/nativeabilityfwk/CMakeLists.txt
index 8021a2d..e50667e 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeabilityfwk/CMakeLists.txt
+++ b/code/sdk/application/wearable/fd230/nativeabilityfwk/CMakeLists.txt
@@ -21,7 +21,6 @@ set(PRIVATE_HEADER
     ${ROOT_DIR}/middleware/services/gui/uikit/ui/frameworks
     ${ROOT_DIR}/open_source/openharmony/drivers/peripheral/display/interfaces/include
 )
-if("FD230" IN_LIST DEFINES)
 set(PRIVATE_HEADER
     ${PRIVATE_HEADER}
     ${ROOT_DIR}/application/wearable/fd230/nativeabilityfwk/include
@@ -31,15 +30,6 @@ set(PRIVATE_HEADER
     ${ROOT_DIR}/application/wearable/fd230/service/msg_center/include
     ${ROOT_DIR}/application/wearable/fd230/service/msg_center/include/notify
 )
-else()
-set(PRIVATE_HEADER
-    ${PRIVATE_HEADER}
-    ${ROOT_DIR}/application/wearable/nativeabilityfwk/include
-    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/applist/include/
-    ${ROOT_DIR}/application/wearable/nativeapp/nativelauncher/include/
-    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/themestyle/include
-)
-endif()
 
 set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/BaseView.cpp

diff --git a/code/sdk/application/wearable/fd230/nativeabilityfwk/src/Ability.cpp b/code/sdk/application/wearable/fd230/nativeabilityfwk/src/Ability.cpp
index 7b5ace8..2393926 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeabilityfwk/src/Ability.cpp
+++ b/code/sdk/application/wearable/fd230/nativeabilityfwk/src/Ability.cpp
@@ -137,7 +137,6 @@ namespace OHOS
         {
             ClearSliceIdStack(); /*凡是回到主界面都要清空栈*/
         }
-#ifdef FD230
         if (targetSliceId == VIEW_INCOMING_CALL)
         {
            uint16_t id=GetCurSliceId();
@@ -149,7 +148,6 @@ namespace OHOS
             if(id!=VIEW_INCOMING_CALL && id!=VIEW_BLUETOOTH_EARPHONE)
             make_phone_push(id);
         }
-#endif
         // showsStackSliceId();
         /*
             if (GetCurSliceId() == targetSliceId) {
@@ -325,12 +323,8 @@ namespace OHOS
             uint16_t preSlice = backStack_.top();
             backStack_.pop();
 
-            #ifdef FD230
             if(preSlice!=VIEW_INCOMING_CALL)
-            ChangeSlice(preSlice,transitionId,priority);
-            else
-            ChangeSlice(defaultSliceId_, transitionId, priority);
-            #endif
+                ChangeSlice(preSlice,transitionId,priority);
             return true;
         }
         else

diff --git a/code/sdk/application/wearable/fd230/service/power_manager/CMakeLists.txt b/code/sdk/application/wearable/fd230/service/power_manager/CMakeLists.txt
index 05fba04..bf948f1 100644 (file)
--- a/code/sdk/application/wearable/fd230/service/power_manager/CMakeLists.txt
+++ b/code/sdk/application/wearable/fd230/service/power_manager/CMakeLists.txt
@@ -8,21 +8,12 @@ set(PUBLIC_HEADER
 set(PRIVATE_HEADER
 )
 
-if("FD230" IN_LIST DEFINES)
 set(PRIVATE_HEADER
     ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${ROOT_DIR}/application/wearable/fd230/nativeabilityfwk/include
     ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui
     ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/screennotify/include
 )
-else()
-set(PRIVATE_HEADER
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${ROOT_DIR}/application/wearable/nativeabilityfwk/include
-    ${ROOT_DIR}/application/wearable/nativeapp/nativeui
-    ${ROOT_DIR}/application/wearable/nativeapp/nativeui/screennotify/include
-)
-endif()
 
 set(SOURCES
 ${CMAKE_CURRENT_SOURCE_DIR}/src/display_state_machine.c

diff --git a/code/sdk/application/wearable/service/power_manager/CMakeLists.txt b/code/sdk/application/wearable/service/power_manager/CMakeLists.txt
index 05fba04..37038f9 100644 (file)
--- a/code/sdk/application/wearable/service/power_manager/CMakeLists.txt
+++ b/code/sdk/application/wearable/service/power_manager/CMakeLists.txt
@@ -8,21 +8,12 @@ set(PUBLIC_HEADER
 set(PRIVATE_HEADER
 )
 
-if("FD230" IN_LIST DEFINES)
-set(PRIVATE_HEADER
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${ROOT_DIR}/application/wearable/fd230/nativeabilityfwk/include
-    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui
-    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/screennotify/include
-)
-else()
 set(PRIVATE_HEADER
     ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${ROOT_DIR}/application/wearable/nativeabilityfwk/include
     ${ROOT_DIR}/application/wearable/nativeapp/nativeui
     ${ROOT_DIR}/application/wearable/nativeapp/nativeui/screennotify/include
 )
-endif()
 
 set(SOURCES
 ${CMAKE_CURRENT_SOURCE_DIR}/src/display_state_machine.c

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index a247991..84c680d 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -361,6 +361,7 @@ target = {
             'SUPPORT_AUTO_OTA_SERVER', 
             'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
             'TPTYPE_FT6X46',
+            'ROTARYENCODER_HX3507',
             'NANDFLASH_DS35X'
         ],
         #添加自定义应用

diff --git a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/CMakeLists.txt b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/CMakeLists.txt
index 766079f..6f555b0 100644 (file)
--- a/code/sdk/middleware/services/gui/uikit/proprietary/src/service/CMakeLists.txt
+++ b/code/sdk/middleware/services/gui/uikit/proprietary/src/service/CMakeLists.txt
@@ -44,7 +44,6 @@ set(PRIVATE_HEADER
 else()
 set(PRIVATE_HEADER
     ${PRIVATE_HEADER}
-    ${ROOTDIR}/application/wearable/fd230/CustomUIComponentTool/uicomponents
     ${ROOTDIR}/application/wearable/nativeapp/nativeui
     ${ROOTDIR}/application/wearable/nativeapp/nativelauncher/include
     ${ROOTDIR}/application/wearable/nativeapp/nativeui/screennotify/include