Merge #1315 into sdk602patch0911 from refs/changes/1315/head
author罗正 <1732036298@qq.com>
Fri, 1 Nov 2024 08:53:44 +0000 (08:53 +0000)
committer袁清梦 <3449750381@qq.com>
Fri, 1 Nov 2024 08:53:44 +0000 (08:53 +0000)
commit640f257fe06564040d4f7023b4e70883abc82db4
treea5c2ee771c38a2d4cc6864310597e8d2cde3ae19
parent5424320a9be31ec93239c1050945152e208bfca7
Merge #1315 into sdk602patch0911 from refs/changes/1315/head

ScreenTurnOn与ScreenTurnOff配套使用优化

* refs/changes/1315/head: (3 commits squashed)

  - ScreenTurnOn与ScreenTurnOff配套使用优化

  - 解决蓝牙耳机按键退出有概率不取消常亮屏

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

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1315
code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothReconnectView.cpp
code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingModel.cpp