Merge #964 into sdk602patch0626 from refs/changes/964/head 965/target/1
author罗正 <1732036298@qq.com>
Fri, 13 Sep 2024 09:48:14 +0000 (09:48 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Fri, 13 Sep 2024 09:48:14 +0000 (09:48 +0000)
commit48170b60fce39018a2e2eaabf665fbad92995ad8
treec99d6ce447f95929018ed78e9d29b3a4d5bf5482
parentbac2ad638a516f089723fb494c0bdaf014279f28
Merge #964 into sdk602patch0626 from refs/changes/964/head

Code review from 罗正

* refs/changes/964/head: (21 commits squashed)

  - 闹钟UI优化:
    1.#636,解决,手表,闹钟只响铃3次bug
    2.闹钟编辑界面优化
    3.闹钟界面中星期缩写中文为:一,二...日,其他语言为:Mon,Tue...Sun

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

  - #534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟bug

  - 解决#534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟bug
    修改闹钟弹窗无操作50s后自动关闭

  - #642,解决:删除多余闹钟后,界面不能显示剩余闹钟bug

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

  - #370,解决:下拉状态栏中,开启4G开关,停留在下拉菜单中,信号格状态不刷新(息屏时不会刷新)bug
    #618,解决:4G开关开启,重启手表,4G开关状态颜色响应比较慢bug

  - #639,解决:设置-图标不圆,有缺失,勿扰模式,更换卡片,省电模式bug

  - #154,解决:手表端超时不操作后,绑定请求会继续留在手表界面bug

  - 6.天气界面UI修改,与figma上设计保持一致

  - 优化弧形列表,调整应用之间间隔,调整文字对齐为左对齐

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

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

  - #663,解决:手表,APP开启消息提醒后,手表喝水提醒不弹窗bug

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

  - #644,解决,计时器显示问题bug
    #645,解决,  计时器显示错误bug

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

  - #661,解决,手表,天气天气图标显示多云,文字显示中雨bug

  - 闹钟界面多国语言资源添加

  - 闹钟界面适配多国语言

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

Signed-off-by: 罗正 <1732036298@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/964
130 files changed:
code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h
code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmConfigView.h
code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmSetWeekView.h
code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmConfigView.cpp
code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmMaxClock.cpp
code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmSetWeekView.cpp
code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ar.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/az.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/cs.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/de.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/el.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/es.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fa.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fi.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/fr.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/he.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hi.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/hr.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/id.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/it.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ko.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ms.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/nl.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pl.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/pt.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ro.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ru.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/sv.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/th.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/tr.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uk.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/uz.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/vi.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
tools/language_tool/Language_xml/input_list_ar.txt
tools/language_tool/Language_xml/input_list_az.txt
tools/language_tool/Language_xml/input_list_cs.txt
tools/language_tool/Language_xml/input_list_de.txt
tools/language_tool/Language_xml/input_list_el.txt
tools/language_tool/Language_xml/input_list_en.txt
tools/language_tool/Language_xml/input_list_es.txt
tools/language_tool/Language_xml/input_list_fa.txt
tools/language_tool/Language_xml/input_list_fi.txt
tools/language_tool/Language_xml/input_list_fr.txt
tools/language_tool/Language_xml/input_list_he.txt
tools/language_tool/Language_xml/input_list_hi.txt
tools/language_tool/Language_xml/input_list_hr.txt
tools/language_tool/Language_xml/input_list_id.txt
tools/language_tool/Language_xml/input_list_it.txt
tools/language_tool/Language_xml/input_list_ja.txt
tools/language_tool/Language_xml/input_list_ko.txt
tools/language_tool/Language_xml/input_list_ms.txt
tools/language_tool/Language_xml/input_list_nl.txt
tools/language_tool/Language_xml/input_list_pl.txt
tools/language_tool/Language_xml/input_list_pt.txt
tools/language_tool/Language_xml/input_list_ro.txt
tools/language_tool/Language_xml/input_list_ru.txt
tools/language_tool/Language_xml/input_list_sv.txt
tools/language_tool/Language_xml/input_list_th.txt
tools/language_tool/Language_xml/input_list_tr.txt
tools/language_tool/Language_xml/input_list_uk.txt
tools/language_tool/Language_xml/input_list_uz.txt
tools/language_tool/Language_xml/input_list_vi.txt
tools/language_tool/Language_xml/input_list_zh.txt
tools/language_tool/Language_xml/language_ar.xml
tools/language_tool/Language_xml/language_az.xml
tools/language_tool/Language_xml/language_cs.xml
tools/language_tool/Language_xml/language_custom.xlsx
tools/language_tool/Language_xml/language_de.xml
tools/language_tool/Language_xml/language_el.xml
tools/language_tool/Language_xml/language_en.xml
tools/language_tool/Language_xml/language_es.xml
tools/language_tool/Language_xml/language_fa.xml
tools/language_tool/Language_xml/language_fi.xml
tools/language_tool/Language_xml/language_fr.xml
tools/language_tool/Language_xml/language_he.xml
tools/language_tool/Language_xml/language_hi.xml
tools/language_tool/Language_xml/language_hr.xml
tools/language_tool/Language_xml/language_id.xml
tools/language_tool/Language_xml/language_it.xml
tools/language_tool/Language_xml/language_ja.xml
tools/language_tool/Language_xml/language_ko.xml
tools/language_tool/Language_xml/language_ms.xml
tools/language_tool/Language_xml/language_nl.xml
tools/language_tool/Language_xml/language_pl.xml
tools/language_tool/Language_xml/language_pt.xml
tools/language_tool/Language_xml/language_ro.xml
tools/language_tool/Language_xml/language_ru.xml
tools/language_tool/Language_xml/language_sv.xml
tools/language_tool/Language_xml/language_th.xml
tools/language_tool/Language_xml/language_tr.xml
tools/language_tool/Language_xml/language_uk.xml
tools/language_tool/Language_xml/language_uz.xml
tools/language_tool/Language_xml/language_vi.xml
tools/language_tool/Language_xml/language_zh.xml
tools/language_tool/font/ar.lang
tools/language_tool/font/az.lang
tools/language_tool/font/cs.lang
tools/language_tool/font/de.lang
tools/language_tool/font/el.lang
tools/language_tool/font/en.lang
tools/language_tool/font/es.lang
tools/language_tool/font/fa.lang
tools/language_tool/font/fi.lang
tools/language_tool/font/fr.lang
tools/language_tool/font/he.lang
tools/language_tool/font/hi.lang
tools/language_tool/font/hr.lang
tools/language_tool/font/id.lang
tools/language_tool/font/it.lang
tools/language_tool/font/ja.lang
tools/language_tool/font/ko.lang
tools/language_tool/font/ms.lang
tools/language_tool/font/nl.lang
tools/language_tool/font/pl.lang
tools/language_tool/font/pt.lang
tools/language_tool/font/ro.lang
tools/language_tool/font/ru.lang
tools/language_tool/font/sv.lang
tools/language_tool/font/th.lang
tools/language_tool/font/tr.lang
tools/language_tool/font/ui_resource_string.h
tools/language_tool/font/uk.lang
tools/language_tool/font/uz.lang
tools/language_tool/font/vi.lang
tools/language_tool/font/zh.lang