Merge #942 into sdk602patch0626 from refs/changes/942/head 944/target/2
author罗正 <1732036298@qq.com>
Thu, 12 Sep 2024 01:53:38 +0000 (01:53 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Thu, 12 Sep 2024 01:53:38 +0000 (01:53 +0000)
commit2ebf02983aaac40c237db473c54f8470e7f3536c
tree82625ef14910196ebd22bad5134b86d87ac058a6
parentb81d26acecaa8c832e2c5e8ca2ff29664792e48e
Merge #942 into sdk602patch0626 from refs/changes/942/head

Code review from 罗正

* refs/changes/942/head: (10 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上设计保持一致

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/942
18 files changed:
code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
code/sdk/application/wearable/fd230app/nativeui/alarm/include/MainAlarmView.h
code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h
code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp
code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp
code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp
code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp
code/sdk/application/wearable/service/msg_center/include/notify/pairing_notification.h
code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTINGS_CARDSET.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTINGS_CHANGEDIAL.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTINGS_DISTURB.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTINGS_SAVEELE.bin [new file with mode: 0644]