修改msg_center CMake文件

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h
index d972dfa..0bcbac2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h
@@ -30,7 +30,7 @@
 #include "AlarmClockModel.h"\r
 #include "wearable_log.h"\r
 #include "color.h"\r
-#include "KeyInputListener.h"\r
+// #include "KeyInputListener.h"\r
 #include "common/key_code.h"\r
 \r
 namespace OHOS {\r

diff --git a/code/sdk/application/wearable/service/msg_center/CMakeLists.txt b/code/sdk/application/wearable/service/msg_center/CMakeLists.txt
index 19029a0..7d580d3 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/CMakeLists.txt
+++ b/code/sdk/application/wearable/service/msg_center/CMakeLists.txt
@@ -119,21 +119,22 @@ set(PUBLIC_HEADER
     ${CMAKE_CURRENT_SOURCE_DIR}/include/vendor_app
     ${CMAKE_CURRENT_SOURCE_DIR}/include/ota
 )
+if("FD230" IN_LIST DEFINES)
 
 set(PRIVATE_HEADER
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/callerlog/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarmclockmanage/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarmclocktimerconfig/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarm/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/alarmclockmanage/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/alarmclocktimerconfig/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/alarm/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/system/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/sleep/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/producttest/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/phone/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/config/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/callerlog/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/callerlog/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/phoneservice/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/phoneservice/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/main/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/phoneservice/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/main/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/main/include/dial
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/bloodoxygen/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/heartrate/include
@@ -142,10 +143,45 @@ set(PRIVATE_HEADER
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/rtcservice/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/saveele/include/
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/uiservice/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/player/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/bluetooth/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/player/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/bluetooth/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativelauncher/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativeui/goal/include
+    # ${CMAKE_CURRENT_SOURCE_DIR}/../../fd230app/nativelauncher/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../ohos_deps
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../CustomUIComponentTool/uicomponents/
+    ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/include
+    ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/src/utils/innerkits
+    ${ROOT_DIR}/middleware/services/gui/uikit/ui/interfaces/innerkits
+    ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/innerkits
+    ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/kits
+    ${ROOT_DIR}/middleware/services/gui/uikit/utils/interfaces/kits/gfx_utils
+    ${ROOT_DIR}/middleware/services/gui/uikit/surface/interfaces/kits
+    ${ROOT_DIR}/middleware/services/gui/uikit/ui/frameworks
+    ${ROOT_DIR}/middleware/services/gui/uikit/proprietary/src/ui/frameworks/components_ext
+    ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/audio_player/interfaces/kits
+    ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/audiomanager/interfaces/kits/audiomanager
+    ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/audiomanager/interfaces/kits/audiocommon
+    ${ROOT_DIR}/open_source/openharmony/drivers/peripheral/display/interfaces/include
+    ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/player/interfaces/kits/
+    ${ROOT_DIR}/open_source/openharmony/foundation/ace/ace_engine_lite/modules/baidumapcomponent
+    ${ROOT_DIR}/middleware/utils/fs/include/fs
+    ${ROOT_DIR}/include/middleware/services/bts/br
+    ${ROOT_DIR}/include/middleware/services/bts/common
+    ${ROOT_DIR}/application/auto_ota
+)
+else()
+
+set(PRIVATE_HEADER
+
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarmclockmanage/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarmclocktimerconfig/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/alarm/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/callerlog/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/phoneservice/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/main/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/player/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativeui/bluetooth/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../nativeapp/nativelauncher/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../ohos_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/../../CustomUIComponentTool/uicomponents/
@@ -170,6 +206,7 @@ set(PRIVATE_HEADER
     ${ROOT_DIR}/application/auto_ota
 )
 
+endif()
 if("JS_ENABLE" IN_LIST DEFINES)
 set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/msg_center_customer.cpp