From f793bebc36df45101c465efaed136c3309a19f46 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 06 四月 2023 10:57:12 +0800
Subject: [PATCH] Merge branch 'dev-cqy（1.5.9）' into wjc
---
HDL_ON/Common/ApiUtlis.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 1e28e4d..da5ba70 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -140,6 +140,7 @@
// return;
//}
+ //return;
try
{
@@ -236,7 +237,6 @@
-
//===================璇诲彇鍙瀵硅鏁版嵁==========================
//鍒ゆ柇鏄惁鏈夊彲瑙嗗璁叉暟鎹紝鏈夊垯鏄剧ず鍙瀵硅icon
//var flVideoInfo = HttpRequest.CheckFlVideo();
@@ -282,6 +282,7 @@
}
}
+
//======================鑾峰彇Sip璐﹀彿骞朵笖鍒濆鍖朣DK鍙瀵硅璁惧鍒楄〃====================
//濡傛灉妫�娴嬬嚎绋嬫病鍚姩锛屾墠缁х画涓嬮潰鎿嶄綔 鍥犱负App鏈夊彲鑳藉垰鍚姩椹笂鏀跺埌鎺ㄩ�佷簡锛岀劧鍚庢墠鎵ц鍒拌繖閲�
if (HDLLinphone.Current.CheckIncomingCallThreadIsNull())
@@ -297,6 +298,7 @@
}
else if (isInterphoneType_FREEVIEW)
{
+
//HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
@@ -310,6 +312,8 @@
HDLLinphone.Current.LogoutAllAccount();
}
}
+
+
//======================鐧诲綍鍏ㄨ閫�====================
if (isInterphoneType_FREEVIEW)
@@ -345,12 +349,13 @@
complateDevice = true;
MainPage.Log($"============璁惧============瀹屾垚" + FunctionList.List.Functions.Count);
}
- //})
- //{ IsBackground = true }.Start();
+ //})
+ //{ IsBackground = true }.Start();
- ////===================鍦烘櫙==========================
- //new System.Threading.Thread(() =>
- //{
+ ////===================鍦烘櫙==========================
+ //new System.Threading.Thread(() =>
+ //{
+
try
{
complateScene = false;
--
Gitblit v1.8.0