From 27e9f729fa9532ebc22afea84aa80434b8765fa5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 28 八月 2021 11:37:33 +0800
Subject: [PATCH] 2021-08-28 1.更新SDK

---
 HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java |   47 +++++++++++++++++++++++++++++++----------------
 1 files changed, 31 insertions(+), 16 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 ab92dee..81e7414 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,17 @@
 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.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 +48,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("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");
@@ -67,7 +66,7 @@
             @Override
             public void onClick(View v) {
                 clearProxyConfig();
-                HDLLinphoneKit.getInstance().setAccountAndLogin("5555", "85521566", "test-gz.hdlcontrol.com:5060");
+                HDLLinphoneKit.getInstance().setAccountAndLogin("5555", "85521566", "test-gz.hdlcontrol.com:35060");
             }
         });
 
@@ -89,7 +88,20 @@
         mTextView3.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                logout();
+                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();
             }
         });
 
@@ -170,14 +182,17 @@
 
             @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("璁惧涓嶅湪绾�");
-                }
+//                openSuccess = !openSuccess;
+//                if(openSuccess){
+//                    HDLLinphoneKit.getInstance().onOpenSuccess();
+//                }else{
+//                    HDLLinphoneKit.getInstance().onOpenError("璁惧涓嶅湪绾�");
+//                }
 
 
             }

--
Gitblit v1.8.0