From 96e9ff2e5a54f54cdbb6b8b2f049fdf6a837de3c Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 23 八月 2023 14:28:22 +0800 Subject: [PATCH] 备份1 --- OnPro/HDL_ON/Entity/FunctionList.cs | 333 ------------------------------------------------------- 1 files changed, 1 insertions(+), 332 deletions(-) diff --git a/OnPro/HDL_ON/Entity/FunctionList.cs b/OnPro/HDL_ON/Entity/FunctionList.cs index f6aad52..a540a49 100644 --- a/OnPro/HDL_ON/Entity/FunctionList.cs +++ b/OnPro/HDL_ON/Entity/FunctionList.cs @@ -55,75 +55,8 @@ /// 鍔熻兘鍒楄〃 /// </summary> public List<Function> Functions = new List<Function>(); - /// <summary> - /// 缇ゆ帶鍒楄〃 - /// </summary> - public List<GroupControl> groupControls = new List<GroupControl>(); - - /// <summary> - /// 鏈烘鑷傚垪琛� - /// </summary> - /// <returns></returns> - public List<Function> GetMechanicalArmList() - { - return Functions.FindAll((obj) => obj.spk == SPK.MechanicalArm); - } - - List<Function> _IpCamImou; - /// <summary> - /// 鑾峰彇鎽勫儚澶村垪琛� - /// </summary> - /// <returns></returns> - public List<Function> GetIpCamImouList() - { - if (_IpCamImou == null) - { - _IpCamImou = Functions.FindAll((obj) => obj.spk == SPK.IpCam_Imou); - if (_IpCamImou.Count > 0) - { -#if __IOS__ - //鍒濆鍖栧ぇ鍗庢憚鍍忓ごsdk - Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost); - Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString; - Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken; - Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().HomeId = DB_ResidenceData.Instance.CurrentRegion.id; - Console.WriteLine("token锛�" + UserInfo.Current.LoginTokenString); - Console.WriteLine("token锛�" + UserInfo.Current.RefreshToken); - Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList(); - - - -#else - Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost); - Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id; - Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken; -#endif - } - } - return _IpCamImou; - } - - /// <summary> - /// 缁垮缓绉戞妧绯荤粺 - /// 鎬绘帶鍒楄〃 - /// </summary> - /// <returns></returns> - public List<Function> GetAcstParentList() - { - return Functions.FindAll((obj) => obj.spk == SPK.AcstParent);//.OrderByDescending(o=>o.controlCounter).ToList() - } - - /// <summary> - /// 缁垮缓绉戞妧绯荤粺 - /// 瀛愭帶鍒楄〃 - /// </summary> - /// <returns></returns> - public List<Function> GetAcstSubList() - { - return Functions.FindAll((obj) => obj.spk == SPK.AcstSub); - } - + /// <summary> /// 绌鸿皟鍒楄〃 /// </summary> @@ -141,14 +74,6 @@ { var spkList = SPK.LightSpkList(); return Functions.FindAll((obj) => spkList.Contains(obj.spk)); - } - /// <summary> - /// 搴忓垪鍒楄〃 - /// </summary> - /// <returns></returns> - public List<Function> GetSeries() - { - return Functions.FindAll((obj) => obj.spk == SPK.CommonSeries); } /// <summary> @@ -169,20 +94,6 @@ return Functions.FindAll((obj) => spkList.Contains(obj.spk)); } - public List<Function> GetDoorLockList() - { - var spkList = SPK.GetDoorLockSPKList(); - return Functions.FindAll((obj) => spkList.Contains(obj.spk)); - } - /// <summary> - /// 鑾峰彇钀ょ煶瑙嗛闂ㄩ攣 - /// </summary> - /// <returns></returns> - public List<Function> GetVideoDoorLockList() - { - var spkList = SPK.GetVideoDoorLockSPKList(); - return Functions.FindAll((obj) => spkList.Contains(obj.spk)); - } /// <summary> /// 鏂伴鍒楄〃 @@ -195,137 +106,9 @@ } /// <summary> - /// 鑳芥簮鍒楄〃 - /// </summary> - /// <returns></returns> - public List<Function> GetEnergyList() - { - var spkList = SPK.EnergySpkList(); - return Functions.FindAll((obj) => spkList.Contains(obj.spk)); - } - - List<InverterInfo> _inverterList = new List<InverterInfo>(); - /// <summary> - /// 鍏変紡鍒楄〃 - /// </summary> - public List<Function> InverterList() - { - return Functions.FindAll((obj) => obj.spk == SPK.Inverter || obj.spk == SPK.InverterRst); - } - #region 瀹剁數鍒楄〃 electricals - /// <summary> - /// 瀹剁數鍒楄〃 - /// </summary> - public List<Function> GetElectricals() - { - var spkList = SPK.ElectricalSpkList(); - return Functions.FindAll((obj) => spkList.Contains(obj.spk)); - } - - - /// <summary> - /// 绾㈠瀹濆垪琛� - /// </summary> - public List<Function> GetIrModuleList() - { - return Functions.FindAll((obj) => obj.spk == SPK.IrModule); - } -#endregion - - /// <summary> - /// 闊充箰鍒楄〃 - /// </summary> - /// <returns></returns> - public List<Function> GetMusicList() - { - var spkList = SPK.MusicSpkList(); - return Functions.FindAll((obj) => spkList.Contains(obj.spk)); - } - - - /// <summary> - /// 鐜浼犳劅鍣ㄥ垪琛� - /// </summary> - public List<Function> GetEnvirSensorsList() - { - var spkList = SPK.EnvironDeviceSpkList(); - return Functions.FindAll((obj) => spkList.Contains(obj.spk)); - } - /// <summary> - /// 瀹夐槻璁惧鍒楄〃 - /// </summary> - public List<Function> GetArmSensorList() - { - var spkList = SPK.ArmSensorSpkList(); - return Functions.FindAll((obj) => spkList.Contains(obj.spk)); - } - /// <summary> - /// 瀹夐槻涓績鏀寔鐨勪紶鎰熷櫒鍒楄〃 - /// </summary> - public List<Function> GetArmCenterList() - { - var spkList = new List<string>() - { - SPK.SensorPir, - SPK.SensorPirHold, - SPK.SensorDoorWindow, - SPK.SensorSmoke, - SPK.SensorWater, - SPK.SensorGas, - }; - - return Functions.FindAll((obj) => spkList.Contains(obj.spk)); - } - - - /// <summary> - /// 鍙瀵硅鍒楄〃,褰撲负null鎴杝ize涓�0鍒欎笉鏄剧ず鍙瀵硅icon - /// </summary> - // public UI.UI2.FuntionControlView.Video.VideoClouds videoIntercom; - public List<UI.UI2.FuntionControlView.Video.Video> videoIntercom = new List<UI.UI2.FuntionControlView.Video.Video>(); - - List<Function> _OtherBrandFunction; - /// <summary> - /// 绗笁鏂瑰搧鐗屽姛鑳� - /// </summary> - public List<Function> OtherBrandFunction - { - get - { - if(_OtherBrandFunction == null) - { - _OtherBrandFunction = new List<Function>(); - var spkList = SPK.GetAll3tySPK(); - _OtherBrandFunction = Functions.FindAll((obj) => spkList.Contains(obj.spk)); - } - return _OtherBrandFunction; - } - } - - - /// <summary> /// 鍦烘櫙鍒楄〃 /// </summary> public List<Scene> scenes = new List<Scene>(); - - /// <summary> - /// 瀹夐槻鍒楄〃 - /// </summary> - public List<SecurityAlarm> securities = new List<SecurityAlarm>(); - - public List<SecurityAlarm> GetOrdinarySecurities() - { - var ordinarySecurities = new List<SecurityAlarm>(); - foreach (var mode in securities) - { - if (mode.type == "all_day" || mode.type == "mute") - { - continue; - } - ordinarySecurities.Add(mode); - } - return ordinarySecurities; - } /// <summary> /// 鍔犺浇鍔熻兘鍒楄〃 @@ -351,11 +134,6 @@ FileUtlis.Files.DeleteFile(filePath); return; } - //闊充箰閮ㄥ垎瑕佷慨鏀� - //if(tempFunction.spk.ToString() == SPK.MusicStandard) - //{ - // UI.Music.A31MusicModel.A31MusicModelList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<UI.Music.A31MusicModel>(functionDataString)); - //} if (checkRepeat == true) { //妫�娴嬮噸澶� @@ -367,16 +145,6 @@ Functions.Remove(sameTemp); } } - //for (int i = 0; i < Functions.Count; i++) - //{ - // if (Functions[i].deviceId == tempFunction.deviceId) - // { - // //鍏堢Щ闄ゆ帀鍐嶅姞 - // Functions.RemoveAt(i); - // Functions.Add(tempFunction); - // return; - // } - //} } Functions.Add(tempFunction); } @@ -386,33 +154,6 @@ var sceneDataString = System.Text.Encoding.UTF8.GetString(sceneDataBytes); var tempScene = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(sceneDataString); List.scenes.Add(tempScene); - } - else if (filePath.StartsWith("SecurityData_")) - { - var dataBytes = FileUtlis.Files.ReadFile(filePath); - var dataString = System.Text.Encoding.UTF8.GetString(dataBytes); - var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityAlarm>(dataString); - if (temp == null) - { - MainPage.Log("SecurityData_null"); - FileUtlis.Files.DeleteFile(filePath); - return; - } - if (checkRepeat == true) - { - //妫�娴嬮噸澶� - for (int i = 0; i < securities.Count; i++) - { - if (securities[i].sid == temp.sid) - { - //鍏堢Щ闄ゆ帀鍐嶅姞 - securities.RemoveAt(i); - securities.Add(temp); - return; - } - } - } - securities.Add(temp); } } catch (Exception ex) @@ -429,47 +170,6 @@ /// </summary> public List<Function> GetDeviceFunctionList(SPK.BrandType brandType = SPK.BrandType.All) { - List<Function> resultFunctions = new List<Function>(); - if (brandType == SPK.BrandType.All) - { - } - else - { - switch (brandType) - { - case SPK.BrandType.Hdl: - try - { - foreach (var function in Functions) - { - if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(function.spk)) - { - resultFunctions.Add(function); - } - } - } - catch { } - break; - - case SPK.BrandType.Tuya: - lock (Functions) - { - try - { - foreach (var function in Functions) - { - if (SPK.Get3tySpk(SPK.BrandType.Tuya).Contains(function.spk)) - { - resultFunctions.Add(function); - } - } - } - catch { } - } - break; - } - return resultFunctions; - } return Functions; } @@ -484,11 +184,6 @@ { try { - if (_IpCamImou != null) - { - _IpCamImou.Clear(); - _IpCamImou = null; - } _FunctionList = new FunctionList(); } catch (Exception ex) @@ -553,31 +248,6 @@ bool lockReadFunctionStatus = false; - /// <summary> - /// 璇诲彇绗笁鏂硅澶囩姸鎬� - /// </summary> - public void Read3tyFunctionStatus() - { - //璇诲彇娑傞甫璁惧鐘舵�� - if (GetDeviceFunctionList(SPK.BrandType.Tuya).Count > 0) - { - var page = new List<string>(); - int count = 0; - foreach (var function in GetDeviceFunctionList(SPK.BrandType.Tuya)) - { - page.Add(function.deviceId); - count++; - if (count > 9) - { - DriverLayer.Control.Ins.ReadFunctionsInfo(page); - page.Clear(); - count = 0; - } - } - DriverLayer.Control.Ins.ReadFunctionsInfo(page); - } - - } /// <summary> /// 璇诲彇鍏ㄩ儴鍔熻兘鐨勭姸鎬� @@ -600,7 +270,6 @@ lockReadFunctionStatus = true; try { - Read3tyFunctionStatus(); if(DriverLayer.Control.Ins.GatewayOnline_Local) { -- Gitblit v1.8.0