From b8bdf52ccc38e3c6b0a95c2b60f59fc99dc546fd Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期四, 22 四月 2021 09:25:06 +0800
Subject: [PATCH] 2021-4-22 对接乐橙可视对讲
---
HDL_ON/Common/ApiUtlis.cs | 105 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 79 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index aaded7a..215528e 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
@@ -46,7 +48,7 @@
public bool GatewayOnlineVerification()
{
bool result = DB_ResidenceData.Instance.HomeGateway.gatewayStatus;
-
+ DriverLayer.Control.Ins.GatewayOnline_Cloud = result;
if (!result)
{
@@ -159,41 +161,56 @@
{
deviceList = new DevcieApiPack();
}
+ string delFile = "";
if (FunctionList.List.GetDeviceFunctionList().Count > 0)
{
+
for (int i = 0; i < FunctionList.List.GetDeviceFunctionList().Count;)
{
var localFunction = FunctionList.List.GetDeviceFunctionList()[i];
- if (localFunction.functionCategory == FunctionCategory.Music)
+ if (localFunction.Spk_Prefix == FunctionCategory.Music || string.IsNullOrEmpty(localFunction.Spk_Prefix))
{
i++;
continue;
}
var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
- if (newFunction == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
+ //if (newFunction == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
+ //{
+ // FunctionList.List.DeleteFunction(localFunction);
+ //}
+ //else
+ //{
+ // MainPage.Log($"deviceType:{localFunction.spk} local:{localFunction.modifyTime} server:{newFunction.modifyTime}");
+ // i++;
+ // //if (localFunction.modifyTime != newFunction.modifyTime)
+ // //{
+ // // //鍙紭鍖�
+ // // localFunction.name = newFunction.name;
+ // // localFunction.collect = newFunction.collect;
+ // // localFunction.modifyTime = newFunction.modifyTime;
+ // // localFunction.roomIds = newFunction.roomIds;
+ // // localFunction.bus = newFunction.bus;
+ // // localFunction.SaveFunctionFile();
+ // //}
+ // localFunction = newFunction;
+ // localFunction.SaveFunctionFile();
+ // deviceList.list.Remove(newFunction);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
+ //}
+
+ if (delFile == localFunction.savePath)
{
- FunctionList.List.DeleteFunction(localFunction);
- }
- else
- {
- MainPage.Log($"deviceType:{localFunction.spk} local:{localFunction.modifyTime} server:{newFunction.modifyTime}");
i++;
- if (localFunction.modifyTime != newFunction.modifyTime)
- {
- //鍙紭鍖�
- localFunction.name = newFunction.name;
- localFunction.collect = newFunction.collect;
- localFunction.modifyTime = newFunction.modifyTime;
- localFunction.roomIds = newFunction.roomIds;
- localFunction.bus = newFunction.bus;
- localFunction.SaveFunctionFile();
- }
- deviceList.list.Remove(newFunction);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
+ continue;
}
+ delFile = localFunction.savePath;
+ FunctionList.List.DeleteFunction(localFunction);
+
}
+
+
}
//澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
- foreach (var newFunction in deviceList.list)
+ foreach (var newFunction in deviceList.list)
{
newFunction.SaveFunctionFile();
FunctionList.List.IniFunctionList(newFunction.savePath);
@@ -238,6 +255,7 @@
localScene.collect = newScene.collect;
localScene.modifyTime = newScene.modifyTime;
localScene.roomIds = newScene.roomIds;
+ localScene.image = newScene.image;
localScene.SaveSceneFile();
}
sceneList.Remove(newScene);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
@@ -285,6 +303,34 @@
//===================璇诲彇閫昏緫鍒楄〃==========================
UI.UI2.Intelligence.Automation.MainView.GetLogicList();
+<<<<<<< Updated upstream
+=======
+
+ //===================璇诲彇鍙瀵硅鏁版嵁==========================
+ //鍒ゆ柇鏄惁鏈夊彲瑙嗗璁叉暟鎹紝鏈夊垯鏄剧ず鍙瀵硅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)
+ {
+ 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 == "IMOUVISIAL")
+ {
+ UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
+ }
+ }
+ }
+
+>>>>>>> Stashed changes
}
catch (Exception ex)
{
@@ -300,6 +346,10 @@
waitPage.Hide();
waitPage.RemoveFromParent();
});
+ //涓嶈�冭檻缃戝叧鎯呭喌锛岀洿鎺ヨ闃�
+ DAL.Mqtt.MqttClient.InitState();
+
+ FunctionList.List.Read3tyFunctionStatus();
}
});
downloadDataThread.IsBackground = true;
@@ -336,12 +386,15 @@
catch { }
finally
{
- #region 璇诲彇鏈湴鏁版嵁
- //璇诲彇闊充箰淇℃伅
- UI.Music.A31MusicModel.ReadMusicStates();
- //鎼滅储缃戝叧
- DriverLayer.Control.Ins.SearchLoaclGateway();
- #endregion
+ if (DB_ResidenceData.Instance.CurrentRegion != null)
+ {
+ #region 璇诲彇鏈湴鏁版嵁
+ //璇诲彇闊充箰淇℃伅
+ UI.Music.A31MusicModel.ReadMusicStates();
+ //鎼滅储缃戝叧
+ DriverLayer.Control.Ins.SearchLoaclGateway();
+ #endregion
+ }
}
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0