Merge #728 into sdk602patch0626 from refs/changes/728/head

Code review from 罗正

* refs/changes/728/head: (6 commits squashed)

  - 1. 优化连接中的gif动画，由原来的20帧修改为现在的20帧

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 修改连接动画为60帧

  - 添加手机同步歌曲到手表，手表音乐列表同步刷新。

  - 音乐列表刷新机制优化在每次切换到音乐列表刷新一次，list高度会根据歌曲数量自适应

  - 显示方式界面添加弧形列表样式，并添加对应资源

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/728

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
index 0615409..fc0599e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
@@ -530,12 +530,13 @@ enum UIResourceTextId : uint16_t {
     STR_NO_PAIRED_DEV = 517,\r
     STR_IGNORE = 518,\r
     STR_START = 519,\r
-    STR_MAX_ID = 520,\r
+    STR_ARC_SCALE_LIST_DISPLAY = 520,\r
+    STR_MAX_ID = 521,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_EN,\r
+    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceConnectingView.h b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceConnectingView.h
index 28eb6ac..5be7c8a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceConnectingView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceConnectingView.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-08-03 11:09:56
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-03 16:55:59
+ * @LastEditTime: 2024-08-19 16:19:42
  * @FilePath: /xts_origin/FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceConnectingView.h
  */
 
@@ -15,7 +15,7 @@
 namespace OHOS
 {
     static constexpr const char *AIVOICECONNECTINGVIEW_CANCEL_BUTTON_VIEW_ID = "AivoiceConnectingcancelButton"; // 正在连接中界面取消按钮
-    static constexpr int16_t AIVOICE_CONNECTING_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 20;                            // 图片帧数
+    static constexpr int16_t AIVOICE_CONNECTING_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 60;                            // 图片帧数
 
     class AiVoiceConnectingView
     {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
index 29514a9..8e8d88f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
@@ -2,13 +2,14 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-08-03 11:10:08
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-03 17:27:27
+ * @LastEditTime: 2024-08-19 16:41:43
  * @FilePath: /xts_origin/FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
  */
 #include "aivoice/include/AiVoiceConnectingView.h"
 #include "aivoice/include/AiVoicePresenter.h"
 #include "wearable_log.h"
 #include "ui_resource_string.h"
+#include "common/image_cache_manager.h"
 
 namespace OHOS
 {
@@ -127,6 +128,7 @@ namespace OHOS
     {
         for (int i = 0; i < numImages; i++)
         {
+            // ImageCacheManager::GetInstance().UnloadSingleRes(imagePaths[i]);
             delete imagePaths[i];
             imagePaths[i] = nullptr;
         }
@@ -144,6 +146,7 @@ namespace OHOS
         for (uint8_t i = 0; i < imageanimatorconfig.numFrames; i++)
         {
             // imageanimatorconfig.imageInfoArray[i].imageInfo = ImageCacheManager::GetInstance().LoadSingleRes(imageanimatorconfig.pathsArray[i]);
+            // imageanimatorconfig.imageInfoArray[i].imageType = IMG_SRC_IMAGE_INFO;
             imageanimatorconfig.imageInfoArray[i].imagePath = (imageanimatorconfig.pathsArray[i]);
             imageanimatorconfig.imageInfoArray[i].imageType = IMG_SRC_FILE_PATH;
             imageanimatorconfig.imageInfoArray[i].pos.x = imageanimatorconfig.x;
@@ -155,8 +158,8 @@ namespace OHOS
         animatorView->SetPosition(imageanimatorconfig.x, imageanimatorconfig.y, imageanimatorconfig.width, imageanimatorconfig.height);
         animatorView->SetImageAnimatorSrc(imageanimatorconfig.imageInfoArray, imageanimatorconfig.numFrames, imageanimatorconfig.delay);
         animatorView->SetRepeat(true);
-        animatorView->SetAutoEnable(false);
-        animatorView->SetResizeMode(UIImageAnimatorView::FILL);
+        // animatorView->SetAutoEnable(false);
+        // animatorView->SetResizeMode(UIImageAnimatorView::FILL);
         animatorView->Start();
 
         return animatorView;
@@ -283,7 +286,7 @@ namespace OHOS
         return true;
     }
 
-     bool AiVoiceConnectingView::CreateAiVoiceConnectingScrollView(uint8_t type)
+    bool AiVoiceConnectingView::CreateAiVoiceConnectingScrollView(uint8_t type)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceConnectingView::CreateAiVoiceConnectingScrollView");
         scrollView = new UIScrollView();
@@ -299,11 +302,10 @@ namespace OHOS
         return true;
     }
 
-
     UIScrollView *AiVoiceConnectingView::CreateAiVoiceConnectingView(void)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceConnectingView::CreateAiVoiceConnectingView");
-        if (!CreateAiVoiceConnectingScrollView() || !CreateAivoiceConnectingImageAnimator()|| !CreateAiVoiceConnectingViewLabel() || !CreateAiVoiceConnectingViewButton())
+        if (!CreateAiVoiceConnectingScrollView() || !CreateAivoiceConnectingImageAnimator() || !CreateAiVoiceConnectingViewLabel() || !CreateAiVoiceConnectingViewButton())
         {
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceConnectingView::CreateAiVoiceConnectingView fail!!");
             return nullptr;
@@ -316,10 +318,10 @@ namespace OHOS
         return scrollView;
     }
 
-     UIScrollView *AiVoiceConnectingView::CreateAiVoiceConnectingView(uint8_t type)
+    UIScrollView *AiVoiceConnectingView::CreateAiVoiceConnectingView(uint8_t type)
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceConnectingView::CreateAiVoiceConnectingView");
-        if (!CreateAiVoiceConnectingScrollView(type) || !CreateAivoiceConnectingImageAnimator()|| !CreateAiVoiceConnectingViewLabel() )
+        if (!CreateAiVoiceConnectingScrollView(type) || !CreateAivoiceConnectingImageAnimator() || !CreateAiVoiceConnectingViewLabel())
         {
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoiceConnectingView::CreateAiVoiceConnectingView fail!!");
             return nullptr;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp
index 60517bc..3e2aa2c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp
@@ -782,17 +782,13 @@ void PlayersModel::SetMusicSource(bool value)
 void PlayersModel::UpdateMusicPlayerList(void)
 {
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersModel::UpdateMusicPlayerList");
+    PlayersListGroup::GetInstance()->SetUpListCase();
     PlayersView *playersView = PlayersView::GetInstance();
     if (playersView == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OptionsButtonOnClick playersView nullptr err");
         return;
     }
-    PlayersListGroup::GetInstance()->SetUpListCase();
-    if(playersView->GetMusicListList()) 
-    {
-        playersView->GetMusicListList()->RefreshList();
-        playersView->UpdateMusicListStatus();
-    }
+    playersView->UpdateMusicListStatus();
 }
 
 /*获取当前音乐是否是在播放中*/

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp
index 0eafd36..858364f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp
@@ -667,17 +667,7 @@ void ButtonOnClickListener::MusicListButtonOnClick()
 void ButtonOnClickListener::MusicDeleteButtonOnClick()\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ButtonOnClickListener::MusicDeleteButtonOnClick");\r
-    PlayersView *playersView = PlayersView::GetInstance();\r
-    if (playersView == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OptionsButtonOnClick playersView nullptr err");\r
-        return;\r
-    }\r
     PlayersListGroup::GetInstance()->SetUpListCase();\r
-    if(playersView->GetMusicListList()) {\r
-        playersView->GetMusicListList()->RefreshList();\r
-        playersView->UpdateMusicListStatus();\r
-    }\r
-   \r
     return;\r
 }\r
 void ButtonOnClickListener::PlayerModelButtonOnClick()\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
index 6cde8c3..204cce8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
@@ -327,13 +327,14 @@ namespace OHOS
                 return nullptr;\r
             }\r
             musicList->SetPosition(68, 120, 330, 320);\r
-            musicList->SetStartIndex(0);\r
+            musicList->SetStartIndex(PlayersModel::GetInstance()->GetCurrentIndex());\r
             musicList->SetThrowDrag(true);\r
             musicList->SetIntercept(true);\r
             musicList->SetMaxScrollDistance(1000);\r
             musicList->SetDragACCLevel(5);\r
             musicList->SetSwipeACCLevel(800); /*设置手指抬起屏幕后的补偿距离。*/\r
             musicList->SetReboundSize(35);\r
+            // musicList->SetScrollBlankSize(35);\r
             // 增加表冠控制\r
             musicList->SetRotateFactor(1.0);\r
             musicList->RequestFocus();\r
@@ -344,9 +345,6 @@ namespace OHOS
         musicListScrollView->Add(musicListIsEmptyLabel);\r
         musicListScrollView->Add(musicList);\r
         musicListGroupView->Add(musicListScrollView);\r
-        /* -------------------------------------------------------------------------- */\r
-        UpdateMusicListStatus(); // 音乐列表刷新\r
-        /* -------------------------------------------------------------------------- */\r
         return musicListGroupView;\r
     }\r
 \r
@@ -878,6 +876,19 @@ namespace OHOS
                 musicListIsEmptyImage->SetVisible(false);\r
                 musicListIsEmptyLabel->SetVisible(false);\r
                 musicList->SetVisible(true);\r
+                if (musicAdapter)\r
+                {\r
+                    int count = musicAdapter->GetCount();\r
+                    if (count > 4)\r
+                    {\r
+                        musicList->SetHeight(320);\r
+                    }\r
+                    else\r
+                    {\r
+                        musicList->SetHeight(count * 70);\r
+                    }\r
+                }\r
+                musicList->RefreshList();\r
             }\r
         }\r
     }\r
