From 52ca91968e7f58b4d67124c4042ba3b37f66f91c Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Wed, 18 Sep 2024 18:30:39 +0800 Subject: [PATCH] =?utf8?q?.=20#720,=E8=A7=A3=E5=86=B3=EF=BC=8C=E6=89=8B?= =?utf8?q?=E8=A1=A8=E9=BB=98=E8=AE=A4=E9=80=9A=E8=AF=9D=E9=9F=B3=E9=87=8F?= =?utf8?q?=E8=BF=87=E5=B0=8F=EF=BC=8C=E6=89=8B=E8=A1=A8=E6=98=AF=E6=81=A2?= =?utf8?q?=E5=A4=8D=E5=87=BA=E5=8E=82=E8=AE=BE=E7=BD=AE=E5=90=8E=E6=9F=A5?= =?utf8?q?=E7=9C=8B=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../phoneservice/src/PhoneService.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp index eb8a0daf6..6713cc0fd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp @@ -1887,10 +1887,12 @@ unsigned char GetCallCurrVolume(void) { if(OHOS::CallerLogModel::GetInstance()->GetCallSource() == OHOS::CallerLogModel::CallSourceCat1) { - // int32_t volume = PhoneCAT1AudioGetVolume(); - // int32_t minVolume = PhoneAudioGetCAT1MinVolume(); - // int32_t maxVolume = PhoneAudioGetCAT1MAXVolume(); - // // unsigned char hfpVolume = (unsigned char)((volume * CALL_VOLUME_MAX) / (maxVolume - minVolume)); // 转换 + int32_t volume = PhoneCAT1AudioGetVolume(); + int32_t minVolume = PhoneAudioGetCAT1MinVolume(); + int32_t maxVolume = PhoneAudioGetCAT1MAXVolume(); + // unsigned char hfpVolume = (unsigned char)((volume * CALL_VOLUME_MAX) / (maxVolume - minVolume)); // 转换 + unsigned char hfpVolume = volume; + // if (volume != 0 && hfpVolume == 0) { @@ -1903,10 +1905,11 @@ unsigned char GetCallCurrVolume(void) } else { - // int32_t volume = PhoneAudioGetVolume(); - // int32_t minVolume = PhoneAudioGetMinVolume(); - // int32_t maxVolume = PhoneAudioGetMaxVolume(); - // // unsigned char hfpVolume = (unsigned char)((volume * CALL_VOLUME_MAX) / (maxVolume - minVolume)); // 转换 + int32_t volume = PhoneAudioGetVolume(); + int32_t minVolume = PhoneAudioGetMinVolume(); + int32_t maxVolume = PhoneAudioGetMaxVolume(); + // unsigned char hfpVolume = (unsigned char)((volume * CALL_VOLUME_MAX) / (maxVolume - minVolume)); // 转换 + unsigned char hfpVolume = volume; // // if (volume != 0 && hfpVolume == 0) { // // hfpVolume = 1; -- 2.17.1