From a9a4e7c5928a0b7031e7104eeeb960059f26f5c0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 08 七月 2021 18:51:24 +0800
Subject: [PATCH] 2021-07-08 1.增加注释
---
HDL_ON/Common/ApiUtlis.cs | 79 ++++++++++++++++++++++-----------------
1 files changed, 44 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index f01a100..a359d64 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -4,6 +4,8 @@
using HDL_ON.DAL;
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
+using HDL_ON.UI.UI2.FuntionControlView.Video;
+using Newtonsoft.Json;
using Shared;
namespace HDL_ON.Common
@@ -61,7 +63,7 @@
/// </summary>
public void DownloadData()
{
- if (MainPage.InternetStatus == 0)
+ if (MainPage.InternetStatus == 0 || MainPage.NoLoginMode)
return;
//绾跨▼寮�濮嬫椂闂�
var endTime = DateTime.Now.AddSeconds(5);
@@ -106,6 +108,26 @@
}
endTime = DateTime.Now.AddSeconds(5);
MainPage.Log($"鍒锋柊涓汉淇℃伅鎴愬姛");
+
+ //int count = 0;
+ //while (count < 10)
+ //{
+ // if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
+ // {
+ // System.Threading.Thread.Sleep(200);
+ // }
+ // else
+ // {
+ // break;
+ // }
+ // count++;
+ //}
+ //if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
+ //{
+ // return;
+ //}
+
+
try
{
//===================鎴块棿=======================
@@ -187,35 +209,6 @@
{
sceneList = new List<Scene>();
}
- //for (int i = 0; i < FunctionList.List.scenes.Count;)
- //{
- // var localScene = FunctionList.List.scenes[i];
- // if (localScene == null)
- // {
- // FunctionList.List.scenes.Remove(localScene);
- // continue;
- // }
- // var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
- // if (newScene == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
- // {
- // FunctionList.List.DeleteScene(localScene, false);
- // }
- // else
- // {
- // i++;
- // if (localScene.modifyTime != newScene.modifyTime)
- // {
- // localScene.name = newScene.name;
- // localScene.collect = newScene.collect;
- // localScene.modifyTime = newScene.modifyTime;
- // localScene.roomIds = newScene.roomIds;
- // localScene.image = newScene.image;
- // localScene.SaveSceneFile();
- // }
- // sceneList.Remove(newScene);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
- // }
- //}
-
FunctionList.List.scenes.Clear();
//澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
@@ -258,15 +251,31 @@
MainPage.Log($"璇诲彇浜戠鍦烘櫙鏁版嵁澶辫触:Code:{pack.Code}; Msg:{pack.message}");
}
- //===================璇诲彇瀹夐槻鍒楄〃==========================
- GetSecurityList();
//===================璇诲彇閫昏緫鍒楄〃==========================
UI.UI2.Intelligence.Automation.MainView.GetLogicList();
+
//===================璇诲彇鍙瀵硅鏁版嵁==========================
- var flVideoInfo = HttpRequest.CheckFlVideo();
- if(flVideoInfo.Code == StateCode.SUCCESS)
+ //鍒ゆ柇鏄惁鏈夊彲瑙嗗璁叉暟鎹紝鏈夊垯鏄剧ず鍙瀵硅icon
+ //var flVideoInfo = HttpRequest.CheckFlVideo();
+ //if(flVideoInfo.Code == StateCode.SUCCESS)
+ //{
+ // FunctionList.List.videoIntercom1111 = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.Video.VideoClouds>(flVideoInfo.Data.ToString());
+ //}
+
+ //======================鑾峰彇鍙瀵硅璁惧鍒楄〃====================
+ var videoInfo= VideoSend.GetVideoInfoList();
+ if (videoInfo.Code == StateCode.SUCCESS)
{
- FunctionList.List.videoIntercom = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.Video.VideoClouds>(flVideoInfo.Data.ToString());
+ string videoList = videoInfo.Data.ToString();
+ FunctionList.List.videoIntercom = JsonConvert.DeserializeObject<List<UI.UI2.FuntionControlView.Video.Video>>(videoList);
+
+ foreach (var video in FunctionList.List.videoIntercom)
+ {
+ if (video.interphoneType == InterphoneType.IMOUVISIAL.ToString())
+ {
+ UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
+ }
+ }
}
}
--
Gitblit v1.8.0