From ccd5b1c8dc2d0399745779fb4f9a261d24d75a6d Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 23 十一月 2021 14:43:13 +0800 Subject: [PATCH] 备份 --- HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 166 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 142 insertions(+), 24 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs index 999ffc2..61973d1 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs @@ -135,7 +135,8 @@ //鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬� switch (device.spk) { - //寮�鍏崇伅鍏� light.Switch + //寮�鍏崇伅鍏� + case SPK.AirSwitch: case SPK.LightDimming: case SPK.LightRGB: case SPK.LightRGBW: @@ -146,11 +147,15 @@ case SPK.CurtainRoller: case SPK.CurtainTrietex: //绌鸿皟 - case SPK.AcStandard: + case SPK.AcStandard:case SPK.HvacAC: //鍦扮儹 - case SPK.FloorHeatStandard: + case SPK.HvacFloorHeat:case SPK.FloorHeatStandard: //鏂伴 case SPK.AirFreshStandard: + case SPK.HvacAirFresh: + //鎻掑骇 + case SPK.PanelSocket: + case SPK.ElectricSocket: {//寮�鍏崇伅 foreach (var dic in dicList) { @@ -205,6 +210,7 @@ } break; case SPK.SensorDryContact: + case SPK.SensorDryContact2: { foreach (var dic in dicList) { @@ -269,6 +275,7 @@ switch (dic["key"]) { case "status": + case "people_status": { if (value == "true") { @@ -302,6 +309,7 @@ } break; case SPK.SenesorMegahealth: + case SPK.SenesorMegahealth2: { foreach (var dic in dicList) { @@ -381,41 +389,41 @@ case SPK.SensorTemperature: { - string str =new InpOrOutLogicMethod { }.GetText(dicList); + string str =new InpOrOutLogicMethod { }.GetText(dicList, "temperature"); inputView.btnState.Text = str; } break; case SPK.SensorHumidity: { - string str = new InpOrOutLogicMethod { }.GetText(dicList); + string str = new InpOrOutLogicMethod { }.GetText(dicList, "humidity"); inputView.btnState.Text = str; } break; case SPK.SensorCO2: { - string str = new InpOrOutLogicMethod { }.GetText(dicList); + string str = new InpOrOutLogicMethod { }.GetText(dicList, "co2"); inputView.btnState.Text = str; } break; case SPK.SensorPm25: { - string str = new InpOrOutLogicMethod { }.GetText(dicList); + string str = new InpOrOutLogicMethod { }.GetText(dicList, "pm25"); inputView.btnState.Text = str; } break; case SPK.SensorTVOC: { - string str = new InpOrOutLogicMethod { }.GetText(dicList); + string str = new InpOrOutLogicMethod { }.GetText(dicList, "tvoc"); inputView.btnState.Text = str; } break; case SPK.SensorHcho: { - string str = new InpOrOutLogicMethod { }.GetText(dicList); + string str = new InpOrOutLogicMethod { }.GetText(dicList, "hcho"); inputView.btnState.Text = str; } @@ -658,12 +666,6 @@ if (device.spk == SPK.SensorEnvironment || device.spk == SPK.SensorEnvironment2 || device.spk == SPK.SensorEnvironment3 - || device.spk == SPK.SensorTemperature - || device.spk == SPK.SensorHumidity - || device.spk == SPK.SensorCO2 - || device.spk == SPK.SensorPm25 - || device.spk == SPK.SensorTVOC - || device.spk == SPK.SensorHcho ) { //杩欎釜璁惧姣旇緝鐗规畩 @@ -725,11 +727,47 @@ break; case "hcho": { - conditionDeviceFunList.PmCo2TvocAction(thisView, device, "hcho", StringId.tvoc, indexVulae, true, stateValue); + conditionDeviceFunList.PmCo2TvocAction(thisView, device, "hcho", StringId.Formaldehyde, indexVulae, true, stateValue); } break; } } + + } + else if (device.spk == SPK.SensorTemperature) + { + + new InpOrOutLogicMethod().SensorView(thisView, device, "temperature", indexVulae); + + } + else if ( device.spk == SPK.SensorHumidity) + { + + new InpOrOutLogicMethod().SensorView(thisView, device, "humidity", indexVulae); + + } + else if (device.spk == SPK.SensorCO2) + { + + new InpOrOutLogicMethod().SensorView(thisView, device, "co2", indexVulae); + + } + else if (device.spk == SPK.SensorPm25) + { + + new InpOrOutLogicMethod().SensorView(thisView, device, "pm25", indexVulae); + + } + else if (device.spk == SPK.SensorTVOC) + { + + new InpOrOutLogicMethod().SensorView(thisView, device, "tvoc", indexVulae); + + } + else if (device.spk == SPK.SensorHcho) + { + + new InpOrOutLogicMethod().SensorView(thisView, device, "hcho", indexVulae); } else @@ -872,8 +910,12 @@ //鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬� switch (device.spk) { + case SPK.AirSwitch: case SPK.LightSwitch: - {//寮�鍏崇伅 + //鎻掑骇 + case SPK.PanelSocket: + case SPK.ElectricSocket: + {//寮�鍏� foreach (var dic in dicList) { @@ -945,6 +987,7 @@ } break; case SPK.AcStandard: + case SPK.HvacAC: { string on_off = GetKeyValue("on_off", dicList); string set_temp = GetKeyValue("set_temp", dicList); @@ -1043,7 +1086,7 @@ } break; - case SPK.FloorHeatStandard: + case SPK.FloorHeatStandard:case SPK.HvacFloorHeat: { string on_off = GetKeyValue("on_off", dicList); string set_temp = GetKeyValue("set_temp", dicList); @@ -1116,6 +1159,7 @@ } break; case SPK.AirFreshStandard: + case SPK.HvacAirFresh: { string on_off = GetKeyValue("on_off", dicList); string fan = GetKeyValue("fan", dicList); @@ -1319,7 +1363,11 @@ { switch (device.spk) { + //鎻掑骇 + case SPK.PanelSocket: + case SPK.ElectricSocket: //寮�鍏崇伅鍏� + case SPK.AirSwitch: case SPK.LightSwitch: { foreach (var dic in dicList) @@ -1402,6 +1450,7 @@ } break; case SPK.AcStandard: + case SPK.HvacAC: { foreach (var dic in dicList) { @@ -1512,7 +1561,7 @@ } break; - case SPK.FloorHeatStandard: + case SPK.FloorHeatStandard:case SPK.HvacFloorHeat: { foreach (var dic in dicList) @@ -1596,6 +1645,7 @@ } break; case SPK.AirFreshStandard: + case SPK.HvacAirFresh: { foreach (var dic in dicList) @@ -1620,8 +1670,8 @@ } } break; - - case "fan": + + case "fan": { if (button2 == null) { @@ -1696,6 +1746,7 @@ } break; case SPK.SensorDryContact: + case SPK.SensorDryContact2: { foreach (var dic in dicList) { @@ -1753,6 +1804,7 @@ switch (dic["key"]) { case "status": + case "people_status": { if (value == "true") { @@ -1785,6 +1837,7 @@ } break; case SPK.SenesorMegahealth: + case SPK.SenesorMegahealth2: { foreach (var dic in dicList) { @@ -1881,6 +1934,7 @@ //鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬� switch (device.spk) { + case SPK.AirSwitch: case SPK.LightSwitch: {//寮�鍏崇伅 @@ -1953,7 +2007,8 @@ } break; case SPK.AcStandard: - case SPK.FloorHeatStandard: + case SPK.HvacAC: + case SPK.FloorHeatStandard:case SPK.HvacFloorHeat: { foreach (var dic in dicList) { @@ -2108,12 +2163,11 @@ /// </summary> /// <param name="dicList">鐘舵�佹暟鎹垪琛�</param> /// <returns></returns> - private string GetText(List<Dictionary<string, string>> dicList) + private string GetText(List<Dictionary<string, string>> dicList,string key) { string strtext = ""; foreach (var dic in dicList) { - string key = dic["key"]; string value = dic["value"]; string comparator = dic["comparator"]; switch (key) @@ -2169,7 +2223,71 @@ } return strtext; } + private void SensorView(FrameLayout thisView, Function device,string key, int indexVulae) { + //杩欎釜璁惧姣旇緝鐗规畩 + ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList(); + ///褰撳墠鐨勭储寮曞�兼暟鎹璞� + Input inputedit = Logic.currlogic.input[indexVulae]; + ///鐘舵�佸�� + string stateValue = ""; + foreach (var dic in inputedit.condition) + { + string comparator = dic["comparator"]; + stateValue = dic["value"]; + switch (key) + { + case "temperature": + { + int titleInt = 0; + if (comparator == ">") + { + titleInt = StringId.wendugaoyu; + } + else if (comparator == "<") + { + titleInt = StringId.wendudiyu; + } + conditionDeviceFunList.InputBoxAction(device, titleInt, indexVulae, true, stateValue); + } + break; + case "humidity": + { + int titleInt = 0; + if (comparator == ">") + { + titleInt = StringId.shidugaoyu; + } + else if (comparator == "<") + { + titleInt = StringId.shidudiyu; + } + conditionDeviceFunList.InputBoxAction(device, titleInt, indexVulae, true, stateValue); + } + break; + case "co2": + { + conditionDeviceFunList.PmCo2TvocAction(thisView, device, "co2", StringId.co2, indexVulae, true, stateValue); + } + break; + case "pm25": + { + conditionDeviceFunList.PmCo2TvocAction(thisView, device, "pm25", StringId.pm25, indexVulae, true, stateValue); + } + break; + case "tvoc": + { + conditionDeviceFunList.PmCo2TvocAction(thisView, device, "tvoc", StringId.tvoc, indexVulae, true, stateValue); + } + break; + case "hcho": + { + conditionDeviceFunList.PmCo2TvocAction(thisView, device, "hcho", StringId.Formaldehyde, indexVulae, true, stateValue); + } + break; + } + } + } } } -- Gitblit v1.8.0