From d3189eaa6be7c70ed5ac783efe68f43211a90d27 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 20 七月 2023 08:58:56 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://172.16.1.23:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index f759daa..c5bd54b 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
}
@@ -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