From: 胡传军 <1224667075@qq.com> Date: Sat, 2 Nov 2024 11:18:58 +0000 (+0000) Subject: Merge #1321 into sdk602patch0911 from refs/changes/1321/head X-Git-Tag: fd230_release_V1.3.102~29^2~79^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=6b75f1fd7737ec2b7b9edbc9a35db2d87a537ac6;p=mirrors%2FFD230.git Merge #1321 into sdk602patch0911 from refs/changes/1321/head Code review from 胡传军 * refs/changes/1321/head: (19 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模块最大声音 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911 - 优化A2DP及HFP回连效果 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911 - 统一OTA升级路径 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911 - 关闭电话对麦克风操作 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911 - 关闭mic - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911 - 电话关闭MIC 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 Reviewed-by: aliyun6865282430 <1624952103@qq.com> Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1321 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAudio.cpp b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAudio.cpp index 3d4114f75..4e9ed76b7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAudio.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneAudio.cpp @@ -143,6 +143,8 @@ bool PhoneAudioSetMicMute(bool isMute) //cat1取消静音 int32_t PhoneAudioSetMicMuteCat1(bool isMute) { + return 0; + int32_t ret; if(!volte_voice_state()) { diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp index 19e23a023..31a1e5485 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp @@ -159,6 +159,8 @@ namespace OHOS RootView::GetInstance()->Remove(UIViewGroup_transmitting); delete UIViewGroup_transmitting; UIViewGroup_transmitting = nullptr; + + uapi_dev_runtime_set_transmitting_status(0); } } static uint8_t timer_falg_low_power=5; @@ -854,14 +856,15 @@ namespace OHOS // Add to rootView UIViewGroup_transmitting->Add(label_); label_->SetVisible(true); - + } + bool transmittingISShow(void) { - if(UIViewGroup_transmitting) + if(uapi_dev_runtime_get_transmitting_status()) return true; else return false; @@ -879,7 +882,7 @@ namespace OHOS { UIViewGroup_transmitting->RemoveAll(); } - + uapi_dev_runtime_set_transmitting_status(1); switch (Transmitting_falg) { case TRANS_DIAL_TRANSMITTING: diff --git a/code/sdk/drivers/peripheral/utils/custom_runtime.c b/code/sdk/drivers/peripheral/utils/custom_runtime.c index 970d29fb2..c0c9a51a6 100644 --- a/code/sdk/drivers/peripheral/utils/custom_runtime.c +++ b/code/sdk/drivers/peripheral/utils/custom_runtime.c @@ -102,6 +102,7 @@ typedef struct uint8_t screen_always_on_status;//屏幕是否常亮状态 uint8_t wear_status; uint8_t shutting_down_status;//是否处于关机状态 + uint8_t transmitting_status;//是否处于关机状态 } runtime_status_t; @@ -112,6 +113,17 @@ static runtime_status_t g_runtime={0}; // } +void uapi_dev_runtime_set_transmitting_status(uint8_t data) +{ + g_runtime.transmitting_status=data; +} + + +uint8_t uapi_dev_runtime_get_transmitting_status(void) +{ + return g_runtime.transmitting_status; +} + void uapi_dev_runtime_set_cat1_powerstat(uint8_t cat1_powerOn) { g_runtime.cat1_runtime.cat1_powerOn=cat1_powerOn; diff --git a/code/sdk/drivers/peripheral/utils/custom_runtime.h b/code/sdk/drivers/peripheral/utils/custom_runtime.h index 26bd585f5..ba7141322 100644 --- a/code/sdk/drivers/peripheral/utils/custom_runtime.h +++ b/code/sdk/drivers/peripheral/utils/custom_runtime.h @@ -304,6 +304,10 @@ void uapi_dev_runtime_set_wear_status(uint8_t status); // 获取是否为佩戴状态 uint8_t uapi_dev_runtime_get_wear_status_flag(void); +void uapi_dev_runtime_set_transmitting_status(uint8_t data); + +uint8_t uapi_dev_runtime_get_transmitting_status(void); + #ifdef __cplusplus #if __cplusplus }