@@ -1361,6 +1372,7 @@ namespace OHOS
             group[thisView] = groupview;\r
             Add(group[thisView]);\r
         }\r
+        UpdateMusicListStatus();/*每次切换到音乐列表都将更新一次列表*/\r
         return true;\r
     }\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleModel.h b/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleModel.h
index 31f82aa..ce038bf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleModel.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-06-14 09:40:13
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-17 15:29:00
+ * @LastEditTime: 2024-08-19 18:44:49
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleModel.h
  */
 #ifndef SET_THEMESTYLE_MODEL_H
@@ -27,8 +27,8 @@ namespace OHOS
     {
         APPLIST_STYLE,  // 列表显示
         HEXAGONS_STYLE, // 蜂窝显示
+        ARC_SCALE_LIST_STYLE,//弧形列表
         FOOTBALL_STYLE, //足球
-        ARC_SCALE_LIST_STYLE,
         MAX_THEME_STYLE,
     } ThemeStyle;
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleView.h b/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleView.h
index c97f737..b9a870d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleView.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-06-14 09:40:13
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-24 20:33:55
+ * @LastEditTime: 2024-08-19 18:24:49
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleView.h
  */
 
@@ -28,11 +28,13 @@ namespace OHOS
     static constexpr char *THEME_STYLE_LIST = "themestyleList";         // 列表
     static constexpr char *THEME_STYLE_HEXAGONS = "themestyleHexagons"; // 蜂窝
     static constexpr char *THEME_STYLE_FOOTBALL = "themestyleFootball"; // 足球
