From 28b3e25ec4fa914ac4fb45b6ec041a0edebc74f8 Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Sat, 2 Nov 2024 19:00:55 +0800 Subject: [PATCH] =?utf8?q?=E7=94=B5=E8=AF=9D=E5=85=B3=E9=97=ADMIC?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/phoneservice/src/PhoneAudio.cpp | 4 ++-- .../service/msg_center/src/notify/transmitting.cpp | 9 ++++++--- code/sdk/drivers/peripheral/utils/custom_runtime.c | 12 ++++++++++++ code/sdk/drivers/peripheral/utils/custom_runtime.h | 4 ++++ 4 files changed, 24 insertions(+), 5 deletions(-) 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 8f81bf3e7..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,8 +143,8 @@ bool PhoneAudioSetMicMute(bool isMute) //cat1取消静音 int32_t PhoneAudioSetMicMuteCat1(bool isMute) { - return; - + 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 } -- 2.17.1