From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 29 八月 2023 09:22:38 +0800 Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc --- HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs index 58bd067..dafeb0b 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs @@ -131,7 +131,7 @@ /// <param name="dic">Dictionary绫�</param> /// <param name="key">鍋�</param> /// <param name="value">鍊�</param> - public void dictionary(Dictionary<string, string> dic, string key, string value) + public void dictionary(Dictionary<string, string> dic, string key, string value) { if (dic.ContainsKey(key)) //鍒ゆ柇鏄惁瀛樺湪閿�� { @@ -206,7 +206,7 @@ function.spk = videoDevice.spk; function.name = videoDevice.deviceName; function.deviceId = videoDevice.deviceId; - function.online = videoDevice.status == "online"; + function.setOnine( videoDevice.status == "online"); function.sid = videoDevice.sid; var video = functionList.Find((o) => o.deviceId == function.deviceId); if (video == null) @@ -586,6 +586,7 @@ device.spk == SPK.AirSwitch || device.spk == SPK.PanelSocket || device.spk == SPK.ElectricSocket + || device.spk == SPK.ElectricalTvHisense ); if (electric != null) { @@ -715,6 +716,7 @@ functionTypeList.Add(SPK.AirSwitch); functionTypeList.Add(SPK.PanelSocket); functionTypeList.Add(SPK.ElectricSocket); + functionTypeList.Add(SPK.ElectricalTvHisense); } ///闂ㄩ攣绫� else if (deviceType == Language.StringByID(StringId.DoorLock)) @@ -807,6 +809,7 @@ functionTypeList.Add(SPK.VideoDoorLock); functionTypeList.Add(SPK.AcIr); functionTypeList.Add(SPK.SensorPirHold); + functionTypeList.Add(SPK.ElectricalTvHisense); } @@ -896,6 +899,7 @@ deviceTypeList.Add(SPK.AvMusic); deviceTypeList.Add(SPK.MechanicalArm); deviceTypeList.Add(SPK.AcIr); + deviceTypeList.Add(SPK.ElectricalTvHisense); } break; } @@ -1226,6 +1230,7 @@ new Entity.Function { sid = "12345678991234566844", name = "澶у崕鎽勫儚澶�", spk = Entity.SPK.IpCam_Imou }, new Entity.Function { sid = "12345678991234567", name = "RGB", spk = Entity.SPK.LightRGB }, new Entity.Function { sid = "123456789912345678", name = "RGBW", spk = Entity.SPK.LightRGBW }, + new Function { spk = SPK.ElectricalTvHisense, name = "娴蜂俊鐢佃1",sid="123456789"}, }; foreach (var function in functions) { -- Gitblit v1.8.0