+    static constexpr char *THEME_STYLE_ARC_LIST = "themestyleArcList";  // 弧形列表
     static constexpr char *THEMESTYLEVIEWEXIT = "ThemeStyleViewExit";   // exit
 
     static constexpr char *THEMESTYLE_LIST_IMAGEPATH = "/user/res/themestyle/list.bin";
     static constexpr char *THEMESTYLE_HEXAGONS_IMAGEPATH = "/user/res/themestyle/hexagons.bin";
     static constexpr char *THEMESTYLE_FOOTBALL_IMAGEPATH = "/user/res/themestyle/grid.bin";
+    static constexpr char *THEMESTYLE_ARCLIST_IMAGEPATH = "/user/res/themestyle/grid.bin";
 
     class ThemeStylePresenter;
     class ThemeStyleView : public View<ThemeStylePresenter>

diff --git a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStylePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStylePresenter.cpp
index 13aa916..b43785e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStylePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStylePresenter.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-04-08 16:43:48
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-06 18:08:24
+ * @LastEditTime: 2024-08-19 18:40:32
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/ThemeStylePresenter.cpp
  */
 
@@ -85,6 +85,14 @@ namespace OHOS
         {
             ThemeStyleModel::GetInstance().SetAppListDisplayStyle(ThemeStyle::FOOTBALL_STYLE);
         }
+        else if (viewId == THEME_STYLE_ARC_LIST)
+        {
+            ThemeStyleModel::GetInstance().SetAppListDisplayStyle(ThemeStyle::ARC_SCALE_LIST_STYLE);
+        }
+        
+        /* -------------------------------------------------------------------------- */
+        view_->UpdateSelectedStyle();
+        /* -------------------------------------------------------------------------- */
 
         uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
         if (preSlice == VIEW_APPLIST)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp
index 39ad7f2..f6b9708 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-06-14 09:40:20
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-24 20:43:01
+ * @LastEditTime: 2024-08-19 18:48:59
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp
  */
 
@@ -137,6 +137,9 @@ namespace OHOS
         scrollView->SetHorizontalScrollState(false);
         scrollView->RequestFocus();
         scrollView->SetRotateFactor(1.0);
+        scrollView->SetMaxScrollDistance(1000);
+        scrollView->SetDragACCLevel(5);
+        scrollView->SetSwipeACCLevel(800); /*设置手指抬起屏幕后的补偿距离。*/
         scrollView->SetTouchable(true);
         scrollView->SetDraggable(true);
         container_->Add(scrollView);
@@ -162,9 +165,7 @@ namespace OHOS
         titleText->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         scrollView->Add(titleText);
         /* -------------------------------------------------------------------------- */
