From 9508510f0b27da3278fa1161eb2ba3dd1e3e2030 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 26 七月 2023 13:14:00 +0800
Subject: [PATCH] 2023年07月26日13:12:21

---
 HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs |   46 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index f759daa..aebb3a8 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -134,7 +134,7 @@
                     mHDLSipInfo.sipAccount,
                     mHDLSipInfo.sipPasswd,
                     "139.159.157.75:47000",//mHDLSipInfo.realm,
-                    "sip:139.159.157.75:47000;transport=udp",
+                    //"sip:139.159.157.75:47000;transport=udp",
                     HDLLinphoneKit.InterPhoneTypeFreeview
                     );
             }
@@ -144,7 +144,8 @@
                    mHDLSipInfo.sipAccount,
                    mHDLSipInfo.sipPasswd,
                    mHDLSipInfo.realm,
-                   "sip:139.159.157.75:47000;transport=udp",
+                   //mHDLSipInfo.proxy+ ";transport=udp",
+                   //"sip:139.159.157.75:47000;transport=udp",
                    HDLLinphoneKit.InterPhoneTypeHdl
                    );
             }
@@ -164,7 +165,14 @@
 
             Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().LogoutAllLinphoneUser();
 #else
-            HDLLinphoneKit.Instance.Logout();
+            if (HDLLinphoneKit.Instance != null)
+            {
+                HDLLinphoneKit.Instance.Logout();
+            }
+            else
+            {
+
+            }
 #endif
         }
 
@@ -226,7 +234,7 @@
                 //鍏堟竻绌哄懠鍙拰鐩戣璁惧淇℃伅
                 if (clearCallInfo)
                 {
-                    InitCallInfo(null);
+                    //InitCallInfo(null);//閫犳垚鎺ユ敹鍛煎彨鏃跺紑閿佸紑閿佸紓甯�
                 }
 
                 HDLSipInfo mHDLSipInfo = GetHDLSipInfo(mHDLCallVideoInfo.HomeId);
@@ -234,15 +242,31 @@
                 {
                     Application.RunOnMainThread(() =>
                     {
-                        InitLinphone();
+                        try
+                        {
+                            InitLinphone();
+                        }
+                        catch (Exception ex)
+                        {
+                            MainPage.Log($"InitLinphone exception : {ex.Message}");
+                        }
                         mHDLSipInfo.homeId = mHDLCallVideoInfo.HomeId;
-                        SetAccountAndLogin(mHDLSipInfo, mHDLCallVideoInfo.InterphoneType);
+                        try { 
+                            SetAccountAndLogin(mHDLSipInfo, mHDLCallVideoInfo.InterphoneType);
+                        }
+                        catch (Exception ex)
+                        {
+                            MainPage.Log($"SetAccountAndLogin exception : {ex.Message}");
+                        }
                         Utlis.WriteLine("CALL 鑾峰彇SIP璐﹀彿鎴愬姛锛�" + mHDLSipInfo.sipAccount);
                     });
                 }
                 else
                 {
-                    new Alert("", $"鑾峰彇Sip璐﹀彿淇℃伅澶辫触.", "纭畾").Show();
+                    //Application.RunOnMainThread(() =>
+                    //{
+                    //    new Alert("", $"鑾峰彇Sip璐﹀彿淇℃伅澶辫触.", "纭畾").Show();
+                    //});
                 }
             }
             catch { }
@@ -314,7 +338,7 @@
 
         #region 鈻�  --  鏂版帴鍚拰寮�閿佹帴鍙______________________________
         /// <summary>
-        /// 寮�閿�
+        /// 鍙瀵硅寮�閿�
         /// </summary>
         public void HDLUnlockAction()
         {
@@ -334,6 +358,10 @@
 
                 Application.RunOnMainThread(() =>
                 {
+                    if(revertObj == null)
+                    {
+                        return;
+                    }
 
 #if __IOS__
                     if (revertObj.Code == StateCode.SUCCESS)
@@ -825,8 +853,6 @@
             {
                 Utlis.WriteLine("OnIncomingCall :" + userName);
             }
-
-
 
         }
 

--
Gitblit v1.8.0