Merge #76 into xts_origin from refs/changes/76/head 77/target/2 79/target/1
author罗正 <1732036298@qq.com>
Thu, 25 Apr 2024 02:13:33 +0000 (02:13 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Thu, 25 Apr 2024 02:13:33 +0000 (02:13 +0000)
commit627328f859929c848a40cb3b91cd88dedb149687
tree0b975cc73245ec68e1c763c7c97a83de2ca25919
parent4872aedd72cdcea32120ce2a8f806df06f9b2b01
Merge #76 into xts_origin from refs/changes/76/head

Code review from 罗正

* refs/changes/76/head: (12 commits squashed)

  - 增加震动提醒功能

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

  - 1.设置中增加网络与通话Slice,显示方式Slice去除快速访问Slice
    2.修改多国语言适配设置界面
    3.增加网络与通话界面图片

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

  - VoLTE,移动数据按钮增加点击监听

  - 添加移动数据选项页面

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

  - 增加运动识别Slice

  - 修改设置视图以适配多国语言

  - 1.利用ConfigModel保存用户设置的VoLTE通话和运动识别开关状态。
    2.解决运动识别视图右滑不退出问题。
    3.删除系统视图中的4G能力开关并移动到网络与通话中。

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

  - 修改设置视图中开关机icon,优化显示方式视图的退出方式,修改开关机视图的incon图标

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/76
28 files changed:
code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModelC.h
code/sdk/application/wearable/fd230app/nativeui/config/src/ConfigModel.cpp
code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp
code/sdk/application/wearable/fd230app/nativeui/networkandcall/include/NetworkAndCallC.h [new file with mode: 0644]
code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp
code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootDeviceView.cpp
code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootView.cpp
code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/ShutdownDeviceView.cpp
code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopPresenter.h
code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopView.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/system/include/SystemView.h
code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTINGS_POWER_CONTROL.bin [deleted file]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTINGS_SHUTDOWN_AND_RESTART.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_REBOOT.bin [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_SHUTDOWN.bin [new file with mode: 0644]
code/sdk/drivers/peripheral/utils/custom_utils.c
code/sdk/drivers/peripheral/utils/custom_utils.h