From 05a80811c90af3f1bbde74968f41fb2b3d0471f7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 07 六月 2023 13:47:27 +0800
Subject: [PATCH] 1
---
HDL_ON/Common/ApiUtlis.cs | 51 ++++++++++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 43eb413..c5b684b 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -78,7 +78,10 @@
public void DownloadData()
{
if (MainPage.InternetStatus == 0 || MainPage.NoLoginMode)
+ {
+ DownloadDataComplete = true;
return;
+ }
endTime1 = DateTime.Now.AddSeconds(25);
complateDevice = complateScene = false;
@@ -265,19 +268,15 @@
isInterphoneType_HDL = true;
DB_ResidenceData.Instance.SupportFacePass = true;
DB_ResidenceData.Instance.SaveResidenceData();
-
- Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
+ DB_ResidenceData.Instance.SupportFVDevice = true;
}
else if (video.interphoneType == InterphoneType.FREEVIEW.ToString())
{
//涓哄叏瑙嗛�氬彲瑙嗗璁�
- DB_ResidenceData.Instance.SupportFacePass = true;
- Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
- Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
-
- //isInterphoneType_HDL = true;
- isInterphoneType_FREEVIEW = true;
-
+ //DB_ResidenceData.Instance.SupportFacePass = true;
+ //Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
+ //Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
+ //isInterphoneType_FREEVIEW = true;
}
}
}
@@ -298,7 +297,6 @@
}
else if (isInterphoneType_FREEVIEW)
{
-
//HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
@@ -320,23 +318,22 @@
{
#if __IOS__
- string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
- string errorVersion = "16.2.0";
- if (systemVersion.CompareTo(errorVersion) < 0)
- {
- List<VisitorTempPassword> dataList = new List<VisitorTempPassword>();
- Dictionary<string, object> dictionary = new Dictionary<string, object>();
- dictionary.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.id);
- var requestJson = HttpUtil.GetSignRequestJson(dictionary);
- ResponsePackNew pack = HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetExtMemberInfo, requestJson);
- if (pack != null)
- {
- var data = JsonConvert.DeserializeObject<FreeviewMemberInfo>(pack.Data.ToString());
- //鐧诲綍鍏ㄨ閫�
- Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664");
-
- }
- }
+ //string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
+ //string errorVersion = "16.2.0";
+ //if (systemVersion.CompareTo(errorVersion) < 0)///鍏ㄨ閫氫笉鍏煎ios16浠ヤ笂鐨勭郴缁燂紝涓嶈鍔犺浇杩欎釜鍏�
+ //{
+ // List<VisitorTempPassword> dataList = new List<VisitorTempPassword>();
+ // Dictionary<string, object> dictionary = new Dictionary<string, object>();
+ // dictionary.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.id);
+ // var requestJson = HttpUtil.GetSignRequestJson(dictionary);
+ // ResponsePackNew pack = HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetExtMemberInfo, requestJson);
+ // if (pack != null)
+ // {
+ // var data = JsonConvert.DeserializeObject<FreeviewMemberInfo>(pack.Data.ToString());
+ // //鐧诲綍鍏ㄨ閫�
+ // Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664");
+ // }
+ //}
#endif
}
--
Gitblit v1.8.0