From e5d09c69ee4d78ff682ed03878c81b4cbaef3c2d Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Mon, 2 Dec 2024 14:29:36 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8D4G=E9=80=9A=E8=AF=9D=E9=9F=B3?=
 =?utf8?q?=E9=87=8F=E8=B0=83=E8=8A=82=EF=BC=8C=E6=89=8B=E5=8A=A8=E4=BF=AE?=
 =?utf8?q?=E6=94=B9=E5=90=8E=EF=BC=8C=E4=B8=8B=E6=AC=A1=E8=BF=9B=E5=85=A5?=
 =?utf8?q?=E9=9F=B3=E9=87=8F=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=9C=AA=E6=98=BE?=
 =?utf8?q?=E7=A4=BA=E4=B8=8A=E6=AC=A1=E4=BF=AE=E6=94=B9=E7=9A=84=E9=9F=B3?=
 =?utf8?q?=E9=87=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/main/src/VolumeSettingPresenter.cpp     |  4 ++--
 .../nativeui/makephone/src/MainCallingPresenter.cpp  | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/VolumeSettingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/VolumeSettingPresenter.cpp
index 1d732dd98..5f36427da 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/VolumeSettingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/VolumeSettingPresenter.cpp
@@ -143,8 +143,8 @@ extern BtAvrcpTgInf g_avrcp_srv_inf;
 void VolumeSliderEventListener::BtAndLocalVolumeSet(int16_t sounding)
 {
     if (g_avrcp_srv_inf.avrcp_srv_conn_stat == PROFILE_STATE_CONNECTED) {
-        // uint8_t volume = sounding * AVRCP_ABSOLUTE_VOLUME_PERCENTAGE_100 / 100; // 100：本地音量最大值
-        uint8_t volume = mapVolume(sounding);
+        uint8_t volume = sounding * AVRCP_ABSOLUTE_VOLUME_PERCENTAGE_100 / 100; // 100：本地音量最大值
+        // uint8_t volume = mapVolume(sounding);
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "手表音量设置同步远端BT音量 %d", volume);
         (void)avrcp_ct_set_absolute_volume(&(g_avrcp_srv_inf.bd_addr), volume); // 手表音量设置同步远端BT音量
     }
diff --git a/code/sdk/application/wearable/fd230app/nativeui/makephone/src/MainCallingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/makephone/src/MainCallingPresenter.cpp
index 0e2d46afc..ff59e6164 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/makephone/src/MainCallingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/makephone/src/MainCallingPresenter.cpp
@@ -23,6 +23,7 @@
 #include "bletest.h"
 #include "NativeAbility.h"
 #include "dial_sos_c.h"
+#include "soundandvibration/include/SoundAndVibrationVolumeSettingC.h"
 namespace OHOS {
 static MainCallingPresenter *g_pMainView = nullptr;
 static constexpr int32 NUM_10 = 10;
@@ -85,11 +86,12 @@ void MainCallingPresenter::HonrsViewChange()
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainCallingPresenter::volumeSetting SetUpVolume fail");
             return;
         }
-        volumeSetting->GetProgress()->SetValue(AudioManager::GetInstance().GetVolume(AUDIO_STREAM_VOICE_CALL_BT_SCO));
-        if (AudioManager::GetInstance().GetVolume(AUDIO_STREAM_VOICE_CALL_BT_SCO) == 0) {
-            ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUTE_BUTTON, PLAYER_IAMGES);
-            volumeSetting->GetDecreaseButton()->SetImageSrc(image, image);
-        }
+        volumeSetting->GetProgress()->SetValue(CallVolumeGet());
+        // volumeSetting->GetProgress()->SetValue(AudioManager::GetInstance().GetVolume(AUDIO_STREAM_VOICE_CALL_BT_SCO));
+        // if (AudioManager::GetInstance().GetVolume(AUDIO_STREAM_VOICE_CALL_BT_SCO) == 0) {
+        //     ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUTE_BUTTON, PLAYER_IAMGES);
+        //     volumeSetting->GetDecreaseButton()->SetImageSrc(image, image);
+        // }
         RootView::GetInstance()->Add(volumeSetting);
     }
     VolumeSliderEventListener *volumeSliderEventListener = volumeSetting->GetVolumeEventListener();
-- 
2.17.1