From de8cefb4d7aad819592ea20f349195a25caee53e Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=BD=97=E6=AD=A3?= <1732036298@qq.com> Date: Mon, 19 Aug 2024 11:19:40 +0000 Subject: [PATCH] Merge #728 into sdk602patch0626 from refs/changes/728/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/728 --- .../include/ui_resource_string.h | 5 +++-- .../aivoice/include/AiVoiceConnectingView.h | 4 ++-- .../aivoice/src/AiVoiceConnectingView.cpp | 18 +++++++++------- .../nativeui/player/src/PlayersModel.cpp | 8 ++----- .../nativeui/player/src/PlayersPresenter.cpp | 10 --------- .../nativeui/player/src/PlayersView.cpp | 20 ++++++++++++++---- .../themestyle/include/ThemeStyleModel.h | 4 ++-- .../themestyle/include/ThemeStyleView.h | 4 +++- .../themestyle/src/ThemeStylePresenter.cpp | 10 ++++++++- .../themestyle/src/ThemeStyleView.cpp | 20 +++++++++--------- .../service/ble_service/blemoder/bletest.cpp | 7 ++++++ .../service/ble_service/blemoder/bletest.h | 2 +- .../service/ble_service/bleservice/bleEvent.c | 1 + .../fd230/fs/user/res/connect/1.bin | 4 ++-- .../fd230/fs/user/res/connect/10.bin | 4 ++-- .../fd230/fs/user/res/connect/11.bin | 4 ++-- .../fd230/fs/user/res/connect/12.bin | 4 ++-- .../fd230/fs/user/res/connect/13.bin | 4 ++-- .../fd230/fs/user/res/connect/14.bin | 4 ++-- .../fd230/fs/user/res/connect/15.bin | 4 ++-- .../fd230/fs/user/res/connect/16.bin | 4 ++-- .../fd230/fs/user/res/connect/17.bin | 4 ++-- .../fd230/fs/user/res/connect/18.bin | 4 ++-- .../fd230/fs/user/res/connect/19.bin | 4 ++-- .../fd230/fs/user/res/connect/2.bin | 4 ++-- .../fd230/fs/user/res/connect/20.bin | 4 ++-- .../fd230/fs/user/res/connect/21.bin | 3 +++ .../fd230/fs/user/res/connect/22.bin | 3 +++ .../fd230/fs/user/res/connect/23.bin | 3 +++ .../fd230/fs/user/res/connect/24.bin | 3 +++ .../fd230/fs/user/res/connect/25.bin | 3 +++ .../fd230/fs/user/res/connect/26.bin | 3 +++ .../fd230/fs/user/res/connect/27.bin | 3 +++ .../fd230/fs/user/res/connect/28.bin | 3 +++ .../fd230/fs/user/res/connect/29.bin | 3 +++ .../fd230/fs/user/res/connect/3.bin | 4 ++-- .../fd230/fs/user/res/connect/30.bin | 3 +++ .../fd230/fs/user/res/connect/31.bin | 3 +++ .../fd230/fs/user/res/connect/32.bin | 3 +++ .../fd230/fs/user/res/connect/33.bin | 3 +++ .../fd230/fs/user/res/connect/34.bin | 3 +++ .../fd230/fs/user/res/connect/35.bin | 3 +++ .../fd230/fs/user/res/connect/36.bin | 3 +++ .../fd230/fs/user/res/connect/37.bin | 3 +++ .../fd230/fs/user/res/connect/38.bin | 3 +++ .../fd230/fs/user/res/connect/39.bin | 3 +++ .../fd230/fs/user/res/connect/4.bin | 4 ++-- .../fd230/fs/user/res/connect/40.bin | 3 +++ .../fd230/fs/user/res/connect/41.bin | 3 +++ .../fd230/fs/user/res/connect/42.bin | 3 +++ .../fd230/fs/user/res/connect/43.bin | 3 +++ .../fd230/fs/user/res/connect/44.bin | 3 +++ .../fd230/fs/user/res/connect/45.bin | 3 +++ .../fd230/fs/user/res/connect/46.bin | 3 +++ .../fd230/fs/user/res/connect/47.bin | 3 +++ .../fd230/fs/user/res/connect/48.bin | 3 +++ .../fd230/fs/user/res/connect/49.bin | 3 +++ .../fd230/fs/user/res/connect/5.bin | 4 ++-- .../fd230/fs/user/res/connect/50.bin | 3 +++ .../fd230/fs/user/res/connect/51.bin | 3 +++ .../fd230/fs/user/res/connect/52.bin | 3 +++ .../fd230/fs/user/res/connect/53.bin | 3 +++ .../fd230/fs/user/res/connect/54.bin | 3 +++ .../fd230/fs/user/res/connect/55.bin | 3 +++ .../fd230/fs/user/res/connect/56.bin | 3 +++ .../fd230/fs/user/res/connect/57.bin | 3 +++ .../fd230/fs/user/res/connect/58.bin | 3 +++ .../fd230/fs/user/res/connect/59.bin | 3 +++ .../fd230/fs/user/res/connect/6.bin | 4 ++-- .../fd230/fs/user/res/connect/60.bin | 3 +++ .../fd230/fs/user/res/connect/7.bin | 4 ++-- .../fd230/fs/user/res/connect/8.bin | 4 ++-- .../fd230/fs/user/res/connect/9.bin | 4 ++-- .../fd230/fs/user/res/font/en.lang | Bin 11426 -> 11447 bytes .../fs/user/res/font/ui_resource_string.h | 5 +++-- .../fd230/fs/user/res/font/zh.lang | Bin 10290 -> 10313 bytes .../Language_xml/input_list_en.txt | 3 ++- .../Language_xml/input_list_zh.txt | 3 ++- .../language_tool/Language_xml/language.xlsx | Bin 31591 -> 31637 bytes .../Language_xml/language_en.xml | 1 + .../Language_xml/language_zh.xml | 1 + tools/language_tool/font/en.lang | Bin 11426 -> 11447 bytes tools/language_tool/font/ui_resource_string.h | 5 +++-- tools/language_tool/font/zh.lang | Bin 10290 -> 10313 bytes 84 files changed, 238 insertions(+), 93 deletions(-) create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/21.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/22.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/23.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/24.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/25.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/26.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/27.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/28.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/29.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/30.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/31.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/32.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/33.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/34.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/35.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/36.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/37.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/38.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/39.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/40.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/41.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/42.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/43.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/44.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/45.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/46.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/47.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/48.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/49.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/50.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/51.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/52.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/53.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/54.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/55.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/56.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/57.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/58.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/59.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/connect/60.bin 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 061540995..fc0599e31 100644 --- 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, STR_IGNORE = 518, STR_START = 519, - STR_MAX_ID = 520, + STR_ARC_SCALE_LIST_DISPLAY = 520, + STR_MAX_ID = 521, }; // UIResourceTextId enum FontLanguageId : uint8_t { - LANGUAGE_ID_ZH, LANGUAGE_ID_EN, + LANGUAGE_ID_ZH, LANGUAGE_ID_MAX }; // UITextLanguageTextId } 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 28eb6ac65..5be7c8a68 100644 --- 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 29514a936..8e8d88f38 100644 --- 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 60517bcce..3e2aa2c79 100644 --- 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 0eafd368c..858364f59 100644 --- 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() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ButtonOnClickListener::MusicDeleteButtonOnClick"); - 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(); - } - return; } void ButtonOnClickListener::PlayerModelButtonOnClick() 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 6cde8c3ad..204cce835 100644 --- 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; } musicList->SetPosition(68, 120, 330, 320); - musicList->SetStartIndex(0); + musicList->SetStartIndex(PlayersModel::GetInstance()->GetCurrentIndex()); musicList->SetThrowDrag(true); musicList->SetIntercept(true); musicList->SetMaxScrollDistance(1000); musicList->SetDragACCLevel(5); musicList->SetSwipeACCLevel(800); /*设置手指抬起屏幕后的补偿距离。*/ musicList->SetReboundSize(35); + // musicList->SetScrollBlankSize(35); // 增加表冠控制 musicList->SetRotateFactor(1.0); musicList->RequestFocus(); @@ -344,9 +345,6 @@ namespace OHOS musicListScrollView->Add(musicListIsEmptyLabel); musicListScrollView->Add(musicList); musicListGroupView->Add(musicListScrollView); - /* -------------------------------------------------------------------------- */ - UpdateMusicListStatus(); // 音乐列表刷新 - /* -------------------------------------------------------------------------- */ return musicListGroupView; } @@ -878,6 +876,19 @@ namespace OHOS musicListIsEmptyImage->SetVisible(false); musicListIsEmptyLabel->SetVisible(false); musicList->SetVisible(true); + if (musicAdapter) + { + int count = musicAdapter->GetCount(); + if (count > 4) + { + musicList->SetHeight(320); + } + else + { + musicList->SetHeight(count * 70); + } + } + musicList->RefreshList(); } } } @@ -1361,6 +1372,7 @@ namespace OHOS group[thisView] = groupview; Add(group[thisView]); } + UpdateMusicListStatus();/*每次切换到音乐列表都将更新一次列表*/ return true; } 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 31f82aabe..ce038bf6a 100644 --- 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 c97f73704..b9a870d06 100644 --- 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 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 13aa916b1..b43785e8c 100644 --- 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 39ad7f285..f6b970827 100644 --- 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 669cf3aad..132de8ff0 100644 --- 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 76e5559e6..5d54a924f 100644 --- 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 58cd7ff04..48b1c2676 100644 --- 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 ble_reply_cmd(DIAL_INSTALL_REPY_CMD,1); + ble_mp3_list_update(); break; case 3://dial 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 51172e52a..98fa9c8c9 100644 --- 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 bc7b321f1..a7f1d422c 100644 --- 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 8c1fbe2dc..f85fe4688 100644 --- 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 5f9235dbb..51040fc5c 100644 --- 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 7c38d2614..7a33bc107 100644 --- 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 305b5d9bd..a31481555 100644 --- 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 5d1ff6922..f8de363f4 100644 --- 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 f2264c242..34573ed2c 100644 --- 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 edadda4bd..fd2664d92 100644 --- 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 021977529..160f95ff0 100644 --- 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 ed33c981f..e21fb9f8f 100644 --- 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 3a46bc804..84d0a5ba0 100644 --- 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 9487c4a2b..3ccceb3f4 100644 --- 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 index 000000000..46323642b --- /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 index 000000000..d3ba1cbd0 --- /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 index 000000000..e81c5c2a8 --- /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 index 000000000..95627302f --- /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 index 000000000..9c8489b68 --- /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 index 000000000..9182b0b1f --- /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 index 000000000..dbaaa8793 --- /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 index 000000000..8edf7a9d3 --- /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 index 000000000..2c9e7a9dd --- /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 81e750c85..3272a92ba 100644 --- 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 index 000000000..a3664bf7a --- /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 index 000000000..75c7252fb --- /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 index 000000000..afcc23d82 --- /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 index 000000000..31edaed76 --- /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 index 000000000..74e2f6e50 --- /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 index 000000000..aee3231d3 --- /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 index 000000000..5af295d7f --- /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 index 000000000..08e763260 --- /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 index 000000000..8ae8fcd53 --- /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 index 000000000..6b82450c0 --- /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 09fceb0a5..c523abbbd 100644 --- 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 index 000000000..3ef15dd6f --- /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 index 000000000..b881756e4 --- /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 index 000000000..7f4cdbb31 --- /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 index 000000000..29279ffaa --- /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 index 000000000..6b8551335 --- /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 index 000000000..5881402c9 --- /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 index 000000000..f65010e2a --- /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 index 000000000..903b5a9cb --- /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 index 000000000..d7721f0a2 --- /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 index 000000000..b204d6f1e --- /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 e6858ac1e..3d8f6dfa1 100644 --- 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 index 000000000..4c7966b54 --- /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 index 000000000..be48a962f --- /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 index 000000000..1abfd36c5 --- /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 index 000000000..6c5a43a6a --- /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 index 000000000..a8929f8a8 --- /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 index 000000000..d0d6c8a6b --- /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 index 000000000..e1dbe1555 --- /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 index 000000000..b97215cb9 --- /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 index 000000000..da1335bd5 --- /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 index 000000000..dceedb491 --- /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 112978e77..f2007d8a2 100644 --- 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 index 000000000..f76935642 --- /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 69cf95cf6..eac66168a 100644 --- 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 417b0a602..1f7a2952d 100644 --- 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 aaec9d4a6..6b21e6bd6 100644 --- 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 f39fe487aefb790d1f86bad6ac1d56b16a6d1855..0f091fb31a84ecd20a10173c9157e4fb36c7016d 100644 GIT binary patch delta 55 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 QK*Q-hyujQT_8-�Pm*OQ2+n{ delta 24692 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 z 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 + diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml index 14b3f0986..8470de53d 100644 --- a/tools/language_tool/Language_xml/language_zh.xml +++ b/tools/language_tool/Language_xml/language_zh.xml @@ -519,4 +519,5 @@ + diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang index f39fe487aefb790d1f86bad6ac1d56b16a6d1855..0f091fb31a84ecd20a10173c9157e4fb36c7016d 100644 GIT binary patch delta 55 zcmZ1!xjj;}wJXRuHID%WaBdV;Zuqi