Merge #1400 into sdk602patch0911 from refs/changes/1400/head

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 <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1400

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 b9d1a0a..fd6e393 100644 (file)
--- 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 ba33350..b22d6ae 100644 (file)
--- 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\r
  * @Date: 2024-03-30 18:29:39\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-09-19 20:07:09\r
+ * @LastEditTime: 2024-11-14 18:32:02\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h\r
  */\r
 #ifndef SYSTEM_VIEW_H\r
@@ -112,8 +112,10 @@ namespace OHOS
         void NeedToUpdateImageinit(void);\r
         UILabelExt *Title{nullptr}; // 标题\r
         UIScrollView *SystemScrollView[MAX_SYSTEMVIEWID]{nullptr};\r
-        UILabelButtonExt *SystemViewLabelButton[7]{nullptr};\r
-        UILabelExt *SystemViewLabel[7]{nullptr};\r
+        UILabelButtonExt *SystemViewLabelButton[10]{nullptr};\r
+        UILabelExt *SystemViewLabel[10]{nullptr};\r
+        int SystemViewLabelNum{0};\r
+        int SystemViewButtonNum{0};\r
         UIImageView *NeedToUpdateImage{nullptr}; // 提示需要系统更新的icon图片\r
         UIImageView *temp{nullptr};\r
         bool viewInitStatus{false};\r

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 057508b..1ab069b 100644 (file)
--- 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,\r
         };\r
         int pos_y = 153;\r
-        for (int i = 0; i < sizeof(labelSetups) / sizeof(labelSetups[0]); ++i)\r
+        SystemViewLabelNum = sizeof(labelSetups) / sizeof(labelSetups[0]);\r
+        for (int i = 0; i < SystemViewLabelNum; ++i)\r
         {\r
 \r
             labelConfig.top = pos_y + 120*i;\r
@@ -230,7 +231,8 @@ namespace OHOS
         };\r
 \r
         int pos_y = 120;\r
-        for (int i = 0; i < sizeof(buttonSetups) / sizeof(buttonSetups[0]); ++i)\r
+        SystemViewButtonNum = sizeof(buttonSetups) / sizeof(buttonSetups[0]);\r
+        for (int i = 0; i < SystemViewButtonNum; ++i)\r
         {\r
             ButtonConfig buttonconfig = {\r
                 .x = 43,\r
@@ -316,7 +318,7 @@ namespace OHOS
             {\r
                 return;\r
             }\r
-            temp->SetPosition(43, 840, 380, 40);\r
+            temp->SetPosition(43, (SystemViewButtonNum + 1) * 120, 380, 40);\r
             temp->SetVisible(false);\r
             SystemScrollView[SYSTEMVIEW]->Add(temp);\r
         }\r

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 (file)
index 0000000..842290c
--- /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 (file)
index 0000000..06cf82a
--- /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