From: Caisking <3449750381@qq.com> Date: Fri, 2 Aug 2024 06:43:02 +0000 (+0800) Subject: 更新卡片管理UI X-Git-Tag: release_V1.2.70_20241020_135402~690^2~30 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=0511be0fcd61c4dc1c1dae0d645c0c6c86162e11;p=mirrors%2FFD230.git 更新卡片管理UI --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp index 30434092d..247c87cd6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp @@ -215,7 +215,7 @@ namespace OHOS VertViewLoad(); // 添加上下拉界面 mainSwipeGroup->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); mainSwipeGroup->SetAnimatorTime(50); - mainSwipeGroup->SetLoopState(true); // 主界面循环 + mainSwipeGroup->SetLoopState(false); // 主界面循环 mainSwipeGroup->EnableScreenCap(true); // 主界面截屏滑动 mainSwipeGroup->RegisterSwipeCallback(callback); // 主界面动画回调 diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetMainView.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetMainView.cpp index 831835aad..cb12d9701 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetMainView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetMainView.cpp @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-07-04 19:24:05 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-08-02 14:31:07 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/set_card/src/SetMainView.cpp + */ /*** * @Date: 2024-06-11 20:17:37 * @LastEditors: Caisking 3449750381@qq.com @@ -26,7 +32,7 @@ namespace OHOS { static SetMainView *g_pSetMainView{nullptr}; - static constexpr const char *BUTTONENTER_IMAGE = "user/res/users/Enter.bin"; + static constexpr const char *BUTTONENTER_IMAGE = "user/res/users/AddCard.bin"; SetMainView::SetMainView() { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetMainView::SetMainView"); @@ -54,10 +60,10 @@ namespace OHOS { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "bool SetMainView::InitView()"); // 初始化label - InitLabelExt(setLabel, 83, 50, 300, 35, "labletitle", STR_CARD_MANAGEMENT, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(setLabel, 83, 330, 300, 35, "labletitle", STR_CARD_MANAGEMENT, DEFAULT_VECTOR_FONT_FILENAME, 30); Add(setLabel); // 初始化Button - InitButton(setButton, 183, 183, 100, 100, SET_CARD_MAIN); + InitButton(setButton, 158, 158, 150, 150, SET_CARD_MAIN); setButton->SetImageSrc(BUTTONENTER_IMAGE, BUTTONENTER_IMAGE); setButton->SetOnClickListener(static_cast(SetCardPresenter::GetInstance())); Add(setButton); diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/users/AddCard.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/users/AddCard.bin new file mode 100644 index 000000000..8048aa803 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/users/AddCard.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0bbbbef2df31ab8a3242249a58e6095cdc005e72def05881bbe05a1dbd2ab1e +size 15224 diff --git a/tools/image_converter_tool/test/hert/users/AddCard.png b/tools/image_converter_tool/test/hert/users/AddCard.png new file mode 100644 index 000000000..d2596adf8 Binary files /dev/null and b/tools/image_converter_tool/test/hert/users/AddCard.png differ