From 82377cb67b5dcb950dd91dab6b294e5aed1e146d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 20 八月 2021 18:01:36 +0800
Subject: [PATCH] 2021-08-20 1.点击系统返回页面关闭增加挂断操作
---
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java | 461 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 301 insertions(+), 160 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 c6d339b..a421c7a 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
@@ -2,8 +2,6 @@
import android.content.Context;
import android.content.Intent;
-import android.util.Log;
-import android.view.SurfaceView;
import android.view.TextureView;
import android.widget.Toast;
@@ -12,17 +10,20 @@
import com.hdl.hdllinphonesdk.callback.OnLPOpenDoorCallBack;
import com.hdl.hdllinphonesdk.core.callback.PhoneCallback;
import com.hdl.hdllinphonesdk.core.callback.RegistrationCallback;
-import com.hdl.hdllinphonesdk.core.linphone.LinphoneUtils;
import com.hdl.hdllinphonesdk.core.service.HDLLinphoneService;
import com.hdl.hdllinphonesdk.utils.HDLLog;
+import org.linphone.core.AccountCreator;
import org.linphone.core.Address;
+import org.linphone.core.AudioDevice;
+import org.linphone.core.AuthInfo;
import org.linphone.core.Call;
import org.linphone.core.CallParams;
-import org.linphone.core.CallStats;
import org.linphone.core.Core;
import org.linphone.core.CoreException;
+import org.linphone.core.Factory;
import org.linphone.core.ProxyConfig;
+import org.linphone.core.TransportType;
import static java.lang.Thread.sleep;
@@ -31,20 +32,22 @@
*/
public class HDLLinphoneKit {
public static final String KEY_TITLE_NAME = "lpTitleName";
-
public static final String HDLLinphoneKitNAME = "HDLLinphoneKit";
private volatile static HDLLinphoneKit instance;
private Context viewContext;
private ServiceWaitThread mServiceWaitThread;
private String mUsername, mPassword, mServerIP;
- private TextureView mRenderingView, mPreviewView;
-
+// private TextureView mRenderingView, mPreviewView;
private boolean isAutoJumpCallView;//鏄惁鑷姩璺宠浆鍛煎彨椤甸潰
-
private HDLLinphoneKit() {
+
}
+ /**
+ * getInstance
+ * @return HDLLinphoneKit
+ */
public static synchronized HDLLinphoneKit getInstance() {
if (instance == null) {
synchronized (HDLLinphoneKit.class) {
@@ -57,33 +60,53 @@
}
/**
+ * 鑾峰彇 LinphoneCore
+ *
+ * @return Core
+ */
+ public Core getCore() {
+ if(!HDLLinphoneService.isReady()){
+ CheckIfNeedstartService();
+ return null;
+ }else {
+ return HDLLinphoneService.getCore();
+ }
+ }
+
+ /**
* 鍒濆鍖朙inphone
+ * @param context
*/
public void initLinphone(Context context) {
viewContext = context.getApplicationContext();
if (!HDLLinphoneService.isReady()) {
- startService(context);
- addCallback(new RegistrationCallback() {
- @Override
- public void registrationOk() {
- super.registrationOk();
- Log.e(HDLLinphoneKitNAME, "registrationOk: ");
- callBackRegistrationOk(viewContext);
-
- }
-
- @Override
- public void registrationFailed() {
- super.registrationFailed();
- Log.e(HDLLinphoneKitNAME, "registrationFailed: ");
-// Toast.makeText(LoginActivity.this, "鐧诲綍澶辫触锛�", Toast.LENGTH_SHORT).show();
- }
- }, null);
-
+ CheckIfNeedstartService();
} else {
}
+ }
+ /**
+ * startService
+ */
+ private synchronized void CheckIfNeedstartService(){
+ startService(viewContext);
+ addCallback(new RegistrationCallback() {
+ @Override
+ public void registrationOk() {
+ super.registrationOk();
+ HDLLog.e(HDLLinphoneKitNAME, "registrationOk: ");
+ callBackRegistrationOk(viewContext);
+
+ }
+
+ @Override
+ public void registrationFailed() {
+ super.registrationFailed();
+ HDLLog.e(HDLLinphoneKitNAME, "registrationFailed: ");
+// Toast.makeText(LoginActivity.this, "鐧诲綍澶辫触锛�", Toast.LENGTH_SHORT).show();
+ }
+ }, null);
}
/**
@@ -94,9 +117,15 @@
@Override
public void incomingCall(Call linphoneCall) {
super.incomingCall(linphoneCall);
+ if (linphoneCall != null) {
+ String callUsername = linphoneCall.getRemoteAddress().getUsername();
+ HDLLog.I("鏉ョ數鍙风爜锛�" + callUsername);
+// HDLLog.Log("鏉ョ數鍙风爜DisplayName锛�" + linphoneCall.getRemoteAddress().getDisplayName());
+ if (mOnHDLLinphoneCallListener != null) {
+ mOnHDLLinphoneCallListener.onIncomingCall(callUsername);
+ }
+ }
- String callUsername = linphoneCall.getRemoteAddress().getUsername();
- HDLLog.E("鏉ョ數鍙风爜锛�" + callUsername);
if (isAutoJumpCallView) {
//鏄惁闇�瑕佽嚜鍔ㄦ墦寮�鍛煎彨椤甸潰
gotoHDLLinphoneIntercomActivity();
@@ -121,7 +150,7 @@
@Override
public void callEnd() {
super.callEnd();
- context.sendBroadcast(new Intent(HDLLinphoneIntercomActivity.RECEIVE_FINISH_VIDEO_ACTIVITY));
+// context.sendBroadcast(new Intent(HDLLinphoneIntercomActivity.RECEIVE_FINISH_VIDEO_ACTIVITY));
}
});
@@ -137,38 +166,48 @@
}
/**
- * showToast
- */
- private void showToast(String text) {
- Toast.makeText(viewContext, text, Toast.LENGTH_SHORT).show();
- }
-
-
- /**
* 寮�鍚湇鍔�
*
* @param context 涓婁笅鏂�
*/
public void startService(Context context) {
- if (!HDLLinphoneService.isReady()) {
- Intent intent = new Intent(Intent.ACTION_MAIN);
- intent.setClass(context, HDLLinphoneService.class);
- context.startService(intent);
+ try {
+ 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);
+// }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
-// /**
-// * 璁剧疆 sip 璐︽埛淇℃伅
-// *
-// * @param username sip 璐︽埛
-// * @param password 瀵嗙爜
-// * @param serverIP sip 鏈嶅姟鍣�
-// */
-// public void setAccount(String username, String password, String serverIP) {
-// mUsername = username;
-// mPassword = password;
-// mServerIP = serverIP;
-// }
+ /**
+ * onResume
+ */
+ public void onResume() {
+
+ }
+
+ /**
+ * onPause
+ */
+ public void onPause() {
+
+ }
+
+ /**
+ * onDestroy
+ */
+ public void onDestroy() {
+ removePreviewWindow();
+ removeVideoWindow();
+ }
/**
* 璁剧疆 sip 璐︽埛淇℃伅
@@ -222,6 +261,7 @@
/**
* 閫�鍑烘竻绌鸿处鍙�
+ * enableRegister false
*/
public void logout() {
try {
@@ -235,63 +275,27 @@
config.done();
}
}
- core.clearAllAuthInfo();
- core.clearProxyConfig();
}
} catch (Exception e) {
e.printStackTrace();
}
}
-
/**
- * 鍛煎彨鎸囧畾鍙风爜
- *
- * @param num 鍛煎彨鍙风爜
+ * 娓呴櫎閰嶇疆琛�, 鍒囨崲璐﹀彿鏃朵細鐢ㄥ埌
*/
- public void callTo(String num, boolean isVideoCall) {
- LinphoneUtils.getInstance().callTo(num, isVideoCall);
+ public void clearProxyConfig(){
+ Core core = HDLLinphoneService.getCore();
+ if (core != null) {
+ core.setDefaultProxyConfig(null);
+ core.clearAllAuthInfo();//娓呴櫎鎵�鏈夎璇佷俊鎭��
+ core.clearProxyConfig();//浠庨厤缃腑鍒犻櫎鎵�鏈変唬鐞嗐��
+ }
}
/**
- * 鎺ュ惉鏉ョ數
+ * ServiceWaitThread
*/
- public void acceptCall() {
- LinphoneUtils.getInstance().acceptCall();
- }
-
-// /**
-// * 鎺ュ惉鏉ョ數
-// */
-// public void acceptCallWithVideo(boolean enableVideo) {
-// LinphoneUtils.getInstance().acceptCallWithVideo(enableVideo);
-// }
-
- /**
- * 鎸傛柇褰撳墠閫氳瘽
- */
- public void hangUp() {
- LinphoneUtils.getInstance().hangUp();
- }
-
- /**
- * 鍒囨崲闈欓煶
- *
- * @param isMicMuted 鏄惁闈欓煶
- */
- public void toggleMicro(boolean isMicMuted) {
- LinphoneUtils.getInstance().toggleMicro(isMicMuted);
- }
-
- /**
- * 鍒囨崲鍏嶆彁
- *
- * @param isSpeakerEnabled 鏄惁鍏嶆彁
- */
- public void toggleSpeaker(boolean isSpeakerEnabled) {
- LinphoneUtils.getInstance().toggleSpeaker(isSpeakerEnabled);
- }
-
private class ServiceWaitThread extends Thread {
private PhoneCallback mPhoneCallback;
private RegistrationCallback mRegistrationCallback;
@@ -325,83 +329,203 @@
if (mUsername == null || mPassword == null || mServerIP == null) {
throw new RuntimeException("The sip account is not configured.");
}
- LinphoneUtils.getInstance().registerUserAuth(mUsername, mPassword, mServerIP);
+ registerUserAuth(mUsername, mPassword, mServerIP);
} catch (CoreException e) {
e.printStackTrace();
}
}
+ /**
+ * 鎻愪氦璐﹀彿鍜屽瘑鐮佹敞鍐屽埌鏈嶅姟鍣�
+ *
+ * @param name
+ * @param password
+ * @param host
+ * @throws CoreException
+ */
+ public void registerUserAuth(String name, String password, String host) throws CoreException {
+ Core mLinphoneCore = HDLLinphoneService.getCore();
+ if(mLinphoneCore == null) return;
-// public static boolean getVideoEnabled() {
-// CallParams remoteParams = HDLLinphoneService.getCore().getCurrentCall().getRemoteParams();
-// return remoteParams != null && remoteParams.videoEnabled();
-// }
+ AuthInfo authInfo = Factory.instance().createAuthInfo(name, null, password,
+ null, null, host);
+
+ AccountCreator mAccountCreator = mLinphoneCore.createAccountCreator(null);
+ mAccountCreator.setUsername(name);
+ mAccountCreator.setDomain(host);
+ mAccountCreator.setPassword(password);
+ mAccountCreator.setTransport(TransportType.Udp);
+ ProxyConfig prxCfg = mAccountCreator.createProxyConfig();
+
+ prxCfg.enableQualityReporting(false);
+ prxCfg.setQualityReportingCollector(null);
+ prxCfg.setQualityReportingInterval(0);
+ prxCfg.enableRegister(true);
+ mLinphoneCore.addProxyConfig(prxCfg);//娣诲姞浠ｇ悊閰嶇疆銆傚鏋滃惎鐢ㄤ簡娉ㄥ唽锛岃繖灏嗗紑濮嬪湪浠ｇ悊涓婃敞鍐屻��
+ mLinphoneCore.addAuthInfo(authInfo);//娣诲姞璁よ瘉淇℃伅鍒�,璇ヤ俊鎭墖娈靛皢鍦ㄦ墍鏈夐渶瑕佺殑SIP浜嬪姟涓娇鐢ㄨ韩浠介獙璇�
+ mLinphoneCore.setDefaultProxyConfig(prxCfg);//璁剧疆榛樿浠ｇ悊銆�
+ }
/**
- * 璁剧疆 SurfaceView
+ * 鍛煎彨
+ */
+ public Call startSingleCallingTo(String userName, boolean isVideoCall) {
+ Core mLinphoneCore = HDLLinphoneService.getCore();
+ if(mLinphoneCore == null) return null;
+
+ Call call = null;
+ Core core = HDLLinphoneService.getCore();
+ if(core != null) {
+ Address addressToCall = core.interpretUrl(userName);
+ CallParams params = core.createCallParams(null);
+
+ if (isVideoCall) {
+ params.enableVideo(true);
+ params.enableLowBandwidth(false);
+ } else {
+ params.enableVideo(false);
+ }
+
+ if (addressToCall != null) {
+ call = core.inviteAddressWithParams(addressToCall, params);
+ }
+ }
+ return call;
+ }
+
+ /**
+ * 鍛煎彨鎸囧畾鍙风爜
+ *
+ * @param num 鍛煎彨鍙风爜
+ */
+ public void callTo(String num, boolean isVideoCall) {
+ if (!HDLLinphoneService.isReady() || !HDLLinphoneService.getCoreIsNotNull()) {
+ return;
+ }
+ if (!num.equals("")) {
+ startSingleCallingTo(num, isVideoCall);
+ }
+ }
+
+ /**
+ * 鎺ュ惉鏉ョ數
+ */
+ public void acceptCall() {
+ try {
+ if(HDLLinphoneService.getCore() == null) return;
+ Call currentCall = HDLLinphoneService.getCore().getCurrentCall();
+ CallParams params = HDLLinphoneService.getCore().createCallParams(currentCall);
+ params.enableVideo(true);
+ currentCall.acceptWithParams(params);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鎺ュ惉鏉ョ數
+ */
+ public void acceptCallWithVideo(boolean enableVideo) {
+ try {
+ if(HDLLinphoneService.getCore() == null) return;
+ Call currentCall = HDLLinphoneService.getCore().getCurrentCall();
+ CallParams params = HDLLinphoneService.getCore().createCallParams(currentCall);
+ params.enableVideo(enableVideo);
+ currentCall.acceptWithParams(params);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鎸傛柇鐢佃瘽
+ */
+ public void hangUp() {
+ Core mLinphoneCore = HDLLinphoneService.getCore();
+ if(mLinphoneCore == null) return;
+ Call currentCall = mLinphoneCore.getCurrentCall();
+ if (currentCall != null) {
+// mLinphoneCore.terminateCall(currentCall);
+ mLinphoneCore.terminateAllCalls();
+ } else if (mLinphoneCore.isInConference()) {
+ mLinphoneCore.terminateConference();
+ } else {
+ mLinphoneCore.terminateAllCalls();
+ }
+ }
+
+ /**
+ * 鏄惁闈欓煶
+ *
+ * @param isMicMuted
+ */
+ public void toggleMicro(boolean isMicMuted) {
+ Core mLinphoneCore = HDLLinphoneService.getCore();
+ if(mLinphoneCore == null) return;
+ mLinphoneCore.enableMic(!isMicMuted);
+ }
+
+ /**
+ * 鏄惁澶栨斁
+ *
+ * @param isSpeakerEnabled
+ */
+ public void toggleSpeaker(boolean isSpeakerEnabled) {
+ routeAudioToSpeakerHelper(isSpeakerEnabled);
+ }
+
+ /**
+ * 璁剧疆澶栨斁璁惧
+ */
+ private void routeAudioToSpeakerHelper(boolean speakerOn) {
+ org.linphone.core.tools.Log.w("[Audio Manager] Routing audio to " + (speakerOn ? "speaker" : "earpiece"));
+ try {
+ if(HDLLinphoneService.getCore() == null) return;
+ if (HDLLinphoneService.getCore().getCallsNb() == 0) return;
+ Call currentCall = HDLLinphoneService.getCore().getCurrentCall();
+ if (currentCall == null) currentCall = HDLLinphoneService.getCore().getCalls()[0];
+ if (currentCall == null) return;
+
+ for (AudioDevice audioDevice : HDLLinphoneService.getCore().getAudioDevices()) {
+ if (speakerOn && audioDevice.getType() == AudioDevice.Type.Speaker) {
+ currentCall.setOutputAudioDevice(audioDevice);
+ return;
+ } else if (!speakerOn && audioDevice.getType() == AudioDevice.Type.Earpiece) {
+ currentCall.setOutputAudioDevice(audioDevice);
+ return;
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 璁剧疆 TextureView
*
* @param renderingView 杩滅▼ TextureView
* @param previewView 鏈湴 TextureView
*/
public void setAndroidVideoWindow(final TextureView renderingView, final TextureView previewView) {
- mRenderingView = renderingView;
- mPreviewView = previewView;
+// mRenderingView = renderingView;
+// mPreviewView = previewView;
setVideoWindow(renderingView);
setPreviewWindow(previewView);
}
/**
- * onResume
+ * 璁剧疆鎾斁View
+ * @param o
*/
- public void onResume() {
-// if (mRenderingView != null) {
-// ((TextureView) mRenderingView).onResume();
-// }
-
-// if (mAndroidVideoWindow != null) {
-// synchronized (mAndroidVideoWindow) {
-// LinphoneManager.getLc().setNativeVideoWindowId(mAndroidVideoWindow);
-// }
-// }
- }
-
- /**
- * onPause
- */
- public void onPause() {
-// if (mAndroidVideoWindow != null) {
-// synchronized (mAndroidVideoWindow) {
-// LinphoneManager.getLc().setNativeVideoWindowId(null);
-// }
-// }
-//
-// if (mRenderingView != null) {
-// ((GLSurfaceView) mRenderingView).onPause();
-// }
- }
-
- /**
- * onDestroy
- */
- public void onDestroy() {
- mPreviewView = null;
- mRenderingView = null;
-
- }
-
-// private void fixZOrder(SurfaceView rendering, SurfaceView preview) {
-// rendering.setZOrderOnTop(false);
-// preview.setZOrderOnTop(true);
-// preview.setZOrderMediaOverlay(true); // Needed to be able to display control layout over
-// }
-
private void setVideoWindow(Object o) {
Core linphoneCore = HDLLinphoneService.getCore();
if (linphoneCore != null) {
linphoneCore.setNativeVideoWindowId(o);
}
}
-
+ /**
+ * 绉婚櫎鎾斁View
+ */
private void removeVideoWindow() {
Core linphoneCore = HDLLinphoneService.getCore();
if (linphoneCore != null) {
@@ -409,28 +533,25 @@
}
}
+ /**
+ * 璁剧疆鏈満鎽勫儚澶撮噰闆嗙殑View
+ * @param o
+ */
private void setPreviewWindow(Object o) {
Core linphoneCore = HDLLinphoneService.getCore();
if (linphoneCore != null) {
linphoneCore.setNativePreviewWindowId(o);
}
}
-
+ /**
+ * 绉婚櫎瑙嗛閲囬泦View
+ */
private void removePreviewWindow() {
Core linphoneCore = HDLLinphoneService.getCore();
if (linphoneCore != null) {
linphoneCore.setNativePreviewWindowId(null);
}
}
-
-// /**
-// * 鑾峰彇 LinphoneCore
-// *
-// * @return LinphoneCore
-// */
-// public Core getLC() {
-// return HDLLinphoneService.getCore();
-// }
/**
* 鑾峰彇褰撳墠閫氳瘽鐘舵��
@@ -452,6 +573,11 @@
public boolean isAutoJumpCallView() {
return isAutoJumpCallView;
}
+
+ /**
+ * 璁剧疆鏄惁鑷姩璺宠浆鍛煎彨椤甸潰鏍囧織
+ * @param autoJumpCallView
+ */
public void setAutoJumpCallView(boolean autoJumpCallView) {
isAutoJumpCallView = autoJumpCallView;
}
@@ -491,12 +617,27 @@
*/
private OnHDLLinphoneCallListener mOnHDLLinphoneCallListener;
+ /**
+ * 鑾峰彇onHDLLinphoneCallListener
+ * 鎺ュ惉銆佹寕鏂�佸紑閿佺瓑 Listener瀹炵幇
+ * @return OnHDLLinphoneCallListener
+ */
public OnHDLLinphoneCallListener getOnHDLLinphoneCallListener() {
return mOnHDLLinphoneCallListener;
}
+ /**
+ * 璁剧疆onHDLLinphoneCallListener
+ * @param onHDLLinphoneCallListener
+ */
public void setOnHDLLinphoneCallListener(OnHDLLinphoneCallListener onHDLLinphoneCallListener) {
mOnHDLLinphoneCallListener = onHDLLinphoneCallListener;
}
+ /**
+ * showToast
+ */
+ private void showToast(String text) {
+ Toast.makeText(viewContext, text, Toast.LENGTH_SHORT).show();
+ }
}
--
Gitblit v1.8.0