From a780f0b8d0ccec90d359c0c554f07d5afde9554c Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期二, 28 六月 2022 17:05:31 +0800
Subject: [PATCH] 代码同步
---
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
index 248d721..2e4a99b 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
@@ -163,7 +163,10 @@
@Override
public void outgoingInit() {
super.outgoingInit();
+<<<<<<< HEAD
Log.d("HDLLinphoneKit","------outgoingInit------");
+=======
+>>>>>>> 1697a5c0a1d40e756738d1f99d496c6e33b3fd52
}
@Override
@@ -177,9 +180,12 @@
@Override
public void callEnd() {
super.callEnd();
+<<<<<<< HEAD
Log.d("HDLLinphoneKit","------callEnd------");
// context.sendBroadcast(new Intent(HDLLinphoneIntercomActivity.RECEIVE_FINISH_VIDEO_ACTIVITY));
+=======
+>>>>>>> 1697a5c0a1d40e756738d1f99d496c6e33b3fd52
}
});
}
@@ -452,6 +458,12 @@
if (addressToCall != null) {
call = core.inviteAddressWithParams(addressToCall, params);
+ // 璁剧疆澶栨斁
+ for (AudioDevice audioDevice : HDLLinphoneService.getCore().getAudioDevices()) {
+ if (audioDevice.getType() == AudioDevice.Type.Speaker) {
+ call.setOutputAudioDevice(audioDevice);
+ }
+ }
}
}
return call;
@@ -570,6 +582,8 @@
return;
}
}
+ currentCall.setSpeakerVolumeGain(1.0f);
+ currentCall.setSpeakerMuted(speakerOn);
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0