修复n9 编译

diff --git a/code/sdk/application/wearable/CMakeLists.txt b/code/sdk/application/wearable/CMakeLists.txt
index d16f2a3..54d668e 100644 (file)
--- a/code/sdk/application/wearable/CMakeLists.txt
+++ b/code/sdk/application/wearable/CMakeLists.txt
@@ -2,7 +2,7 @@
 # @brief    cmake make file
 # Copyright (c) @CompanyNameMagicTag 2022-2022. All rights reserved.
 #===============================================================================
-if("FD230" IN_LIST DEFINES)
+if("BOARD_FD230" IN_LIST DEFINES)
 add_subdirectory_if_exist(fd230)
 elseif("BOARD_N9" IN_LIST DEFINES)
 add_subdirectory_if_exist(n9)

diff --git a/code/sdk/application/wearable/n9/nativeapp/CMakeLists.txt b/code/sdk/application/wearable/n9/nativeapp/CMakeLists.txt
index 172bcd8..b1c679f 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/CMakeLists.txt
+++ b/code/sdk/application/wearable/n9/nativeapp/CMakeLists.txt
@@ -8,8 +8,8 @@ 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/
-    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/include
+    ${ROOT_DIR}/application/wearable/n9/nativeapp/nativeui/
+    ${ROOT_DIR}/application/wearable/n9/nativeapp/nativeui/include
 )
 
 set(PRIVATE_HEADER
@@ -46,7 +46,7 @@ set(PRIVATE_HEADER
 
     ${ROOT_DIR}/middleware/services/media/foundation/sample/wrapper
     ${ROOT_DIR}/application/wearable/service/msg_center/include
-    ${ROOT_DIR}/application/wearable/fd230/nativeabilityfwk/include
+    ${ROOT_DIR}/application/wearable/n9/nativeabilityfwk/include
     ${ROOT_DIR}/application/wearable/service/device_msg
     ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/audio_player/interfaces/kits
     ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/audiomanager/interfaces/kits/audiomanager
@@ -194,7 +194,7 @@ set(PRIVATE_DEFINES
 build_component()
 
 set(COMPONENT_NAME "uikit_fwk")
-set(UIKIT_NATIVE_FWK ${ROOT_DIR}/application/wearable/fd230/nativeabilityfwk)
+set(UIKIT_NATIVE_FWK ${ROOT_DIR}/application/wearable/n9/nativeabilityfwk)
 set(UIKIT_NATIVE_DIAL ${NativeApp}/nativeui/main)
 set(COMPONENT_SRC
     ${UIKIT_NATIVE_FWK}/src/View.cpp

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadModel.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadModel.cpp
index 3da91e2..5ecf495 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadModel.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadModel.cpp
@@ -18,7 +18,6 @@ EphemerisDownloadModel::EphemerisDownloadModel() {}
 
 EphemerisDownloadModel::~EphemerisDownloadModel() {}
 
-void EphemerisDownloadModel::DownloadEphemeris() {}
 //获取有效期接口
 bool EphemerisDownloadModel::GetValidityPeriod() {
 #if defined(SUPPORT_GNSS)

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadView.cpp
index 96e0bd4..fb9e6a3 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadView.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/ephemeris_download/src/EphemerisDownloadView.cpp
@@ -118,13 +118,13 @@ bool EphemerisDownloadView::EphemerisDownloadInit() {
     //如果有效期大于0，则不能下载 下载按键显示灰色；否则显示绿色
     if(EphemerisDownloadModel::GetInstance().GetValidityPeriod())
     {
-        btnDownload_->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x5f));
-        btnDownload_->SetBackgroundColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x5f));
+        // btnDownload_->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x5f));
+        // btnDownload_->SetBackgroundColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x5f));
     }
     else
     {
-        btnDownload_->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));
-        btnDownload_->SetBackgroundColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));
+        // btnDownload_->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));
+        // btnDownload_->SetBackgroundColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff));
     }
     
     AddViewToRootContainer(btnDownload_);

diff --git a/code/sdk/application/wearable/n9/service/dial_market/CMakeLists.txt b/code/sdk/application/wearable/n9/service/dial_market/CMakeLists.txt
index c65e5bc..043334e 100644 (file)
--- a/code/sdk/application/wearable/n9/service/dial_market/CMakeLists.txt
+++ b/code/sdk/application/wearable/n9/service/dial_market/CMakeLists.txt
@@ -11,7 +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/
+    ${ROOT_DIR}/application/wearable/n9/nativeapp/nativeui/main/include/
 )
 
 set(SOURCES

diff --git a/code/sdk/application/wearable/n9/service/msg_center/CMakeLists.txt b/code/sdk/application/wearable/n9/service/msg_center/CMakeLists.txt
index 5b4f73d..24f5bec 100644 (file)
--- a/code/sdk/application/wearable/n9/service/msg_center/CMakeLists.txt
+++ b/code/sdk/application/wearable/n9/service/msg_center/CMakeLists.txt
@@ -148,7 +148,7 @@ set(PRIVATE_HEADER
     ${ROOT_DIR}/application/wearable/nativeapp/nativeui/player/include
     ${ROOT_DIR}/application/wearable/nativeapp/nativeui/applist/include
     ${ROOT_DIR}/open_source/openharmony/foundation/multimedia/player/interfaces/kits
-    ${ROOT_DIR}/application/wearable/fd230/nativeapp/nativeui/
+    ${ROOT_DIR}/application/wearable/n9/nativeapp/nativeui/
 
     ${ROOT_DIR}/zhihui/drivers
     ${ROOT_DIR}/zhihui/services