Merge #1109 into sdk602patch0626 from refs/changes/1109/head
author罗正 <1732036298@qq.com>
Sat, 5 Oct 2024 08:25:08 +0000 (08:25 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Sat, 5 Oct 2024 08:25:08 +0000 (08:25 +0000)
commit8e4bd8a85a4e7001c22a24de07e1b2f4b9f8dd08
treed8e6c5ca42ae8afc6acfd81fa95fc814ae1f4f79
parent3fff5593670cf680e1e5409885cf01223ba32446
Merge #1109 into sdk602patch0626 from refs/changes/1109/head

Code review from 罗正

* refs/changes/1109/head: (4 commits squashed)

  - 修改音乐来源界面,蓝牙耳机连接状态错误显示

  - 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

  - 解决恢复出厂设置后进入训练界面右滑退出进入语言界面

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/1109
code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp
code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp