更新资源文件

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index d1cd427..d2d8887 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
@@ -12,28 +12,31 @@
 #include "ohos_types.h"
 #include "graphic_config.h"
 
-namespace OHOS {
+namespace OHOS
+{
     static const int CARD_SETTING_COUNT_MAX = 5;
-    typedef enum {
+    typedef enum
+    {
         WATCH_FACE = 0, /* 主表盘枚举值不能修改 */
         HEART_RATE,
         COMPASS,
         ACTIVITY,
         MUSIC_PLAYER,
-               WEATHER,
-               BLOODOXGEN,
-               TRAINING,
+        WEATHER,
+        BLOODOXGEN,
+        TRAINING,
         MAX_CARD,
     } CardId;
 
-    typedef enum {
+    typedef enum
+    {
         DIAL_CLOCK = 0,
         DIAL_MAX,
     } DialId;
 
-    #ifndef UNUSED
-    #define UNUSED(x) ((void)(x))
-    #endif
+#ifndef UNUSED
+#define UNUSED(x) ((void)(x))
+#endif
 
 #define LA_HORIZONTAL_RESOLUTION 400 // watch width
 #define LA_VERTICAL_RESOLUTION 400   // watch height
@@ -53,20 +56,29 @@ namespace OHOS {
 #define X_DRAG_OFFSET 20
 #define DOUBLES 2
 
-    #define APP_RES_PATH "/user/res"
-    #define APP_MUSIC_PATH "/user/music"
-    #define APP_VIDEO_PATH "/user/video"
-    #define APP_DIAL_PATH "/user/dial"
-
+#define APP_RES_PATH "/user/res"
+#define APP_MUSIC_PATH "/user/music"
+#define APP_VIDEO_PATH "/user/video"
+#define APP_DIAL_PATH "/user/dial"
+    /* ---------------------------------- 卡片管理 --------------------------------- */
     static constexpr const char *CARD_CONFIG_PATH = "/user/cardconfig.bin";
-    static constexpr const char *CLOCK_IAMGES = APP_RES_PATH "/clock/clock.bin";
-    static constexpr const char *PLAYER_IAMGES = APP_RES_PATH "/player/player.bin";
-    static constexpr const char *COMPASS_IAMGES = APP_RES_PATH "/compass/compass.bin";
-    static constexpr const char *DROPDOWN_IAMGES = APP_RES_PATH "/dropdown/dropdown.bin";
-    static constexpr const char *HEART_IAMGES = APP_RES_PATH "/heart/heart.bin";
-    static constexpr const char *BLOOD_IAMGES = APP_RES_PATH "/maincard/BloodOxygen.bin";
-    static constexpr const char *TRAINING_IAMGES = APP_RES_PATH "/maincard/Training.bin";
-    static constexpr const char *MESSAGE_IAMGES = APP_RES_PATH "/maincard/Message.bin";
+    static constexpr const char *PNG_SET_CARD_ADD = APP_RES_PATH "/MainCard/CARD_ADD.bin";
+    static constexpr const char *PNG_SET_CARD_DEL = APP_RES_PATH "/MainCard/CARD_DEL.bin";
+    static constexpr const char *PNG_SET_CARD_HEART = APP_RES_PATH "/MainCard/HeartCrad.bin";
+    static constexpr const char *PNG_SET_CARD_BLOOD = APP_RES_PATH "/MainCard/BloodOxygenCard.bin";
+    static constexpr const char *PNG_SET_CARD_TRAIN = APP_RES_PATH "/MainCard/TrainingCard.bin";
+    static constexpr const char *PNG_SET_CARD_COMPASS = APP_RES_PATH "/MainCard/CompassCard.bin";
+    static constexpr const char *PNG_SET_CARD_PLAYER = APP_RES_PATH "/MainCard/MusicCard.bin";
+    static constexpr const char *PNG_SET_CARD_WEATHER = APP_RES_PATH "/MainCard/WeatherCard.bin";
+    static constexpr const char *PNG_SET_CARD_ACTIVITY = APP_RES_PATH "/MainCard/CARD_ACTIVITY.bin";
+    static constexpr const char *DROPDOWN_IAMGES = APP_RES_PATH "/MainCard/dropdown.bin";
+    static constexpr const char *CLOCK_IAMGES = APP_RES_PATH "/MainCard/clock.bin";
+    static constexpr const char *PLAYER_IAMGES = APP_RES_PATH "/MainCard/player.bin";
+    static constexpr const char *COMPASS_IAMGES = APP_RES_PATH "/MainCard/compass.bin";
+    static constexpr const char *HEART_IAMGES = APP_RES_PATH "/MainCard/heart.bin";
+    static constexpr const char *BLOOD_IAMGES = APP_RES_PATH "/MainCard/BloodOxygen.bin";
+    static constexpr const char *TRAINING_IAMGES = APP_RES_PATH "/MainCard/Training.bin";
+    static constexpr const char *MESSAGE_IAMGES = APP_RES_PATH "/MainCard/Message.bin";
     /* ----------------------------------- 打电话图片 ---------------------------------- */
     static constexpr const char *PNG_AGREEING_IMAGE_PATH = APP_RES_PATH "/AGREEING.bin";
     static constexpr const char *PNG_DISSGREE_IMAGE_PATH = APP_RES_PATH "/DISSGREE.bin";
@@ -330,18 +342,13 @@ namespace OHOS {
     static constexpr const char *PNG_SELECTION_BOX = APP_RES_PATH "/SELECTION_BOX.bin";
     static constexpr const char *PNG_GANTAN = APP_RES_PATH "/GANTAN.bin";
     static constexpr const char *PNG_RIGHT = APP_RES_PATH "/RIGHT.bin";
-       /* -------------------------------------------------------------------------- */
-       static constexpr const char *PNG_SETTTING_DESKTOP_IMAGE = APP_RES_PATH"/SETTTING_DESKTOP.bin";
-    static constexpr const char *PNG_SET_DESKTOP_LIST_IMAGE = APP_RES_PATH"/SET_DESKTOP_LIST.bin";
-    static constexpr const char *PNG_SET_DESKTOP_HEXAGONS_IMAGE = APP_RES_PATH"/SET_DESKTOP_HEXAGONS.bin";
-    static constexpr const char *PNG_SET_DESKTOP_BG_IMAGE = APP_RES_PATH"/SET_DESKTOP_BG.bin";
-       static constexpr const char *PNG_SET_CARD_ADD = APP_RES_PATH"/CARD_ADD.bin";
-    static constexpr const char *PNG_SET_CARD_DEL = APP_RES_PATH"/CARD_DEL.bin";
-    static constexpr const char *PNG_SET_CARD_HEART = APP_RES_PATH"/CARD_HEART.bin";
-    static constexpr const char *PNG_SET_CARD_COMPASS = APP_RES_PATH"/CARD_COMPASS.bin";
-    static constexpr const char *PNG_SET_CARD_ACTIVITY = APP_RES_PATH"/CARD_ACTIVITY.bin";
-    static constexpr const char *PNG_SET_CARD_PLAYER = APP_RES_PATH"/CARD_PLAYER.bin";
-    static constexpr const char *PNG_SET_DIAL_CLOCK = APP_RES_PATH"/DIAL_CLOCK.bin";
+    /* -------------------------------------------------------------------------- */
+    static constexpr const char *PNG_SETTTING_DESKTOP_IMAGE = APP_RES_PATH "/SETTTING_DESKTOP.bin";
+    static constexpr const char *PNG_SET_DESKTOP_LIST_IMAGE = APP_RES_PATH "/SET_DESKTOP_LIST.bin";
+    static constexpr const char *PNG_SET_DESKTOP_HEXAGONS_IMAGE = APP_RES_PATH "/SET_DESKTOP_HEXAGONS.bin";
+    static constexpr const char *PNG_SET_DESKTOP_BG_IMAGE = APP_RES_PATH "/SET_DESKTOP_BG.bin";
+
+    static constexpr const char *PNG_SET_DIAL_CLOCK = APP_RES_PATH "/KUMI.bin";
 
 }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
index 7358224..6b8205b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
@@ -26,7 +26,7 @@ namespace OHOS
     const AppItem g_nativeAppList[] = {
         {VIEW_MAIN_ALARM, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_ALARM_IMAGE, "闹钟", nullptr},
         {VIEW_SETTING, PNG_APPLIST_SETTING_IMAGE, PNG_APPLIST_SETTING_IMAGE, "设置", nullptr},
-        {VIEW_DIALUPDATE, PNG_APPLIST_UI_SAMPLE_IMAGE, PNG_APPLIST_UI_SAMPLE_IMAGE, "表盘切换", nullptr},
+        //  {VIEW_DIALUPDATE, PNG_APPLIST_UI_SAMPLE_IMAGE, PNG_APPLIST_UI_SAMPLE_IMAGE, "表盘切换", nullptr},
         {VIEW_COMPASS, PNG_APPLIST_COMPASS_IMAGE, PNG_APPLIST_COMPASS_IMAGE, "指南针", nullptr},
         {VIEW_BLOODOXY, PNG_APPLIST_SPO2_IMAGE, PNG_APPLIST_SPO2_IMAGE, "血氧饱和度", nullptr},
         {VIEW_HEART, PNG_APPLIST_HEART_IMAGE, PNG_APPLIST_HEART_IMAGE, "心率检测", nullptr},
@@ -39,9 +39,9 @@ namespace OHOS
         {VIEW_PHONE, PNG_APPLIST_CALLER_IMAGE, PNG_APPLIST_CALLER_IMAGE, "电话", nullptr},
         {VIEW_MAIN_STOPWATCH, PNG_APPLIST_STOPWATCH_IMAGE, PNG_APPLIST_STOPWATCH_IMAGE, "秒表", nullptr},
         {VIEW_CONNECT_PHONE, PNG_CONNECT_PHONE_IMAGE, PNG_CONNECT_PHONE_IMAGE, "连接手机", nullptr},
-        {VIEW_SET_DESKTOP,PNG_APPLIST_ALARM_IMAGE,PNG_APPLIST_ALARM_IMAGE,"主题样式",nullptr},
-        {VIEW_SET_CARD,PNG_APPLIST_SETTING_IMAGE,PNG_APPLIST_SETTING_IMAGE,"卡片管理",nullptr},
-        {VIEW_SET_DIAL,PNG_APPLIST_UI_SAMPLE_IMAGE,PNG_APPLIST_UI_SAMPLE_IMAGE,"切换表盘",nullptr},
+        {VIEW_SET_DESKTOP, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_ALARM_IMAGE, "主题样式", nullptr},
+        {VIEW_SET_CARD, PNG_APPLIST_SETTING_IMAGE, PNG_APPLIST_SETTING_IMAGE, "卡片管理", nullptr},
+        {VIEW_SET_DIAL, PNG_APPLIST_UI_SAMPLE_IMAGE, PNG_APPLIST_UI_SAMPLE_IMAGE, "切换表盘", nullptr},
     //{VIEW_LANGUAGE_SWITCH, PNG_CONNECT_PHONE_IMAGE, PNG_CONNECT_PHONE_IMAGE, "语言切换", nullptr},
 #ifdef SUPPORT_ALIPAY_SEC
         {VIEW_MAIN_ALIPAY, PNG_APPLIST_ALIPAY_IMAGE, PNG_APPLIST_ALIPAY_IMAGE, "支付宝", nullptr},

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
index 53a0dd3..133bb56 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
@@ -11,18 +11,23 @@
 #include "securec.h"\r
 #include "wearable_log.h"\r
 \r
-namespace OHOS {\r
+namespace OHOS\r
+{\r
     static const int CARD_SETTING_VALUE_LEN = 32;\r
     static const int DIAL_SETTING_VALUE_LEN = 64;\r
+    // 更新主界面卡片需要更新Map\r
     const CardInfo cardInfoMap[] = {\r
-        { HEART_RATE, PNG_SET_CARD_HEART },\r
-        { COMPASS, PNG_SET_CARD_COMPASS },\r
-        { ACTIVITY, PNG_SET_CARD_ACTIVITY },\r
-        { MUSIC_PLAYER, PNG_SET_CARD_PLAYER },\r
+        {HEART_RATE, PNG_SET_CARD_HEART},\r
+        {BLOODOXGEN, PNG_SET_CARD_BLOOD},\r
+        {COMPASS, PNG_SET_CARD_COMPASS},\r
+        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER},\r
+        {WEATHER, PNG_SET_CARD_WEATHER},\r
+        {TRAINING, PNG_SET_CARD_TRAIN},\r
+        {ACTIVITY, PNG_SET_CARD_ACTIVITY},\r
     };\r
 \r
     const DialInfo dialInfoMap[] = {\r
-        { DIAL_CLOCK, "扫秒表盘", PNG_SET_DIAL_CLOCK, DEFAULT_TASK_PERIOD },\r
+        {DIAL_CLOCK, "KUMI", PNG_SET_DIAL_CLOCK, DEFAULT_TASK_PERIOD},\r
     };\r
 \r
     MainModel::MainModel() {}\r
@@ -37,8 +42,10 @@ namespace OHOS {
 \r
     const CardInfo *MainModel::GetCardInfo(CardId card) const\r
     {\r
-        for (uint8_t i = 0; i < (sizeof(cardInfoMap) / sizeof(cardInfoMap[0])); i++) {\r
-            if (card == cardInfoMap[i].id) {\r
+        for (uint8_t i = 0; i < (sizeof(cardInfoMap) / sizeof(cardInfoMap[0])); i++)\r
+        {\r
+            if (card == cardInfoMap[i].id)\r
+            {\r
                 return &cardInfoMap[i];\r
             }\r
         }\r
@@ -47,8 +54,10 @@ namespace OHOS {
 \r
     const DialInfo *MainModel::GetDialInfo(DialId dialId) const\r
     {\r
-        for (uint8_t i = 0; i < (sizeof(dialInfoMap) / sizeof(dialInfoMap[0])); i++) {\r
-            if (dialId == dialInfoMap[i].id) {\r
+        for (uint8_t i = 0; i < (sizeof(dialInfoMap) / sizeof(dialInfoMap[0])); i++)\r
+        {\r
+            if (dialId == dialInfoMap[i].id)\r
+            {\r
                 return &dialInfoMap[i];\r
             }\r
         }\r
@@ -57,25 +66,30 @@ namespace OHOS {
 \r
     void MainModel::InitCardSettings(void)\r
     {\r
-        char temp[CARD_SETTING_VALUE_LEN] = { 0 };\r
+        char temp[CARD_SETTING_VALUE_LEN] = {0};\r
         int len;\r
         int index = 0;\r
 \r
         memset_s(cardSettings, CARD_SETTING_COUNT_MAX, 0, CARD_SETTING_COUNT_MAX);\r
         len = UtilsGetValue("card_setting", temp, CARD_SETTING_VALUE_LEN);\r
-        if (len >= 0) {\r
+        if (len >= 0)\r
+        {\r
             /* 读取用户card配置 */\r
             char *setBuffer = nullptr;\r
             char *setValue = strtok_s(temp, ",", &setBuffer);\r
-            while (setValue != nullptr) {\r
-                if (index >= CARD_SETTING_COUNT_MAX) {\r
+            while (setValue != nullptr)\r
+            {\r
+                if (index >= CARD_SETTING_COUNT_MAX)\r
+                {\r
                     break;\r
                 }\r
                 cardSettings[index++] = (CardId)atoi(setValue);\r
                 setValue = strtok_s(nullptr, ",", &setBuffer);\r
             }\r
             cardSettingCount = index;\r
-        } else {\r
+        }\r
+        else\r
+        {\r
             /* 使用默认card配置 */\r
             cardSettings[index++] = WATCH_FACE;\r
             cardSettings[index++] = HEART_RATE;\r
@@ -88,11 +102,14 @@ namespace OHOS {
 \r
     void MainModel::DeleteCardSetting(uint8_t index)\r
     {\r
-        char temp[CARD_SETTING_VALUE_LEN] = { 0 };\r
-        for (uint8_t i = 0; i < cardSettingCount; i++) {\r
-            if (i == index + 1) {\r
+        char temp[CARD_SETTING_VALUE_LEN] = {0};\r
+        for (uint8_t i = 0; i < cardSettingCount; i++)\r
+        {\r
+            if (i == index + 1)\r
+            {\r
                 uint8_t j = i;\r
-                for (; j < cardSettingCount - 1; j++) {\r
+                for (; j < cardSettingCount - 1; j++)\r
+                {\r
                     cardSettings[j] = cardSettings[j + 1];\r
                 }\r
                 cardSettings[j] = MAX_CARD;\r
@@ -100,7 +117,8 @@ namespace OHOS {
             }\r
         }\r
 \r
-        for (uint8_t i = 0; i < cardSettingCount; i++) {\r
+        for (uint8_t i = 0; i < cardSettingCount; i++)\r
+        {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]);\r
             (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]);\r
         }\r
@@ -109,17 +127,21 @@ namespace OHOS {
 \r
     void MainModel::AddCardSetting(uint8_t index)\r
     {\r
-        char temp[CARD_SETTING_VALUE_LEN] = { 0 };\r
-        if (cardSettingCount >= CARD_SETTING_COUNT_MAX) {\r
+        char temp[CARD_SETTING_VALUE_LEN] = {0};\r
+        if (cardSettingCount >= CARD_SETTING_COUNT_MAX)\r
+        {\r
             return;\r
         }\r
-        for (int i = 0; i < cardSettingCount; i++) {\r
-            if (cardSettings[i] == cardInfoMap[index].id) {\r
+        for (int i = 0; i < cardSettingCount; i++)\r
+        {\r
+            if (cardSettings[i] == cardInfoMap[index].id)\r
+            {\r
                 return;\r
             }\r
         }\r
         cardSettings[cardSettingCount++] = cardInfoMap[index].id;\r
-        for (uint8_t i = 0; i < cardSettingCount; i++) {\r
+        for (uint8_t i = 0; i < cardSettingCount; i++)\r
+        {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]);\r
             (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]);\r
         }\r
@@ -158,45 +180,58 @@ namespace OHOS {
 \r
     void MainModel::InitDialSettings(void)\r
     {\r
-        char temp[DIAL_SETTING_VALUE_LEN] = { 0 };\r
+        char temp[DIAL_SETTING_VALUE_LEN] = {0};\r
         int len;\r
         len = UtilsGetValue("dial_setting", temp, DIAL_SETTING_VALUE_LEN);\r
-        if (len >= 0) {\r
+        if (len >= 0)\r
+        {\r
             char *setBuffer = nullptr;\r
             char *setValue = strtok_s(temp, ",", &setBuffer);\r
-            if (setValue != nullptr) {\r
+            if (setValue != nullptr)\r
+            {\r
                 dialSetting.dialFlag = atoi(setValue);\r
-            } else {\r
+            }\r
+            else\r
+            {\r
                 InitDialSettingDefault();\r
                 return;\r
             }\r
 \r
             setValue = strtok_s(nullptr, ",", &setBuffer);\r
-            if (setValue != nullptr) {\r
+            if (setValue != nullptr)\r
+            {\r
                 dialSetting.dialId = atoi(setValue);\r
-            } else {\r
+            }\r
+            else\r
+            {\r
                 InitDialSettingDefault();\r
                 return;\r
             }\r
 \r
             setValue = strtok_s(nullptr, ",", &setBuffer);\r
-            if (setValue != nullptr) {\r
+            if (setValue != nullptr)\r
+            {\r
                 dialSetting.dialFullName = setValue;\r
                 if (!((dialSetting.dialFullName.length() > 0) &&\r
-                    (access(dialSetting.dialFullName.c_str(), F_OK) == 0))) {\r
+                      (access(dialSetting.dialFullName.c_str(), F_OK) == 0)))\r
+                {\r
                     InitDialSettingDefault();\r
                     return;\r
                 }\r
-            } else {\r
+            }\r
+            else\r
+            {\r
                 InitDialSettingDefault();\r
                 return;\r
             }\r
-        } else {\r
+        }\r
+        else\r
+        {\r
             InitDialSettingDefault();\r
         }\r
     }\r
 \r
-    DialSetting& MainModel::GetDialSetting()\r
+    DialSetting &MainModel::GetDialSetting()\r
     {\r
         return dialSetting;\r
     }\r

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/KUMI.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/KUMI.bin
deleted file mode 100644 (file)
index fdee3c4..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/KUMI.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_COMPASS.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_COMPASS.bin
deleted file mode 100644 (file)
index e253bbe..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_COMPASS.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_HEART.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_HEART.bin
deleted file mode 100644 (file)
index a19125d..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_HEART.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_PLAYER.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_PLAYER.bin
deleted file mode 100644 (file)
index 6b09852..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_PLAYER.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/KUMI.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/KUMI.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/KUMI.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/KUMI.bin

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/BloodOxygen.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/BloodOxygen.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/BloodOxygen.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/BloodOxygen.bin

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/BloodOxygenCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/BloodOxygenCard.bin
new file mode 100644 (file)
index 0000000..c982ded
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/BloodOxygenCard.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_ACTIVITY.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/CARD_ACTIVITY.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_ACTIVITY.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/CARD_ACTIVITY.bin

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_ADD.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/CARD_ADD.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_ADD.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/CARD_ADD.bin

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_DEL.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/CARD_DEL.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/CARD_DEL.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/CARD_DEL.bin

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/CompassCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/CompassCard.bin
new file mode 100644 (file)
index 0000000..dea7f06
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/CompassCard.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/HeartCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/HeartCard.bin
new file mode 100644 (file)
index 0000000..88d44bb
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/HeartCard.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Message.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/Message.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Message.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/Message.bin

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/MusicCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/MusicCard.bin
new file mode 100644 (file)
index 0000000..6bd7e86
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/MusicCard.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Training.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/Training.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Training.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/Training.bin

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/TrainingCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/TrainingCard.bin
new file mode 100644 (file)
index 0000000..131fc33
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/TrainingCard.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/WeatherCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/WeatherCard.bin
new file mode 100644 (file)
index 0000000..57a6878
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/WeatherCard.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/clock/clock.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/clock.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/clock/clock.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/clock.bin

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/compass/compass.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/compass.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/compass/compass.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/compass.bin

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/dropdown.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/dropdown.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/dropdown.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/dropdown.bin

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart/heart.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/heart.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/heart/heart.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/heart.bin

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/player/player.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/player.bin
similarity index 100%
rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/player/player.bin
rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/MainCard/player.bin

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/Dynamic_cat.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/Dynamic_cat.bin
deleted file mode 100644 (file)
index 784adbe..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/Dynamic_cat.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/classic.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/classic.bin
deleted file mode 100644 (file)
index 891d7f7..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/classic.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/defult_dial.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/defult_dial.bin
deleted file mode 100644 (file)
index 63c3b81..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/defult_dial.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/dial_config.json b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/dial_config.json
deleted file mode 100644 (file)
index ceca225..0000000
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/dial_config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "Current_dial": 0
-}
\ No newline at end of file

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/dog.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/dog.bin
deleted file mode 100644 (file)
index bd7c69f..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/dog.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/galaxy.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/galaxy.bin
deleted file mode 100644 (file)
index 7a04698..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/galaxy.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/geometry.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/geometry.bin
deleted file mode 100644 (file)
index 5120cd4..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/geometry.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/jellyfish.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/jellyfish.bin
deleted file mode 100644 (file)
index 099c271..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/jellyfish.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/left_boutton.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/left_boutton.bin
deleted file mode 100644 (file)
index 2714100..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/left_boutton.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/maomao.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/maomao.bin
deleted file mode 100644 (file)
index f84214c..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/maomao.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/panda.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/panda.bin
deleted file mode 100644 (file)
index d610ed3..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/panda.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/right_boutton.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/right_boutton.bin
deleted file mode 100644 (file)
index 20e8fdb..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dialupdate/right_boutton.bin and /dev/null differ