From 1b56157e8edc3f502810820d99b607e3629c7171 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 七月 2023 09:42:00 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc

---
 HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index 73c7e55..c5bd54b 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -242,9 +242,22 @@
                 {
                     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);
                     });
                 }
@@ -325,7 +338,7 @@
 
         #region 鈻�  --  鏂版帴鍚拰寮�閿佹帴鍙______________________________
         /// <summary>
-        /// 寮�閿�
+        /// 鍙瀵硅寮�閿�
         /// </summary>
         public void HDLUnlockAction()
         {
@@ -345,6 +358,10 @@
 
                 Application.RunOnMainThread(() =>
                 {
+                    if(revertObj == null)
+                    {
+                        return;
+                    }
 
 #if __IOS__
                     if (revertObj.Code == StateCode.SUCCESS)

--
Gitblit v1.8.0