From f8530cf7edf28799718f2b95b3b9492ab5cc26c6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 28 十一月 2023 09:35:25 +0800
Subject: [PATCH] 空调更新异常问题
---
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index 08a8cf6..d26ebf5 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -124,8 +124,8 @@
+ //鐧诲綍sip鏈嶅姟鍣�
#if __IOS__
-
Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login(mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, mHDLSipInfo.realm);
#else
if (mInterphoneType == InterphoneType.FREEVIEW.ToString())
@@ -133,8 +133,8 @@
HDLLinphoneKit.Instance.SetAccountAndLogin(
mHDLSipInfo.sipAccount,
mHDLSipInfo.sipPasswd,
- "139.159.157.75:47000",//mHDLSipInfo.realm,
- "sip:139.159.157.75:47000;transport=udp",
+ mHDLSipInfo.realm,
+ //"sip:139.159.157.75:47000;transport=udp",
HDLLinphoneKit.InterPhoneTypeFreeview
);
}
@@ -144,7 +144,7 @@
mHDLSipInfo.sipAccount,
mHDLSipInfo.sipPasswd,
mHDLSipInfo.realm,
- mHDLSipInfo.proxy+ ";transport=udp",
+ //mHDLSipInfo.proxy+ ";transport=udp",
//"sip:139.159.157.75:47000;transport=udp",
HDLLinphoneKit.InterPhoneTypeHdl
);
@@ -234,7 +234,7 @@
//鍏堟竻绌哄懠鍙拰鐩戣璁惧淇℃伅
if (clearCallInfo)
{
- InitCallInfo(null);
+ //InitCallInfo(null);//閫犳垚鎺ユ敹鍛煎彨鏃跺紑閿佸紑閿佸紓甯�
}
HDLSipInfo mHDLSipInfo = GetHDLSipInfo(mHDLCallVideoInfo.HomeId);
@@ -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)
@@ -437,7 +454,13 @@
#if __IOS__
- Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName);
+ if (mHDLCallVideoInfo.spk == "door.gate")
+ {
+ Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallHDLSRWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName);
+ }else{
+ Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName);
+ }
+
#else
//1.鍏堝懠鍙澶�
@@ -836,8 +859,6 @@
{
Utlis.WriteLine("OnIncomingCall :" + userName);
}
-
-
}
--
Gitblit v1.8.0