-        // const char *viewId[MAX_STYLE] = {THEME_STYLE_LIST, THEME_STYLE_HEXAGONS, THEME_STYLE_FOOTBALL};
-        // uint16_t textId[MAX_STYLE] = {STR_LIST_DISPLAY, STR_CELLULAR_DISPLAY, STR_GRID_DISPLAY};
-        int16_t textId[MAX_STYLE] = {STR_LIST_DISPLAY, STR_CELLULAR_DISPLAY};
+        int16_t textId[] = {STR_LIST_DISPLAY, STR_CELLULAR_DISPLAY, STR_ARC_SCALE_LIST_DISPLAY};
         LabelConfig labelConfig = {
             .left = 143,
             .top = 153,
@@ -175,7 +176,7 @@ namespace OHOS
             .textId = 0,
             .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION,
         };
-        for (int16_t i = 0; i < MAX_STYLE; i++)
+        for (int16_t i = 0; i < sizeof(textId) / sizeof(textId[0]); i++)
         {
             labelConfig.top = 153 + 120 * i;
             labelConfig.textId = textId[i];
@@ -216,8 +217,8 @@ namespace OHOS
             .viewId = THEME_STYLE_LIST,
         };
 
-        const char *viewId[MAX_STYLE] = {THEME_STYLE_LIST, THEME_STYLE_HEXAGONS};
-        for (int i = 0; i < MAX_STYLE; i++)
+        const char *viewId[] = {THEME_STYLE_LIST, THEME_STYLE_HEXAGONS, THEME_STYLE_ARC_LIST};
+        for (int i = 0; i < sizeof(viewId) / sizeof(viewId[0]); i++)
         {
             labelbuttonconfig.top = 120 + 120 * i;
             labelbuttonconfig.viewId = viewId[i];
@@ -257,9 +258,8 @@ namespace OHOS
             .src = THEMESTYLE_LIST_IMAGEPATH,
         };
         int y = 150;
-        // const char *src[MAX_STYLE] = {THEMESTYLE_LIST_IMAGEPATH, THEMESTYLE_HEXAGONS_IMAGEPATH, THEMESTYLE_FOOTBALL_IMAGEPATH};
-        const char *src[MAX_STYLE] = {THEMESTYLE_LIST_IMAGEPATH, THEMESTYLE_HEXAGONS_IMAGEPATH};
-        for (int i = 0; i < MAX_STYLE; i++)
+        const char *src[MAX_STYLE] = {THEMESTYLE_LIST_IMAGEPATH, THEMESTYLE_HEXAGONS_IMAGEPATH, THEMESTYLE_ARCLIST_IMAGEPATH};
+        for (int i = 0; i < sizeof(src) / sizeof(src[0]); i++)
         {
             imageconfig.y = y + 120 * i;
             imageconfig.src = src[i];

diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
index 669cf3a..132de8f 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
@@ -2048,6 +2048,13 @@ void SendDtfmStrNumberToCat1(char ch) // ble发送单个字符到CAT1 DTMF功能
     send_dtfm_number_toCat1(ch);
 }
 
+void ble_mp3_list_update(void)
+{
+#ifdef FD230
+    SendMsgToUIService(UI_UPDATE_MUSIC_PLAYER_LIST,0,nullptr,0);
+#endif
+} 
+
 #ifdef __cplusplus
 #if __cplusplus
 }

diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
index 76e5559..5d54a92 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
@@ -306,7 +306,7 @@ typedef struct Tag_ID3V2_TAG
 }Tag_ID3V2_TAG_T;
 
 
-
+void ble_mp3_list_update(void);
 
 char * dir_to_json_buf_malloc_(uint8_t type);
 

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index 58cd7ff..48b1c26 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -6468,6 +6468,7 @@ void decode_file_checksum(ble_read_data *buffer_handle)
                 case 2://mp3\r
 \r
                     ble_reply_cmd(DIAL_INSTALL_REPY_CMD,1);\r
