From 5dc625a64cf58d798929f22c3073cd06b837f87a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 25 十一月 2021 16:44:57 +0800
Subject: [PATCH] 2021-11-25 1.更新
---
HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java | 115 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 79 insertions(+), 36 deletions(-)
diff --git a/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java
index f17663c..5388edf 100644
--- a/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java
+++ b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java
@@ -4,22 +4,18 @@
import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
import com.hdl.hdllinphonesdk.HDLLinphoneKit;
+import com.hdl.hdllinphonesdk.activity.HDLLinphoneIntercomActivity;
import com.hdl.hdllinphonesdk.activity.HDLLinphoneMonitorActivity;
+import com.hdl.hdllinphonesdk.activity.HDLLinphoneReverseCallActivity;
import com.hdl.hdllinphonesdk.callback.OnHDLLinphoneCallListener;
-//import com.hdl.hdllinphonesdk.core.EasyLinphone;
import com.hdl.hdllinphonesdk.core.service.HDLLinphoneService;
import com.hdl.hdllinphonesdk.utils.HDLLog;
-import org.linphone.core.Address;
-import org.linphone.core.Call;
-import org.linphone.core.CallParams;
import org.linphone.core.Core;
import org.linphone.core.ProxyConfig;
@@ -53,8 +49,12 @@
// HDLLinphoneKit.getInstance().setAccountAndLogin("5555", "85521566", "test-gz.hdlcontrol.com:5060");
// HDLLinphoneKit.getInstance().setAccountAndLogin("6666", "85521566", "test-gz.hdlcontrol.com:5060");
- HDLLinphoneKit.getInstance().setAccountAndLogin("7777", "85521566", "test-gz.hdlcontrol.com:5060");
-//
+ HDLLinphoneKit.getInstance().setAccountAndLogin("8888", "85521566", "47.96.88.250:35060");
+
+
+
+
+ //
// HDLLinphoneKit.getInstance().setAccountAndLogin("8888", "85521566", "test-gz.hdlcontrol.com:5060");
//
// HDLLinphoneKit.getInstance().setAccountAndLogin("4444", "85521566", "test-gz.hdlcontrol.com:5060");
@@ -66,7 +66,8 @@
mTextView4.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- HDLLinphoneKit.getInstance().setAccountAndLogin("5555", "85521566", "test-gz.hdlcontrol.com:5060");
+ clearProxyConfig();
+ HDLLinphoneKit.getInstance().setAccountAndLogin("8888", "85521566", "47.96.88.250:35060");
}
});
@@ -74,12 +75,13 @@
@Override
public void onClick(View v) {
- logoutLog();
- return;
-//// HDLLinphoneKit.getInstance().callTo("61723164995779",true);
-//// HDLcallTo("61723164995779",true);
+// logoutLog();
+// return;
+// HDLLinphoneKit.getInstance().callTo("61723164995779",true);
+// HDLcallTo("61723164995779",true);
// HDLLinphoneKit.getInstance().callTo("1427186301744910338",true);
-// startActivity(HDLLinphoneMonitorActivity.class);
+ HDLLinphoneKit.getInstance().callTo("1456490719927488513",true);
+ startActivity(HDLLinphoneMonitorActivity.class);
}
@@ -88,16 +90,42 @@
mTextView3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- HDLLinphoneKit.getInstance().logout();
+
+// HDLLinphoneKit.getInstance().getCore().setNetworkReachable(true);
+// isOpen = !isOpen;
+// showToast("褰撳墠璁剧疆鐘舵�侊細"+isOpen);
+// HDLLinphoneKit.getInstance().getCore().enableVideoCapture(isOpen);//绂佺敤鎵嬫満鎽勫儚澶磋棰戦噰闆�
+// //1.鍚敤PCMA 8000
+// PayloadType[] ptList = HDLLinphoneKit.getInstance().getCore().getAudioPayloadTypes();
+// for (PayloadType pt : ptList) {
+//// HDLLog.i("payloadaudio", pt.getMimeType());
+// if ((pt.getMimeType().equals("PCMA") || pt.getMimeType().equals("PCMU")) && pt.getClockRate() == 8000) {
+//// pt.enable(true);
+// HDLLog.i("payloadaudio true", pt.getMimeType() + ": "+ pt.getClockRate()+"HZ " + pt.enabled());
+// } else {
+//// pt.enable(false);
+// HDLLog.i("payloadaudio false", pt.getMimeType() + ": "+ pt.getClockRate()+"HZ "+ pt.enabled());
+// }
+// }
+// logout();
}
});
+ //1.鍒濆鍖朣DK锛屽苟娉ㄥ唽HDLLinphoneService
HDLLinphoneKit.getInstance().initLinphone(this);
+ //2.璁剧疆鏄惁鑷姩璺宠浆鍛煎彨,濡傛灉瀵规帴鏋佸厜鎺ㄩ�佸啀寮瑰嚭椤甸潰锛岃繖閲岃璁剧疆false
HDLLinphoneKit.getInstance().setAutoJumpCallView(true);
+ //3.鐩戝惉鍛煎彨鍜岀洃鎺ч〉闈紝鐢ㄦ埛鎿嶄綔鐨勭浉鍏充簨浠躲�佹帴鍚�佹嫆鎺ャ�佸紑閿佺瓑....
setOnHDLLinphoneCallListener();
}
+ void all(){
+ Intent intent = new Intent(this, HDLLinphoneReverseCallActivity.class);
+ intent.
+ startActivity(intent);
+ }
+ boolean isOpen;
/**
* 閫�鍑烘竻绌鸿处鍙�
@@ -115,7 +143,7 @@
config.done();
}
}
- core.clearAllAuthInfo();//娓呴櫎鎵�鏈夎璇佷俊鎭��
+// core.clearAllAuthInfo();//娓呴櫎鎵�鏈夎璇佷俊鎭��
// core.clearProxyConfig();//浠庨厤缃腑鍒犻櫎鎵�鏈変唬鐞嗐��
}
} catch (Exception e) {
@@ -123,22 +151,34 @@
}
}
- public void logoutLog() {
- try {
- Core core = HDLLinphoneService.getCore();
- ProxyConfig[] configs = core.getProxyConfigList();
- if(configs != null) {
- HDLLog.E("registrationState璐︽埛length" + configs.length);
- }
-
- for (ProxyConfig config : configs) {
- HDLLog.E("registrationState璐︽埛"+config.getIdentityAddress().getUsername());
- }
-
- } catch (Exception e) {
- e.printStackTrace();
+ public void clearProxyConfig() {
+ Core core = HDLLinphoneService.getCore();
+ if (core != null) {
+ core.setDefaultProxyConfig(null);
+ core.clearAllAuthInfo();
+ core.clearProxyConfig();
+// core.refreshRegisters();//寮哄埗鍦ㄤ笅涓�娆¤凯浠ｆ椂鍚姩娉ㄥ唽鍒锋柊
+// core.ensureRegistered();
}
+
}
+
+// public void logoutLog() {
+// try {
+// Core core = HDLLinphoneService.getCore();
+// ProxyConfig[] configs = core.getProxyConfigList();
+// if(configs != null) {
+// HDLLog.E("registrationState璐︽埛length" + configs.length);
+// }
+//
+// for (ProxyConfig config : configs) {
+// HDLLog.E("registrationState璐︽埛"+config.getIdentityAddress().getUsername());
+// }
+//
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
boolean openSuccess;
void setOnHDLLinphoneCallListener(){
@@ -157,14 +197,17 @@
@Override
public void onUnlockAction() {
+//
+// HDLLinphoneKit.getInstance().getCore().clearAllAuthInfo();
+
// showToast("寮�閿�");
// EasyLinphone.callTo("61723164995779",true);
- openSuccess = !openSuccess;
- if(openSuccess){
- HDLLinphoneKit.getInstance().onOpenSuccess();
- }else{
- HDLLinphoneKit.getInstance().onOpenError("璁惧涓嶅湪绾�");
- }
+// openSuccess = !openSuccess;
+// if(openSuccess){
+// HDLLinphoneKit.getInstance().onOpenSuccess();
+// }else{
+// HDLLinphoneKit.getInstance().onOpenError("璁惧涓嶅湪绾�");
+// }
}
--
Gitblit v1.8.0