Merge #1118 into sdk602patch0626 from refs/changes/1118/head 1121/target/1
author罗正 <1732036298@qq.com>
Tue, 8 Oct 2024 02:47:34 +0000 (02:47 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Tue, 8 Oct 2024 02:47:34 +0000 (02:47 +0000)
commita3a3917136c384a3fc2401450721d7edcf4060e5
tree9c296b8e8799688f786b0a67038fe7c7a11f0931
parent3e22a7413e4e34a17ea371a4e0e0c8b868077921
Merge #1118 into sdk602patch0626 from refs/changes/1118/head

Code review from 罗正

* refs/changes/1118/head: (12 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

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

  - 屏蔽连接动画界面的title

  - 优化语言列表,解决语言列表最后一项被遮挡住bug

  - 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

  - 语言列表修改

  - 解决蓝牙耳机界面内存泄漏问题
    解决蓝牙耳机界面,如果进入搜索界面开启定时器后,按按键未关闭定时器问题

  - 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/1118
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothDeviceCaseListAdapter.cpp
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsConnFailMessageView.cpp