Merge #1306 into sdk602patch0911 from refs/changes/1306/head

Code review from 胡传军

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

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

  - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

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

  - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

  - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

  - A2DP断连修改

  - Merge branch 'sdk602patch0911' 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

diff --git a/cat1modem/src/cat1Service.py b/cat1modem/src/cat1Service.py
index ecaa9d4..8678bb3 100644 (file)
--- a/cat1modem/src/cat1Service.py
+++ b/cat1modem/src/cat1Service.py
@@ -84,7 +84,7 @@ log.basicConfig(level=log.INFO)
 cat1service_log = log.getLogger("cat1service")
 
 #设置通话音量
-voiceCall.setVolume(8)
+voiceCall.setVolume(10)
 print("voice call volume {}".format(voiceCall.getVolume()))
 # lpm_fd = pm.create_wakelock("system_lock", len("system_lock"))
 pm.autosleep(1)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
index 5159016..14a7e76 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/BluetoothServiceOptionsPresenter.cpp
@@ -114,7 +114,7 @@ namespace OHOS
 
                         ConfigModel::GetInstance()->SetA2DPState(false);
                         uapi_a2dp_snk_disconnect();
-                        classicBlueToothView->init_connect_timer(BluetoothServiceOptionsView::DISCONNECT_HFP);
+                        classicBlueToothView->init_connect_timer(BluetoothServiceOptionsView::DISCONNECT_A2DP);
                         // uapi_hfp_disconnect();
                     //uapi_disconnect_remote_device();
                         // errcode_t ret = gap_ble_set_ctkd_enable(false);

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/system/cat1ota/cat1Service.py b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/system/cat1ota/cat1Service.py
index ecaa9d4..8678bb3 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/system/cat1ota/cat1Service.py
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/system/cat1ota/cat1Service.py
@@ -84,7 +84,7 @@ log.basicConfig(level=log.INFO)
 cat1service_log = log.getLogger("cat1service")
 
 #设置通话音量
-voiceCall.setVolume(8)
+voiceCall.setVolume(10)
 print("voice call volume {}".format(voiceCall.getVolume()))
 # lpm_fd = pm.create_wakelock("system_lock", len("system_lock"))
 pm.autosleep(1)

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230_4part/fs/system/cat1ota/cat1Service.py b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230_4part/fs/system/cat1ota/cat1Service.py
index ecaa9d4..8678bb3 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230_4part/fs/system/cat1ota/cat1Service.py
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230_4part/fs/system/cat1ota/cat1Service.py
@@ -84,7 +84,7 @@ log.basicConfig(level=log.INFO)
 cat1service_log = log.getLogger("cat1service")
 
 #设置通话音量
-voiceCall.setVolume(8)
+voiceCall.setVolume(10)
 print("voice call volume {}".format(voiceCall.getVolume()))
 # lpm_fd = pm.create_wakelock("system_lock", len("system_lock"))
 pm.autosleep(1)