From 39eb1c016f49275bb8449fba9286619670f39a42 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 19 四月 2021 09:35:59 +0800
Subject: [PATCH] 合并温居城代码
---
HDL_ON/Common/ApiUtlis.cs | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 2c87fbc..2013562 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -185,6 +185,7 @@
//澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
foreach (var newFunction in deviceList.list)
{
+ MainPage.Log(newFunction.savePath);
newFunction.SaveFunctionFile();
FunctionList.List.IniFunctionList(newFunction.savePath);
}
@@ -276,6 +277,13 @@
//===================璇诲彇閫昏緫鍒楄〃==========================
UI.UI2.Intelligence.Automation.MainView.GetLogicList();
+ //===================璇诲彇鍙瀵硅鏁版嵁==========================
+ var flVideoInfo = HttpRequest.CheckFlVideo();
+ if(flVideoInfo.Code == StateCode.SUCCESS)
+ {
+ FunctionList.List.videoIntercom = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.Video.VideoClouds>(flVideoInfo.Data.ToString());
+ }
+
}
catch (Exception ex)
{
--
Gitblit v1.8.0