Merge #1232 into sdk602patch0911 from refs/changes/1232/head 1233/target/1 1234/target/1 1235/target/1 1236/target/1
author袁清梦 <3449750381@qq.com>
Mon, 21 Oct 2024 07:41:40 +0000 (07:41 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Mon, 21 Oct 2024 07:41:40 +0000 (07:41 +0000)
commit8f15e56c385e9a6641a57fac4aeb0fa1a321f7e4
treeab3910dcd098e0851b7fedda4a40b954ad52477b
parentd227f4533709eee624785f809260839216ecc243
Merge #1232 into sdk602patch0911 from refs/changes/1232/head

Code review from 袁清梦

* refs/changes/1232/head: (9 commits squashed)

  - #105 5手表开启勿扰模式表盘界面会显示勿扰图标,重启后表盘勿扰图标消失(实际还是勿扰状态,下拉状态栏的勿扰图标是高亮的)

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - 系统:删除res无用资源

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - 语音助手:修复对话界面的异常滑动

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - 表盘:同步修改表盘分区路径

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

Signed-off-by: Caisking <3449750381@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/1232
code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
code/sdk/application/wearable/fd230app/nativeui/assistant/src/AssistantAnswerView.cpp
code/sdk/application/wearable/fd230app/nativeui/set_dial/include/SetDialModel.h
code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLogModel.h
code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/birdie.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/birdie.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/obsidianrhythm.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/obsidianrhythm.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/satellite.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/satellite.bin with 100% similarity]
code/sdk/drivers/peripheral/utils/custom_utils.c