Merge #1306 into sdk602patch0911 from refs/changes/1306/head
author胡传军 <1224667075@qq.com>
Thu, 31 Oct 2024 13:37:47 +0000 (13:37 +0000)
committer袁清梦 <3449750381@qq.com>
Thu, 31 Oct 2024 13:37:47 +0000 (13:37 +0000)
commit367755a9dd7da17c5d18c332f8ad930f1a289a68
treed96e9a6769192e85d0ca057d52b0b93dbf9c1f24
parent69371ee7565532214c0f90c91bb2f84a663df3a7
Merge #1306 into sdk602patch0911 from refs/changes/1306/head

Code review from 胡传军

* refs/changes/1306/head: (8 commits squashed)

  - 修改SOS 8s触发为3s触发

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

  - 蓝牙上传tar文件位置修改

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

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

  - A2DP断连修改

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

  - 修改4G模块最大声音

Signed-off-by: aliyun8003852482 <1224667075@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/1306
cat1modem/src/cat1Service.py
code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/system/cat1ota/cat1Service.py
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230_4part/fs/system/cat1ota/cat1Service.py