From 418b0d0a4002bc06ba3a55d1809fe46043f06c09 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 26 九月 2022 14:07:58 +0800
Subject: [PATCH] 光伏更新，金茂科技系统更新
---
HDL_ON/Common/ApiUtlis.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index ae6c314..dba9d06 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -159,6 +159,7 @@
endTime = DateTime.Now.AddSeconds(5);
MainPage.Log($"璇诲彇璁惧淇℃伅鎴愬姛");
+ MainPage.Log($"sid鍒楄〃鑾峰彇===="+ deviceResult.Data.ToString());
var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
if (deviceList == null)
{
@@ -306,9 +307,11 @@
}
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;
}
@@ -322,23 +325,34 @@
if (isInterphoneType_HDL)
{
//HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
- HDLLinphone.Current.GetHDLSipInfoAndInitSDK(DB_ResidenceData.Instance.CurrentRegion.id);
-
+ HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
+ callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+ callVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
+ HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
+ }
+ else if (isInterphoneType_FREEVIEW)
+ {
+ //HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
+ HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
+ callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+ callVideoInfo.InterphoneType = InterphoneType.FREEVIEW.ToString();
+ HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
}
else
{
Utlis.WriteLine("褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅,閫�鍑虹櫥褰曟墍鏈夎处鍙�");
//褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅
HDLLinphone.Current.LogoutAllAccount();
-
}
}
//======================鐧诲綍鍏ㄨ閫�====================
if (isInterphoneType_FREEVIEW)
{
+#if __IOS__
//鐧诲綍鍏ㄨ閫�
Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
+#endif
}
@@ -408,17 +422,48 @@
{
if (DB_ResidenceData.Instance.CurrentRegion != null)
{
- #region 璇诲彇鏈湴鏁版嵁
+#region 璇诲彇鏈湴鏁版嵁
//鎼滅储缃戝叧
DriverLayer.Control.Ins.SearchLoaclGateway();
//閲嶆柊杩炴帴mqtt
DAL.Mqtt.MqttClient.DisConnectRemote("鍒锋柊鏁版嵁锛岄噸杩瀖qtt",false);
- #endregion
+#endregion
}
}
})
{ IsBackground = true }.Start();
+
+
+
+
+ ////涓嬭浇鍏変紡鏁版嵁
+ //new System.Threading.Thread(() => {
+ // try
+ // {//00
+ // HttpServerRequest http = new HttpServerRequest();
+ // var packData = http.GetInverterList();
+ // if (packData != null)
+ // {
+ // if (packData.Code == StateCode.SUCCESS)
+ // {
+ // var inverterList = JsonConvert.DeserializeObject<List<InverterInfo>>(packData.Data.ToString());
+ // if (inverterList!= null)
+ // {
+ // FunctionList.List.InverterList = inverterList;
+ // }
+ // }
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // MainPage.Log($"璇诲彇鍏変紡鏁版嵁寮傚父:{ex.Message}");
+ // }
+
+ //}) { IsBackground = true }.Start();
+
+
+
}
/// <summary>
@@ -466,6 +511,7 @@
FileUtlis.Files.DeleteFile(file);
}
}
+ FunctionList.List.securities.Clear();
foreach (var function in infoList)
{
function.SaveFile();
--
Gitblit v1.8.0