修复setdial编译问题

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialModel.h
index d7d55a7..9e993c3 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialModel.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/set_dial/include/SetDialModel.h
@@ -4,19 +4,6 @@
 #include "AppViewIDs.h"
 #include "SetDialInfo.h"
 
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-void ble_dial_init(void);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
 namespace OHOS
 {
     // 表盘类型
@@ -25,8 +12,6 @@ namespace OHOS
         DEFULTDIAL,
         DOWNLOADDIAL,
     };
-
-   
     typedef struct DialLayout_
     {
         uint16_t dialId;
@@ -36,12 +21,21 @@ namespace OHOS
     }DialLayout;
 
     // 定义特殊Id
+    #ifdef BOARD_N9
+    constexpr uint16_t DEFAULT_DIAL_ID = 167;
+    constexpr uint16_t DEFAULT_DIAL_ID_0 = 1028;
+    constexpr uint16_t DEFAULT_DIAL_ID_1 = 137;
+    constexpr uint16_t DEFAULT_DIAL_ID_2 = 128;
+    constexpr uint16_t DEFAULT_DIAL_ID_3 = 185;
+    constexpr uint16_t MAX_DEFAULT_DIAL_ID = 190;
+    #else
     constexpr uint16_t DEFAULT_DIAL_ID = 114;
     constexpr uint16_t DEFAULT_DIAL_ID_0 = 1028;
     constexpr uint16_t DEFAULT_DIAL_ID_1 = 111;
     constexpr uint16_t DEFAULT_DIAL_ID_2 = 112;
     constexpr uint16_t DEFAULT_DIAL_ID_3 = 113;
     constexpr uint16_t MAX_DEFAULT_DIAL_ID = 115;
+    #endif
     // 定义自定义表盘
     constexpr uint16_t CUSTOM_DIAL_ID_1 = 1;
     constexpr uint16_t CUSTOM_DIAL_ID_2 = 2;
@@ -92,6 +86,8 @@ namespace OHOS
         bool CheckFileExists(const std::string &filePath);
         /*通过表盘名*/
         std::string GetDialDescription(const std::string &dialName);
+        /*通过表盘Id查询名称*/
+        std::string GetdialPath(int Id);
         /*获取自定义表盘名*/
         std::string GetCustomName(int Id);
         /*删除自定义表盘*/
@@ -104,6 +100,7 @@ namespace OHOS
         bool CheckDialDownload(uint16_t ID,uint32_t dial_size);
         void CheckDialSpace();
         void ClearDialInfo(void);
+
     private:
         void LoadAllDialFromRam(void);
         void LoadAllDialFromFs(void);
@@ -113,11 +110,10 @@ namespace OHOS
         SetDialModel &operator=(const SetDialModel &);
         virtual ~SetDialModel();
         int32_t ParseDialHeader(int type, const std::string &dialFileName, SetDialInfo &dialInfo);
-
         std::vector<SetDialInfo> dialInfoList;
         std::vector<SetDialInfo> aodDialInfoList;
+        uint16_t currentDialID = DEFAULT_DIAL_ID_0; // 设置表盘默认值
 
-        uint16_t currentDialID = 114; // 设置表盘默认值
         uint16_t download_DialID = 1028;
         uint32_t download_dialSize = 0;
         bool downloadstate = false;