From 1cb86d56496996975585f5dff9678b7c6009691d Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期二, 28 六月 2022 17:08:05 +0800
Subject: [PATCH] 代码同步
---
HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java | 202 +++++++++++--------------------------------------
1 files changed, 47 insertions(+), 155 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 81e7414..7399ed2 100644
--- a/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java
+++ b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java
@@ -4,203 +4,96 @@
import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Bundle;
-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.callback.OnHDLLinphoneCallListener;
-import com.hdl.hdllinphonesdk.core.service.HDLLinphoneService;
-import com.hdl.hdllinphonesdk.utils.HDLLog;
-
-import org.linphone.core.Core;
-import org.linphone.core.ProxyConfig;
+import com.hdl.hdllinphonesdk.dialog.LpTipDialog;
public class MainActivity extends Activity {
private static final String TAG = "MainActivity";
- private TextView mTextView,mTextView2,mTextView3,mTextView4;
+ private TextView mTextView, mMonitorText, mTextView3, mTextView4;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
+ findViewById(R.id.mDialog).setOnClickListener(view -> {
+ new LpTipDialog(MainActivity.this, "sss", "ddd", new LpTipDialog.ClickListenerInterface() {
+ @Override
+ public void SureClick(LpTipDialog lpTipDialog) {
+ lpTipDialog.dismiss();
+ }
+
+ @Override
+ public void CancelClick(LpTipDialog lpTipDialog) {
+ lpTipDialog.dismiss();
+ }
+ }).show();
+ });
mTextView = findViewById(R.id.tv_hello);
- mTextView2 = findViewById(R.id.mTextView2);
+ mMonitorText = findViewById(R.id.mTextView2);
mTextView3 = findViewById(R.id.mTextView3);
mTextView4 = findViewById(R.id.mTextView4);
- mTextView.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
-// startActivity(HDLLinphoneMonitorActivity.class);
-// EasyLinphone.callTo("0000",true);
-// EasyLinphone.setAccountAndLogin("44 EasyLinphone.setAccountAndLogin("4444", "85521566", "116.62.26.215:5060");44", "85521566", "116.62.26.215:5060");
+ mTextView.setOnClickListener(v -> HDLLinphoneKit.getInstance()
+ .setAccountAndLogin(
+ "A583853817423247",
+ "763548",
+ "139.159.157.75:46000",
+ HDLLinphoneKit.INTER_PHONE_TYPE_FREEVIEW
+ ));
-// {"data": "{\"sipPassword\":\"8ec02ce0\",\"sipAccount\":\"61723164995710}}
-// {"data": "{\"sipPassword\":\"cc6d73c1\",\"sipAccount\":\"61723164995779}}
-// EasyLinphone.setAccountAndLogin("61723164995710", "8ec02ce0", "47.94.42.230:25060");
-// HDLLinphoneKit.getInstance().setAccountAndLogin("61723164995710", "8ec02ce0", "sipproxy.ucpaas.com:25060");
+ mTextView4.setOnClickListener(v -> HDLLinphoneKit.getInstance().setAccountAndLogin("8888", "85521566", "47.96.88.250:35060", HDLLinphoneKit.INTER_PHONE_TYPE_FREEVIEW));
-// HDLLinphoneKit.getInstance().setAccountAndLogin("5555", "85521566", "116.62.26.215:5060");
-// 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:35060");
-
-
-
-
- //
-// HDLLinphoneKit.getInstance().setAccountAndLogin("8888", "85521566", "test-gz.hdlcontrol.com:5060");
-//
-// HDLLinphoneKit.getInstance().setAccountAndLogin("4444", "85521566", "test-gz.hdlcontrol.com:5060");
-
-
- }
+ mMonitorText.setOnClickListener(v -> {
+ // String sip_account = "sip:D" + space_code + "@yun";
+ HDLLinphoneKit.getInstance().callTo("sip:D22-1-21-1@139.159.157.75:46000", true);
+// HDLLinphoneKit.getInstance().callTo("D22-1-21-1", true);
+ startActivity(HDLLinphoneMonitorActivity.class);
});
- mTextView4.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- clearProxyConfig();
- HDLLinphoneKit.getInstance().setAccountAndLogin("5555", "85521566", "test-gz.hdlcontrol.com:35060");
- }
+ mTextView3.setOnClickListener(v -> {
+ HDLLinphoneKit.getInstance().callTo("D22-1-21-1", true);
+ startActivity(HDLLinphoneMonitorActivity.class);
});
- mTextView2.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
-
-// logoutLog();
-// return;
-// HDLLinphoneKit.getInstance().callTo("61723164995779",true);
-// HDLcallTo("61723164995779",true);
- HDLLinphoneKit.getInstance().callTo("1427186301744910338",true);
- startActivity(HDLLinphoneMonitorActivity.class);
-
-
- }
- });
-
- mTextView3.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- HDLLinphoneKit.getInstance().getCore().enableVideoCapture(false);//绂佺敤鎵嬫満鎽勫儚澶磋棰戦噰闆�
-// //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();
+ mTextView.performClick();
}
-
-
- /**
- * 閫�鍑烘竻绌鸿处鍙�
- * enableRegister false
- */
- public void logout() {
- try {
- Core core = HDLLinphoneService.getCore();
- if (core != null) {
- ProxyConfig[] configs = core.getProxyConfigList();
- for (ProxyConfig config : configs) {
- if (config != null) {
- config.edit();
- config.enableRegister(false);
- config.done();
- }
- }
-// core.clearAllAuthInfo();//娓呴櫎鎵�鏈夎璇佷俊鎭��
-// core.clearProxyConfig();//浠庨厤缃腑鍒犻櫎鎵�鏈変唬鐞嗐��
- }
- } 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 isOpen;
boolean openSuccess;
- void setOnHDLLinphoneCallListener(){
- HDLLinphoneKit.getInstance().setOnHDLLinphoneCallListener( new OnHDLLinphoneCallListener() {
+
+ void setOnHDLLinphoneCallListener() {
+ HDLLinphoneKit.getInstance().setOnHDLLinphoneCallListener(new OnHDLLinphoneCallListener() {
@Override
public void onAnswerAction() {
showToast("鎺ュ惉");
-// EasyLinphone.toggleMicro(true);
}
@Override
public void onRejectCallAction() {
showToast("鎷掓帴");
-// EasyLinphone.hangUp();
}
@Override
public void onUnlockAction() {
-//
- HDLLinphoneKit.getInstance().getCore().enableVideoCapture(true);//绂佺敤鎵嬫満鎽勫儚澶磋棰戦噰闆�
-
-// showToast("寮�閿�");
-// EasyLinphone.callTo("61723164995779",true);
-// openSuccess = !openSuccess;
-// if(openSuccess){
-// HDLLinphoneKit.getInstance().onOpenSuccess();
-// }else{
-// HDLLinphoneKit.getInstance().onOpenError("璁惧涓嶅湪绾�");
-// }
-
-
+ //
}
@Override
public void onHangUpAction(int callDuration) {
- showToast("鎸傛柇 閫氳瘽鏃堕暱锛�"+callDuration);
-// EasyLinphone.hangUp();
+ showToast("鎸傛柇 閫氳瘽鏃堕暱锛�" + callDuration);
}
@Override
@@ -208,11 +101,11 @@
showToast("鎴浘");
}
- @Override
- public void onIncomingCall(String s) {
+ @Override
+ public void onIncomingCall(String s) {
- }
- });
+ }
+ });
}
/**
@@ -226,7 +119,6 @@
Intent intent = new Intent(this, clazz);
startActivity(intent);
}
-
}
\ No newline at end of file
--
Gitblit v1.8.0