From: Caisking <3449750381@qq.com>
Date: Mon, 8 Apr 2024 07:46:49 +0000 (+0800)
Subject: 更新资源文件
X-Git-Tag: release_V1.2.70_20241020_135402~1200^2~25
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=094cc5b8dc104cdf9fb480d365849842e582b9d7;p=mirrors%2FFD230.git

更新资源文件
---

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index d1cd427bd..d2d88872a 100644
--- 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 7358224b5..6b8205bd9 100644
--- 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 53a0dd307..133bb56cf 100644
--- 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"
 #include "wearable_log.h"
 
-namespace OHOS {
+namespace OHOS
+{
     static const int CARD_SETTING_VALUE_LEN = 32;
     static const int DIAL_SETTING_VALUE_LEN = 64;
+    // 更新主界面卡片需要更新Map
     const CardInfo cardInfoMap[] = {
-        { HEART_RATE, PNG_SET_CARD_HEART },
-        { COMPASS, PNG_SET_CARD_COMPASS },
-        { ACTIVITY, PNG_SET_CARD_ACTIVITY },
-        { MUSIC_PLAYER, PNG_SET_CARD_PLAYER },
+        {HEART_RATE, PNG_SET_CARD_HEART},
+        {BLOODOXGEN, PNG_SET_CARD_BLOOD},
+        {COMPASS, PNG_SET_CARD_COMPASS},
+        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER},
+        {WEATHER, PNG_SET_CARD_WEATHER},
+        {TRAINING, PNG_SET_CARD_TRAIN},
+        {ACTIVITY, PNG_SET_CARD_ACTIVITY},
     };
 
     const DialInfo dialInfoMap[] = {
-        { DIAL_CLOCK, "扫秒表盘", PNG_SET_DIAL_CLOCK, DEFAULT_TASK_PERIOD },
+        {DIAL_CLOCK, "KUMI", PNG_SET_DIAL_CLOCK, DEFAULT_TASK_PERIOD},
     };
 
     MainModel::MainModel() {}
@@ -37,8 +42,10 @@ namespace OHOS {
 
     const CardInfo *MainModel::GetCardInfo(CardId card) const
     {
-        for (uint8_t i = 0; i < (sizeof(cardInfoMap) / sizeof(cardInfoMap[0])); i++) {
-            if (card == cardInfoMap[i].id) {
+        for (uint8_t i = 0; i < (sizeof(cardInfoMap) / sizeof(cardInfoMap[0])); i++)
+        {
+            if (card == cardInfoMap[i].id)
+            {
                 return &cardInfoMap[i];
             }
         }
@@ -47,8 +54,10 @@ namespace OHOS {
 
     const DialInfo *MainModel::GetDialInfo(DialId dialId) const
     {
-        for (uint8_t i = 0; i < (sizeof(dialInfoMap) / sizeof(dialInfoMap[0])); i++) {
-            if (dialId == dialInfoMap[i].id) {
+        for (uint8_t i = 0; i < (sizeof(dialInfoMap) / sizeof(dialInfoMap[0])); i++)
+        {
+            if (dialId == dialInfoMap[i].id)
+            {
                 return &dialInfoMap[i];
             }
         }
@@ -57,25 +66,30 @@ namespace OHOS {
 
     void MainModel::InitCardSettings(void)
     {
-        char temp[CARD_SETTING_VALUE_LEN] = { 0 };
+        char temp[CARD_SETTING_VALUE_LEN] = {0};
         int len;
         int index = 0;
 
         memset_s(cardSettings, CARD_SETTING_COUNT_MAX, 0, CARD_SETTING_COUNT_MAX);
         len = UtilsGetValue("card_setting", temp, CARD_SETTING_VALUE_LEN);
-        if (len >= 0) {
+        if (len >= 0)
+        {
             /* 读取用户card配置 */
             char *setBuffer = nullptr;
             char *setValue = strtok_s(temp, ",", &setBuffer);
-            while (setValue != nullptr) {
-                if (index >= CARD_SETTING_COUNT_MAX) {
+            while (setValue != nullptr)
+            {
+                if (index >= CARD_SETTING_COUNT_MAX)
+                {
                     break;
                 }
                 cardSettings[index++] = (CardId)atoi(setValue);
                 setValue = strtok_s(nullptr, ",", &setBuffer);
             }
             cardSettingCount = index;
-        } else {
+        }
+        else
+        {
             /* 使用默认card配置 */
             cardSettings[index++] = WATCH_FACE;
             cardSettings[index++] = HEART_RATE;
@@ -88,11 +102,14 @@ namespace OHOS {
 
     void MainModel::DeleteCardSetting(uint8_t index)
     {
-        char temp[CARD_SETTING_VALUE_LEN] = { 0 };
-        for (uint8_t i = 0; i < cardSettingCount; i++) {
-            if (i == index + 1) {
+        char temp[CARD_SETTING_VALUE_LEN] = {0};
+        for (uint8_t i = 0; i < cardSettingCount; i++)
+        {
+            if (i == index + 1)
+            {
                 uint8_t j = i;
-                for (; j < cardSettingCount - 1; j++) {
+                for (; j < cardSettingCount - 1; j++)
+                {
                     cardSettings[j] = cardSettings[j + 1];
                 }
                 cardSettings[j] = MAX_CARD;
@@ -100,7 +117,8 @@ namespace OHOS {
             }
         }
 
-        for (uint8_t i = 0; i < cardSettingCount; i++) {
+        for (uint8_t i = 0; i < cardSettingCount; i++)
+        {
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]);
             (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]);
         }
@@ -109,17 +127,21 @@ namespace OHOS {
 
     void MainModel::AddCardSetting(uint8_t index)
     {
-        char temp[CARD_SETTING_VALUE_LEN] = { 0 };
-        if (cardSettingCount >= CARD_SETTING_COUNT_MAX) {
+        char temp[CARD_SETTING_VALUE_LEN] = {0};
+        if (cardSettingCount >= CARD_SETTING_COUNT_MAX)
+        {
             return;
         }
-        for (int i = 0; i < cardSettingCount; i++) {
-            if (cardSettings[i] == cardInfoMap[index].id) {
+        for (int i = 0; i < cardSettingCount; i++)
+        {
+            if (cardSettings[i] == cardInfoMap[index].id)
+            {
                 return;
             }
         }
         cardSettings[cardSettingCount++] = cardInfoMap[index].id;
-        for (uint8_t i = 0; i < cardSettingCount; i++) {
+        for (uint8_t i = 0; i < cardSettingCount; i++)
+        {
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "cardSettings[%d] = %d", i, cardSettings[i]);
             (void)sprintf_s(temp + strlen(temp), CARD_SETTING_VALUE_LEN, "%d,", cardSettings[i]);
         }
@@ -158,45 +180,58 @@ namespace OHOS {
 
     void MainModel::InitDialSettings(void)
     {
-        char temp[DIAL_SETTING_VALUE_LEN] = { 0 };
+        char temp[DIAL_SETTING_VALUE_LEN] = {0};
         int len;
         len = UtilsGetValue("dial_setting", temp, DIAL_SETTING_VALUE_LEN);
-        if (len >= 0) {
+        if (len >= 0)
+        {
             char *setBuffer = nullptr;
             char *setValue = strtok_s(temp, ",", &setBuffer);
-            if (setValue != nullptr) {
+            if (setValue != nullptr)
+            {
                 dialSetting.dialFlag = atoi(setValue);
-            } else {
+            }
+            else
+            {
                 InitDialSettingDefault();
                 return;
             }
 
             setValue = strtok_s(nullptr, ",", &setBuffer);
-            if (setValue != nullptr) {
+            if (setValue != nullptr)
+            {
                 dialSetting.dialId = atoi(setValue);
-            } else {
+            }
+            else
+            {
                 InitDialSettingDefault();
                 return;
             }
 
             setValue = strtok_s(nullptr, ",", &setBuffer);
-            if (setValue != nullptr) {
+            if (setValue != nullptr)
+            {
                 dialSetting.dialFullName = setValue;
                 if (!((dialSetting.dialFullName.length() > 0) &&
-                    (access(dialSetting.dialFullName.c_str(), F_OK) == 0))) {
+                      (access(dialSetting.dialFullName.c_str(), F_OK) == 0)))
+                {
                     InitDialSettingDefault();
                     return;
                 }
-            } else {
+            }
+            else
+            {
                 InitDialSettingDefault();
                 return;
             }
-        } else {
+        }
+        else
+        {
             InitDialSettingDefault();
         }
     }
 
-    DialSetting& MainModel::GetDialSetting()
+    DialSetting &MainModel::GetDialSetting()
     {
         return dialSetting;
     }
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
index fdee3c472..000000000
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
index e253bbe46..000000000
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
index a19125d62..000000000
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
index 6b0985224..000000000
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
index 000000000..c982ded8e
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
index 000000000..dea7f060f
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
index 000000000..88d44bb96
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
index 000000000..6bd7e86d3
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
index 000000000..131fc335b
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
index 000000000..57a6878e7
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
index 784adbe27..000000000
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
index 891d7f75e..000000000
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
index 63c3b8162..000000000
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
index ceca22553..000000000
--- 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
index bd7c69f99..000000000
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
index 7a0469867..000000000
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
index 5120cd49a..000000000
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
index 099c271f4..000000000
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
index 271410043..000000000
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
index f84214ceb..000000000
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
index d610ed3a8..000000000
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
index 20e8fdb23..000000000
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