From 98340bb2bbd3b0c8b877c7d3314023c40f942c02 Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期二, 05 九月 2023 15:59:55 +0800
Subject: [PATCH] 视频监控加enablevideo设置
---
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 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 37ef91b..efd4222 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
@@ -1,7 +1,11 @@
package com.hdl.hdllinphonesdk;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Build;
+import android.os.IBinder;
import android.util.Log;
import android.view.TextureView;
import android.widget.Toast;
@@ -66,6 +70,7 @@
private String mUsername, mPassword, mServerIP;
// private TextureView mRenderingView, mPreviewView;
private boolean isAutoJumpCallView;//鏄惁鑷姩璺宠浆鍛煎彨椤甸潰
+ private String intercomeType;
private HDLLinphoneKit() {
@@ -144,7 +149,7 @@
@Override
public void incomingCall(Call linphoneCall) {
super.incomingCall(linphoneCall);
- Log.d("HDLLinphoneKit","------incomingCall------");
+ Log.d("HDLLinphoneKit", "------incomingCall------");
if (linphoneCall != null) {
String callUsername = linphoneCall.getRemoteAddress().getUsername();
HDLLog.I("鏉ョ數鍙风爜锛�" + callUsername);
@@ -163,21 +168,21 @@
@Override
public void outgoingInit() {
super.outgoingInit();
- Log.d("HDLLinphoneKit","------outgoingInit------");
+ Log.d("HDLLinphoneKit", "------outgoingInit------");
}
@Override
public void callConnected() {
super.callConnected();
// 瑙嗛閫氳瘽榛樿鍏嶆彁锛岃闊抽�氳瘽榛樿闈炲厤鎻�
- Log.d("HDLLinphoneKit","------callConnected------");
+ Log.d("HDLLinphoneKit", "------callConnected------");
toggleSpeaker(true);
}
@Override
public void callEnd() {
super.callEnd();
- Log.d("HDLLinphoneKit","------callEnd------");
+ Log.d("HDLLinphoneKit", "------callEnd------");
// context.sendBroadcast(new Intent(HDLLinphoneIntercomActivity.RECEIVE_FINISH_VIDEO_ACTIVITY));
}
});
@@ -196,6 +201,24 @@
}
}
+ private HDLLinphoneService mService;
+ private final ServiceConnection connection = new ServiceConnection() {
+
+ @Override
+ public void onServiceConnected(ComponentName name, IBinder ibinder) {
+ HDLLinphoneService.LinphoneBinder binder = (HDLLinphoneService.LinphoneBinder) ibinder;
+ mService = binder.getService();
+ //鍒濆鍖�
+ mService.initCore();
+ }
+
+ @Override
+ public void onServiceDisconnected(ComponentName name) {
+ mService = null;
+ }
+
+ };
+
/**
* 寮�鍚湇鍔�
*
@@ -206,12 +229,8 @@
if (!HDLLinphoneService.isReady()) {
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.setClass(context, HDLLinphoneService.class);
- context.startService(intent);
-// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-// context.startForegroundService(intent);//瑙ｅ喅android8.0浠ヤ笂鏃犳硶鍚姩鏈嶅姟鐨勯棶棰�
-// } else {
-// context.startService(intent);
-// }
+ context.bindService(intent, connection, Context.BIND_AUTO_CREATE);
+
}
} catch (Exception e) {
e.printStackTrace();
@@ -251,7 +270,12 @@
mUsername = username;
mPassword = password;
mServerIP = serverIP;
+ intercomeType = inter_type;
login(inter_type);
+ }
+
+ public String getIntercomeType() {
+ return intercomeType;
}
/**
@@ -352,6 +376,8 @@
* 鐧诲綍 SIP 鏈嶅姟鍣�
*/
private void loginToServer(String inter_type) {
+ Log.e("==========", "loginToServer: ");
+
try {
if (mUsername == null || mPassword == null || mServerIP == null) {
throw new RuntimeException("The sip account is not configured.");
@@ -380,7 +406,7 @@
Core mLinphoneCore = HDLLinphoneService.getCore();
if (mLinphoneCore == null) return;
- AuthInfo authInfo = Factory.instance().createAuthInfo(name, null, password, null, null, host);
+ AuthInfo authInfo = Factory.instance().createAuthInfo(name, name, password, null, null, host);
AccountCreator mAccountCreator = mLinphoneCore.createAccountCreator(null);
mAccountCreator.setUsername(name);
mAccountCreator.setDomain(host);
@@ -419,6 +445,7 @@
prxCfg.setQualityReportingCollector(null);
prxCfg.setQualityReportingInterval(0);
prxCfg.enableRegister(true);
+ //鍏ㄨ閫氶渶瑕佽缃浐瀹氫唬鐞嗘湇鍔″櫒ip
prxCfg.setServerAddr("sip:139.159.157.75:46000;transport=udp");
mLinphoneCore.addProxyConfig(prxCfg);//娣诲姞浠ｇ悊閰嶇疆銆傚鏋滃惎鐢ㄤ簡娉ㄥ唽锛岃繖灏嗗紑濮嬪湪浠ｇ悊涓婃敞鍐屻��
@@ -488,7 +515,7 @@
params.enableLowBandwidth(false);
params.setAudioBandwidthLimit(0); // disable limitation
currentCall.acceptWithParams(params);
- Log.d("HDLLinphoneKit","---acceptCall= ");
+ Log.d("HDLLinphoneKit", "---acceptCall= ");
} catch (Exception e) {
e.printStackTrace();
@@ -552,7 +579,7 @@
* 璁剧疆澶栨斁璁惧
*/
private void routeAudioToSpeakerHelper(boolean speakerOn) {
- Log.d("HDLLinphoneKit","璁剧疆澶栨斁璁惧[Audio Manager] Routing audio to " + (speakerOn ? "speaker" : "earpiece"));
+ Log.d("HDLLinphoneKit", "璁剧疆澶栨斁璁惧[Audio Manager] Routing audio to " + (speakerOn ? "speaker" : "earpiece"));
try {
if (HDLLinphoneService.getCore() == null) return;
if (HDLLinphoneService.getCore().getCallsNb() == 0) return;
@@ -561,14 +588,14 @@
if (currentCall == null) return;
for (AudioDevice audioDevice : HDLLinphoneService.getCore().getAudioDevices()) {
- Log.d("HDLLinphoneKit","audioDevice.getType()= " + audioDevice.getType());
+ Log.d("HDLLinphoneKit", "audioDevice.getType()= " + audioDevice.getType());
}
for (AudioDevice audioDevice : HDLLinphoneService.getCore().getAudioDevices()) {
- Log.d("HDLLinphoneKit","璁剧疆澶栨斁璁惧speakerOn=" + speakerOn + " audioDevice.getType()=" + audioDevice.getType());
+ Log.d("HDLLinphoneKit", "璁剧疆澶栨斁璁惧speakerOn=" + speakerOn + " audioDevice.getType()=" + audioDevice.getType());
if (speakerOn && audioDevice.getType() == AudioDevice.Type.Speaker) {
currentCall.setOutputAudioDevice(audioDevice);
- Log.d("HDLLinphoneKit","AudioDevice.Type.Speaker");
+ Log.d("HDLLinphoneKit", "AudioDevice.Type.Speaker");
return;
} else if (!speakerOn && audioDevice.getType() == AudioDevice.Type.Earpiece) {
currentCall.setOutputAudioDevice(audioDevice);
--
Gitblit v1.8.0