From e3f3f62315a5789cd812b96954b67bffda4a0f5a Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期四, 01 四月 2021 16:33:55 +0800 Subject: [PATCH] 金辉项目,萤石摄像头更新 --- HDL_ON/Common/ApiUtlis.cs | 74 ++++++++++++++++++++++++------------ 1 files changed, 49 insertions(+), 25 deletions(-) diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs index a54fab4..364561b 100644 --- a/HDL_ON/Common/ApiUtlis.cs +++ b/HDL_ON/Common/ApiUtlis.cs @@ -46,7 +46,7 @@ public bool GatewayOnlineVerification() { bool result = DB_ResidenceData.Instance.HomeGateway.gatewayStatus; - + DriverLayer.Control.Ins.GatewayOnline_Cloud = result; if (!result) { @@ -159,8 +159,10 @@ { 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]; @@ -170,31 +172,20 @@ continue; } var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId); - if (newFunction == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍 + + 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) { + MainPage.Log(newFunction.savePath); newFunction.SaveFunctionFile(); FunctionList.List.IniFunctionList(newFunction.savePath); } @@ -286,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.VideoMethod.VideoClouds>(flVideoInfo.Data.ToString()); + } + } catch (Exception ex) { @@ -301,6 +299,10 @@ waitPage.Hide(); waitPage.RemoveFromParent(); }); + //涓嶈�冭檻缃戝叧鎯呭喌锛岀洿鎺ヨ闃� + DAL.Mqtt.MqttClient.InitState(); + + FunctionList.List.Read3tyFunctionStatus(); } }); downloadDataThread.IsBackground = true; @@ -337,15 +339,37 @@ 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(); } + + /// <summary> + /// 鑾峰彇鍔熻兘淇℃伅 + /// </summary> + public void GetFunctionInfo(string functionId) + { + var deviceResult = Ins.HttpRequest.GetDeviceInfo(functionId); + if (deviceResult.Code == StateCode.SUCCESS) + { + MainPage.Log($"璇诲彇璁惧淇℃伅鎴愬姛"); + var packList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString()); + + foreach(var function in packList.list) + { + function.SaveFunctionFile(); + FunctionList.List.IniFunctionList(function.savePath,true); + } + } + } } } \ No newline at end of file -- Gitblit v1.8.0