From 10b7426547dfd0fd86783e97fa3c30179c086699 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=BD=97=E6=AD=A3?= <1732036298@qq.com> Date: Thu, 14 Nov 2024 11:04:08 +0000 Subject: [PATCH] Merge #1400 into sdk602patch0911 from refs/changes/1400/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 罗正 * refs/changes/1400/head: (6 commits squashed) - 将震动服务初始化放到ohos_startup前，并在震动服务初始化成功后震动一次， 经测试有无LCD都能震动 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - 解决系统界面最后一个组件被遮挡住bug - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - 弧形列表资源图片提交 Signed-off-by: 罗正 <1732036298@qq.com> Reviewed-by: Caisking <3449750381@qq.com> Reviewed-by: 罗正 <1732036298@qq.com> Reviewed-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Reviewed-by: aliyun6865282430 <1624952103@qq.com> Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1400 --- .../nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp | 3 ++- .../fd230app/nativeui/system/include/SystemView.h | 8 +++++--- .../wearable/fd230app/nativeui/system/src/SystemView.cpp | 8 +++++--- .../user/res/themestyle/circlelist/circleListImage1.bin | 3 +++ .../user/res/themestyle/circlelist/circleListImage2.bin | 3 +++ 5 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/themestyle/circlelist/circleListImage1.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/themestyle/circlelist/circleListImage2.bin diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp index b9d1a0abf..fd6e3936e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceConnectTimeoutView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-11-05 11:09:24 + * @LastEditTime: 2024-11-14 17:29:47 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AivoiceConnectTimeoutView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -280,6 +280,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "text = %s", text.c_str()); NoteLabel->SetText(text.c_str()); NoteLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + NoteLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); NoteLabel->Invalidate(); } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h index ba3335044..b22d6ae13 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-30 18:29:39 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-19 20:07:09 + * @LastEditTime: 2024-11-14 18:32:02 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h */ #ifndef SYSTEM_VIEW_H @@ -112,8 +112,10 @@ namespace OHOS void NeedToUpdateImageinit(void); UILabelExt *Title{nullptr}; // 标题 UIScrollView *SystemScrollView[MAX_SYSTEMVIEWID]{nullptr}; - UILabelButtonExt *SystemViewLabelButton[7]{nullptr}; - UILabelExt *SystemViewLabel[7]{nullptr}; + UILabelButtonExt *SystemViewLabelButton[10]{nullptr}; + UILabelExt *SystemViewLabel[10]{nullptr}; + int SystemViewLabelNum{0}; + int SystemViewButtonNum{0}; UIImageView *NeedToUpdateImage{nullptr}; // 提示需要系统更新的icon图片 UIImageView *temp{nullptr}; bool viewInitStatus{false}; diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp index 057508bee..1ab069be3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp @@ -193,7 +193,8 @@ namespace OHOS .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION, }; int pos_y = 153; - for (int i = 0; i < sizeof(labelSetups) / sizeof(labelSetups[0]); ++i) + SystemViewLabelNum = sizeof(labelSetups) / sizeof(labelSetups[0]); + for (int i = 0; i < SystemViewLabelNum; ++i) { labelConfig.top = pos_y + 120*i; @@ -230,7 +231,8 @@ namespace OHOS }; int pos_y = 120; - for (int i = 0; i < sizeof(buttonSetups) / sizeof(buttonSetups[0]); ++i) + SystemViewButtonNum = sizeof(buttonSetups) / sizeof(buttonSetups[0]); + for (int i = 0; i < SystemViewButtonNum; ++i) { ButtonConfig buttonconfig = { .x = 43, @@ -316,7 +318,7 @@ namespace OHOS { return; } - temp->SetPosition(43, 840, 380, 40); + temp->SetPosition(43, (SystemViewButtonNum + 1) * 120, 380, 40); temp->SetVisible(false); SystemScrollView[SYSTEMVIEW]->Add(temp); } diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/themestyle/circlelist/circleListImage1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/themestyle/circlelist/circleListImage1.bin new file mode 100644 index 000000000..842290ce9 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/themestyle/circlelist/circleListImage1.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5676b0691316ba18f7884f0af3cbb404fa756b9b12f0807fbd347e7b3693d9a2 +size 48424 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/themestyle/circlelist/circleListImage2.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/themestyle/circlelist/circleListImage2.bin new file mode 100644 index 000000000..06cf82a74 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/themestyle/circlelist/circleListImage2.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6b8038f2b9622d41ba3f1a29d11ed44863558792a963cecd12c719c7157db3b +size 3480 -- 2.17.1