+                    ble_mp3_list_update();\r
 \r
                     break;\r
                 case 3://dial\r

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/1.bin
index 51172e5..98fa9c8 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/1.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/1.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f24a574150a0072dd4b9a570bab14a82a81ce335f22f0efe2498342396afe75
-size 2184
+oid sha256:e181ec68f479b971dcae441d5cc1c774e9a10a8e56269a7a6dd93429c2142492
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/10.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/10.bin
index bc7b321..a7f1d42 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/10.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/10.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b271d16d692cc5d6c8657c59b60226788e31faf1bd890ef0d57df395fe2692f
-size 2184
+oid sha256:d10c0c89b0de323d89c703eb89de9b69e658e2331adb0844d0af5b16cee15608
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/11.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/11.bin
index 8c1fbe2..f85fe46 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/11.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/11.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a60f07c4c5f84e50c88f7823067b829b724d00265e120ac37c638c4545dd2148
-size 2184
+oid sha256:4aaf0c0973840977ef06b4331169332b2c5c5812dfe10a974d825b609aa937e9
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/12.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/12.bin
index 5f9235d..51040fc 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/12.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/12.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83db015575db41bf67d2aa51204b109fb83b6107552a6fa8ef486aa68d9909d3
-size 2184
+oid sha256:53d31e54e8d5489a9ce23219099e20c8db1afd1662e0c4516778a7573cac3ead
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/13.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/13.bin
index 7c38d26..7a33bc1 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/13.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/13.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cae43b93ac7641be73c6e76e9cd25e27e95b29851f9fea7640c047db5cb6b3a6
-size 2184
+oid sha256:69dd024c0cdd60a3ac58862fea1be04ffddb92b4a58d47a3df6fc260975239e7
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/14.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/14.bin
index 305b5d9..a314815 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/14.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/14.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:970d0e91901900918b829c1b5cf4b5603021a93ad28a3eeeb786de9eb209a5b2
-size 2184
+oid sha256:3185023c16500085619b20f210da87394f666c89d63719689758ed1eaf304eda
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/15.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/15.bin
index 5d1ff69..f8de363 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/15.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/15.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e27081e4806b16ec7f48fe292c923783e62d6006daa9c39f27de76d5f8752293
-size 2184
+oid sha256:ca0a20ec9d7332168d547ac26a39078793a3f09252280e1d6bf97d64ec6b288e
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/16.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/16.bin
index f2264c2..34573ed 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/16.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/16.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed6681d064ca26cd486203027c55e3ca685a9e3c16dce18364488788c74f57e8
-size 2184
+oid sha256:95bca3a0e1c82102cb344f5c9bbb0b9b541442da563b321bb7cceb404415edce
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/17.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/17.bin
index edadda4..fd2664d 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/17.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/17.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65348abc3ef5c0216825e6705f768de189f1c9e9d994ab0793019e1d42977757
-size 2184
+oid sha256:685e16437c06603f716b2a2193b4b801c0ae9982fa942c9e9a253ce2ff694f73
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/18.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/18.bin
index 0219775..160f95f 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/18.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/18.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17e917fc6ff0aba1a0dcdc6b901175eb35c5ce27b161b6a64feff4006cfd2be1
-size 2184
+oid sha256:730b3ba25cd30961c716a7d4697fbc359c3127718b548a3c4ba523693a7e9619
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/19.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/19.bin
index ed33c98..e21fb9f 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/19.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/19.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ebc140721c21d1cf38c3d1b76cb7777bfedc508a67cb8be9b345ebe5d748fdf
-size 2184
+oid sha256:5dc2e0521869cc8b701ff19ec3856ba9bd3ed9e7a7a6f1783b48c37b53e274cd
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/2.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/2.bin
index 3a46bc8..84d0a5b 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/2.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/2.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19096bc443031ad77ab0ef1ca4ebfa52dc75ad63de11d9c9e2d6f05fcb435b4c
-size 2184
+oid sha256:3deee0513531bff4478f976d04e409b83c4ec5ec456d7235f369a55acc29ff0c
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/20.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/20.bin
index 9487c4a..3ccceb3 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/20.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/20.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78bbdb272259095dd5682e45cc1ba80b257e6deb99e6760fd2a2a785f1fddc2a
-size 2184
+oid sha256:c19b3af0d4fa6bc9388be46865f3423b2ab47bb8603a116cf3b0d057ceef5014
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/21.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/21.bin
new file mode 100644 (file)
index 0000000..4632364
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/21.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7f654bcea2c02072684edcbd3149fe456fa29e4503d8a224ad18432e0e8d742b
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/22.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/22.bin
new file mode 100644 (file)
index 0000000..d3ba1cb
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/22.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:292d7a1f9b78f12e61f243d4af0475516417237f950756e189cfcdf3c46a4bb8
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/23.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/23.bin
new file mode 100644 (file)
index 0000000..e81c5c2
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/23.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c7510ce2ccaf2e182172bbdd9193c852f0356555530783b0fb82287faf33b557
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/24.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/24.bin
new file mode 100644 (file)
index 0000000..9562730
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/24.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:397121d8b0ff519e31e974dbc223e850d77ec5d1d2080f0052852907fff63496
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/25.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/25.bin
new file mode 100644 (file)
index 0000000..9c8489b
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/25.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47d9d34c8ffcb17190c7f322650151cee3eae4b7d45afc3579993bb2df1fb734
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/26.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/26.bin
new file mode 100644 (file)
index 0000000..9182b0b
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/26.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ecf8ac8d5ff55cc640f395ef09d37474fea996935acfdbd9d6424f4bb200f4d
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/27.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/27.bin
new file mode 100644 (file)
index 0000000..dbaaa87
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/27.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd7eee058b488b6a8ed6863c5b25e18d7a2a08ef3c4c5dac188e29ab3113a14d
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/28.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/28.bin
new file mode 100644 (file)
index 0000000..8edf7a9
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/28.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3bb83983ccecd2462a27113c4a751650e7451d990ebd7af2f919cadb5160520a
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/29.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/29.bin
new file mode 100644 (file)
index 0000000..2c9e7a9
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/29.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2eb375ca8d5c50381ab301a4313224975ce07edbe8a9157ccf27ce49ae47f864
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/3.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/3.bin
index 81e750c..3272a92 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/3.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/3.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cda5f09486aa95998838cc1bb3d8630d9183a77b8fd9eb202c009d13cb9a72ea
-size 2184
+oid sha256:8e1e4aa121463ae0e3fcce48cab9aa6cb4834c4a21648909043308c5ba5065ca
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/30.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/30.bin
new file mode 100644 (file)
index 0000000..a3664bf
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/30.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a2f69062f295ed438823e00de77126a4b62cf1da31f4702f1ab0da3efaab23d
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/31.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/31.bin
new file mode 100644 (file)
index 0000000..75c7252
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/31.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ea202d95c7be3ca0e7692e21372338fdb621199f30cb30b052298c47c85cbde
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/32.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/32.bin
new file mode 100644 (file)
index 0000000..afcc23d
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/32.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82d9a1b5d8eeeb968944edbecd6d5561476ab28adae60007037470630a77031b
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/33.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/33.bin
new file mode 100644 (file)
index 0000000..31edaed
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/33.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9fe7443f218f549a34440c49e716dffacf0e8d55fd04994d87cbe758fb7b3f2a
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/34.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/34.bin
new file mode 100644 (file)
index 0000000..74e2f6e
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/34.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c963be104960122d464c81c4ba768934d832f922d40c307c965bccd4980a19c
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/35.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/35.bin
new file mode 100644 (file)
index 0000000..aee3231
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/35.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0041c80f3eaccd038e19ab1eb63ba7cedd1505258e4a7f862472c466921639dd
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/36.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/36.bin
new file mode 100644 (file)
index 0000000..5af295d
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/36.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb37f0614850af07e1940e20b902c25a8cbbb6096950276211fe8ae9d45b6e3b
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/37.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/37.bin
new file mode 100644 (file)
index 0000000..08e7632
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/37.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4597a580910a758f8f9cb63e79a20388d080a3f50bdfffd06664026c2e41d43
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/38.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/38.bin
new file mode 100644 (file)
index 0000000..8ae8fcd
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/38.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac7f653fb8ccf3d09faafb51a868c7e3260990cf1b7b40994a24b36beeb1c848
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/39.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/39.bin
new file mode 100644 (file)
index 0000000..6b82450
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/39.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7e080e275e5853a3048d6870e7c6c42e373e73d49e39579d7183286ed2e2c20
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/4.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/4.bin
index 09fceb0..c523abb 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/4.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/4.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31f81063025756a6e38d400ff0ca3b1fbef672bf4fa03f160c54a932e9ffb785
-size 2184
+oid sha256:5a325753ccddab243973221da32346af522399ada41b2109ca7636404a710e2f
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/40.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/40.bin
new file mode 100644 (file)
index 0000000..3ef15dd
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/40.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b488483ead5c24c552e3af472a72d6222b1a68d89258f0f6be9bcf846110d45
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/41.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/41.bin
new file mode 100644 (file)
index 0000000..b881756
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/41.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:055fd3adfbcbb2b8ce88e827ced1c04822ce8c564c4195550d8b20c6a1ab03e5
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/42.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/42.bin
new file mode 100644 (file)
index 0000000..7f4cdbb
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/42.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:015c4e6ef66ce8f4c43aa53ae3b3aa67e9e97749ad9e7891dd6625b0e966fe13
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/43.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/43.bin
new file mode 100644 (file)
index 0000000..29279ff
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/43.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:70be758488d528a7973c8f5aded680e0022c1fc7b1e57266cdb3b5cf57f6922d
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/44.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/44.bin
new file mode 100644 (file)
index 0000000..6b85513
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/44.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c39674e6c2fffafa850f6c65341945045fce6928a65b67601b3d8a338107c34d
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/45.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/45.bin
new file mode 100644 (file)
index 0000000..5881402
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/45.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe3d82f87d4cb025b5a6c428505b99768141708b83c5cc9df845467fbc77dbf7
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/46.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/46.bin
new file mode 100644 (file)
index 0000000..f65010e
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/46.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6fd1482a2da55fc9b60b20a269f39fd75a0031f1c37ad2791aa17b42e822dd5c
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/47.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/47.bin
new file mode 100644 (file)
index 0000000..903b5a9
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/47.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f1de468f7676ac035e32ea4c920385a6b8194827824f2c63f44e3712e08ea5a
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/48.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/48.bin
new file mode 100644 (file)
index 0000000..d7721f0
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/48.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e0ebfa6348233dff6aa8557d21c101bd996b1854cc88139d96efccb7e1c1073
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/49.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/49.bin
new file mode 100644 (file)
index 0000000..b204d6f
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/49.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:078b6b9734ce46e5219dbedf46307db4158a26cfab7416f1a58e74e35e424734
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/5.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/5.bin
index e6858ac..3d8f6df 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/5.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/5.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb365f3dde965aa9fbc29576c3c3a1c892cf477ea197f3bd0e770eb19b14e0b0
-size 2184
+oid sha256:c98beaed2a383ec7de4eded690b681951ae939f5409ab3db0fbfb691fc58950c
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/50.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/50.bin
new file mode 100644 (file)
index 0000000..4c7966b
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/50.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4393d4c2fe117f172a6d21198b66227c59ae4d3d66c02b20eda90b4fd522926b
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/51.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/51.bin
new file mode 100644 (file)
index 0000000..be48a96
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/51.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5b5b5eadb7aced18655a66272c049b8470db63d7782d99fdc8bf45943e69ad3
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/52.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/52.bin
new file mode 100644 (file)
index 0000000..1abfd36
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/52.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8354552f4cd1a439807b8c04ce50271090ebcd09cc3310314220357af23d0177
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/53.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/53.bin
new file mode 100644 (file)
index 0000000..6c5a43a
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/53.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a01dda102f1513e4807a307f2dd21b00a2b3fce775b78a5e9be2c848eae9c7b9
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/54.bin
new file mode 100644 (file)
index 0000000..a8929f8
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/54.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86d63b7c811cea72bcf962ff6bc1029ffcfb89d4f3fc37f6ee583325eeee86a7
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/55.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/55.bin
new file mode 100644 (file)
index 0000000..d0d6c8a
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/55.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:629dcb3c7c40263e249cd390a390413b230cdbb7ff2735236c7ecb58a29fb44a
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/56.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/56.bin
new file mode 100644 (file)
index 0000000..e1dbe15
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/56.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7f117a2e266e0af58dba5db10b4eae5a88c4af377559faf8c6c0e34743492cda
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/57.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/57.bin
new file mode 100644 (file)
index 0000000..b97215c
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/57.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:787f039f206723e6b3a99b02d4b0aa422a1d25b0b9c0b6cda36b3db9a8313b88
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/58.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/58.bin
new file mode 100644 (file)
index 0000000..da1335b
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/58.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a2402f56e07294eb28c58b2737c41f510c248df7e4e21e64a3d7af80ef44a104
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/59.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/59.bin
new file mode 100644 (file)
index 0000000..dceedb4
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/59.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ee6d63a4f99f8813150272da582c90bd7bc41d277be1411d27e6534276dc6da0
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/6.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/6.bin
index 112978e..f2007d8 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/6.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/6.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbf0c776d5c99709f6153fc9d0baca614f20e47d05b604bc9c039afb16022542
-size 2184
+oid sha256:9bb830a7016c6e932254c12a4c7414c3edf0f2e999b9443081e63154cacbb112
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/60.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/60.bin
new file mode 100644 (file)
index 0000000..f769356
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/60.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bda6f7c5a7d3de26c8fff1c022dcc4c34db001185225add46244730d12425e8d
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/7.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/7.bin
index 69cf95c..eac6616 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/7.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/7.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e0bee053cfe10c98fa05236b89e32ac6855a63918fd9ec1c69b501d1d43908f
-size 2184
+oid sha256:092ec51c2c468019c8fd45e6324a08650d975160aca167ba777071702fb7be7e
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/8.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/8.bin
index 417b0a6..1f7a295 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/8.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/8.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8be1901268dc16135eabbfdbbb41ad0a5574ffb0c0f9f8acce694c9ac5a23e91
-size 2184
+oid sha256:7818d47f352882ad38a2aa00997fb7d052d9968097bc2b26865a31390cb62b1f
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/9.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/9.bin
index aaec9d4..6b21e6b 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/9.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/9.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8af7f172f5483cf1fd252d7b614796fa625564b32666c8998eca121bbd62ac7
-size 2184
+oid sha256:75693ae18de9c22c29e322f99f808d4eb558811404c496f6c73af57777685ec4
+size 8184

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
index f39fe48..0f091fb 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
index 0615409..fc0599e 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
@@ -530,12 +530,13 @@ enum UIResourceTextId : uint16_t {
     STR_NO_PAIRED_DEV = 517,\r
     STR_IGNORE = 518,\r
     STR_START = 519,\r
-    STR_MAX_ID = 520,\r
+    STR_ARC_SCALE_LIST_DISPLAY = 520,\r
+    STR_MAX_ID = 521,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_EN,\r
+    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
index 2567714..f82b5f2 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ

diff --git a/tools/language_tool/Language_xml/input_list_en.txt b/tools/language_tool/Language_xml/input_list_en.txt
index 0d48cac..86267f0 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_en.txt
+++ b/tools/language_tool/Language_xml/input_list_en.txt
@@ -517,4 +517,5 @@ STR_SCHEDULE_NO_DATA$No schedules
 STR_SCHEDULE_NO_DATA_PROMPT$Please sync with the APP\r
 STR_NO_PAIRED_DEV$No paired devices are available\r
 STR_IGNORE$Ignore\r
-STR_START$Start
\ No newline at end of file
+STR_START$Start\r
+STR_ARC_SCALE_LIST_DISPLAY$Arc list display
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/input_list_zh.txt b/tools/language_tool/Language_xml/input_list_zh.txt
index 3ab2aa5..8b688eb 100644 (file)
--- a/tools/language_tool/Language_xml/input_list_zh.txt
+++ b/tools/language_tool/Language_xml/input_list_zh.txt
@@ -517,4 +517,5 @@ STR_SCHEDULE_NO_DATA$当前无日程
 STR_SCHEDULE_NO_DATA_PROMPT$请先通过APP同步\r
 STR_NO_PAIRED_DEV$暂无已配对设备\r
 STR_IGNORE$忽略\r
-STR_START$开始
\ No newline at end of file
+STR_START$开始\r
+STR_ARC_SCALE_LIST_DISPLAY$弧形列表显示
\ No newline at end of file

diff --git a/tools/language_tool/Language_xml/language.xlsx b/tools/language_tool/Language_xml/language.xlsx
index 95c1b8c..9dab50f 100644 (file)
Binary files a/tools/language_tool/Language_xml/language.xlsx and b/tools/language_tool/Language_xml/language.xlsx differ

diff --git a/tools/language_tool/Language_xml/language_en.xml b/tools/language_tool/Language_xml/language_en.xml
index ed0897d..306a5e1 100644 (file)
--- a/tools/language_tool/Language_xml/language_en.xml
+++ b/tools/language_tool/Language_xml/language_en.xml
@@ -519,4 +519,5 @@
        <lanstr id="STR_NO_PAIRED_DEV" value="No paired devices are available"/>
        <lanstr id="STR_IGNORE" value="Ignore"/>
        <lanstr id="STR_START" value="Start"/>
+       <lanstr id="STR_ARC_SCALE_LIST_DISPLAY" value="Arc list display"/>
 </language>

diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml
index 14b3f09..8470de5 100644 (file)
--- a/tools/language_tool/Language_xml/language_zh.xml
+++ b/tools/language_tool/Language_xml/language_zh.xml
@@ -519,4 +519,5 @@
        <lanstr id="STR_NO_PAIRED_DEV" value="暂无已配对设备"/>
        <lanstr id="STR_IGNORE" value="忽略"/>
        <lanstr id="STR_START" value="开始"/>
+       <lanstr id="STR_ARC_SCALE_LIST_DISPLAY" value="弧形列表显示"/>
 </language>

diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang
index f39fe48..0f091fb 100644 (file)
Binary files a/tools/language_tool/font/en.lang and b/tools/language_tool/font/en.lang differ

diff --git a/tools/language_tool/font/ui_resource_string.h b/tools/language_tool/font/ui_resource_string.h
index 0615409..fc0599e 100644 (file)
--- a/tools/language_tool/font/ui_resource_string.h
+++ b/tools/language_tool/font/ui_resource_string.h
@@ -530,12 +530,13 @@ enum UIResourceTextId : uint16_t {
     STR_NO_PAIRED_DEV = 517,\r
     STR_IGNORE = 518,\r
     STR_START = 519,\r
-    STR_MAX_ID = 520,\r
+    STR_ARC_SCALE_LIST_DISPLAY = 520,\r
+    STR_MAX_ID = 521,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {
-    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_EN,\r
+    LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_MAX\r
 }; // UITextLanguageTextId\r
 }\r

diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang
index 2567714..f82b5f2 100644 (file)
Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