From 10a2f0e35f595f34798728ca1a3fbedaa2e1e9b7 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?#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 --- .../nativeui/phoneservice/src/PhoneService.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 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 54ce0a475..834f284fa 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phoneservice/src/PhoneService.cpp @@ -1887,7 +1887,9 @@ unsigned char GetCallCurrVolume(void) 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 = (unsigned char)((volume * CALL_VOLUME_MAX) / (maxVolume - minVolume)); // 转换 + unsigned char hfpVolume = volume; + if (volume != 0 && hfpVolume == 0) { hfpVolume = 1; @@ -1901,7 +1903,8 @@ unsigned char GetCallCurrVolume(void) 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 = (unsigned char)((volume * CALL_VOLUME_MAX) / (maxVolume - minVolume)); // 转换 + unsigned char hfpVolume = volume; if (volume != 0 && hfpVolume == 0) { hfpVolume = 1; @@ -1967,7 +1970,8 @@ void set_speaker_volume(unsigned char hfpVolume,int type) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] start, CallSourceCat1:%d", hfpVolume); int32_t minVolume = PhoneAudioGetCAT1MinVolume(); int32_t maxVolume = PhoneAudioGetCAT1MAXVolume(); - int32_t volume = hfpVolume * (maxVolume - minVolume)/ CALL_VOLUME_MAX;// 转换 + // int32_t volume = hfpVolume * (maxVolume - minVolume)/ CALL_VOLUME_MAX;// 转换 + int32_t volume = hfpVolume; WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] minVolume:%d, maxVolume:%d, volume:%d", minVolume, maxVolume, volume); @@ -1983,7 +1987,8 @@ void set_speaker_volume(unsigned char hfpVolume,int type) WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] start, hfpVolume:%d", hfpVolume); int32_t minVolume = PhoneAudioGetMinVolume(); int32_t maxVolume = PhoneAudioGetMaxVolume(); - int32_t volume = hfpVolume * (maxVolume - minVolume) / CALL_VOLUME_MAX; // 转换 + // int32_t volume = hfpVolume * (maxVolume - minVolume) / CALL_VOLUME_MAX; // 转换 + int32_t volume = hfpVolume; WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[SetSpeakerVolume] minVolume:%d, maxVolume:%d, volume:%d", minVolume, maxVolume, volume); -- 2.17.1