~wxr/HDL_APP_Project.git

			@@ -376,7 +376,41 @@

			}
			break;
			case SPK.SensorTemperature:
			{

			string str =new InpOrOutLogicMethod { }.GetText(dicList);
			inputView.btnState.Text = str;
			}
			break;
			case SPK.SensorHumidity:
			{
			string str = new InpOrOutLogicMethod { }.GetText(dicList);
			inputView.btnState.Text = str;

			}
			break;
			case SPK.SensorCO2:
			{
			string str = new InpOrOutLogicMethod { }.GetText(dicList);
			inputView.btnState.Text = str;

			}
			break;
			case SPK.SensorPm25:
			{
			string str = new InpOrOutLogicMethod { }.GetText(dicList);
			inputView.btnState.Text = str;

			}
			break;
			case SPK.SensorTVOC:
			{
			string str = new InpOrOutLogicMethod { }.GetText(dicList);
			inputView.btnState.Text = str;

			}
			break;
			}
			}
			break;
			@@ -612,7 +646,15 @@
			{
			//用sid找到设备；
			var device = LogicMethod.CurrLogicMethod.GetDevice(inputCondition.sid);
			if (device.spk == SPK.SensorEnvironment\|\| device.spk == SPK.SensorEnvironment2 \|\| device.spk == SPK.SensorEnvironment3)
			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
			)
			{
			//这个设备比较特殊
			ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
			@@ -766,7 +808,7 @@
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			}
			break;


			}
			};
			///删除控件
			@@ -813,7 +855,6 @@
			targetView.btnText.Text = device.name;
			//改变设备名称显示控件宽度
			targetView.btnText.Width = Application.GetRealWidth(80);

			//区别不同设备，显示不同设备状态
			switch (device.spk)
			{
			@@ -1048,27 +1089,61 @@
			break;
			}

			}
			if (on_off != "" && on_off == "off")
			{
			stateStr = Language.StringByID(StringId.offLogic);
			}
			else
			{
			stateStr = stateStr.TrimEnd(',');

			switch (mode)
			}
			}
			break;
			case SPK.AirFreshStandard:
			{
			string on_off = GetKeyValue("on_off", dicList);
			string fan = GetKeyValue("fan", dicList);
			if (on_off != "")
			{
			switch (on_off)
			{
			case "cool":
			case "on":
			{
			stateStr += Language.StringByID(StringId.coolLogic) + ",";
			stateStr = Language.StringByID(StringId.onLogic) + ",";
			}
			break;
			case "heat":
			case "off":
			{
			stateStr += Language.StringByID(StringId.heatingLogic) + ",";
			stateStr = Language.StringByID(StringId.offLogic) + ",";
			}
			break;
			}
			}
			if (fan != "")
			{

			switch (fan)
			{
			case "high":
			{
			stateStr += Language.StringByID(StringId.HighWindSpeed) + ",";
			}
			break;
			case "medium":
			{
			stateStr += Language.StringByID(StringId.MiddleWindSpeed) + ",";
			}
			break;
			case "low":
			{
			stateStr += Language.StringByID(StringId.LowWindSpeed) + ",";
			}
			break;
			case "auto":
			{
			stateStr += Language.StringByID(StringId.autoLogic) + ",";
			}
			break;
			case "dry":
			{
			stateStr += Language.StringByID(StringId.dehumidifyLogic) + ",";
			stateStr += Language.StringByID(StringId.Auto) + ",";
			}
			break;
			}
			@@ -1506,6 +1581,73 @@

			}
			break;
			case SPK.AirFreshStandard:
			{

			foreach (var dic in dicList)
			{
			string value = dic["value"];
			switch (dic["key"])
			{
			case "on_off":
			{
			switch (value)
			{
			case "on":
			{
			button1.Text = Language.StringByID(StringId.onLogic);
			}
			break;
			case "off":
			{
			button1.Text = Language.StringByID(StringId.offLogic);
			}
			break;
			}
			}
			break;

			case "fan":
			{
			if (button2 == null)
			{
			//怕调试软件乱上东西导致抛异常
			break;
			}
			switch (value)
			{
			case "high":
			{
			button2.Text = Language.StringByID(StringId.HighWindSpeed);
			}
			break;
			case "medium":
			{
			button2.Text = Language.StringByID(StringId.MiddleWindSpeed);
			}
			break;
			case "low":
			{
			button2.Text = Language.StringByID(StringId.LowWindSpeed);
			}
			break;
			case "auto":
			{
			button2.Text = Language.StringByID(StringId.Auto);
			}
			break;
			}


			}
			break;

			}

			}

			}
			break;
			case SPK.SensorGas:
			case SPK.SensorSmoke:
			{
			@@ -1700,6 +1842,13 @@
			name = device.name + "-";
			}
			break;
			case "10":
			{
			//用sid找到场景；
			var scene = LogicMethod.CurrLogicMethod.GetSecne(inputCondition.sid);
			name = scene.name + "-";
			}
			break;

			}
			//默认取第一个目标
			@@ -1821,18 +1970,24 @@

			}
			break;
			case "3":
			{
			//用sid找到安防；
			var security = LogicMethod.CurrLogicMethod.GetSecurity(outputTarget.sid);
			name += security.name;

			}
			break;
			}

			if (!MainView.IsGatewayType)
			{
			name +=Language.StringByID(StringId.push);
			name += Language.StringByID(StringId.push);
			}
			}
			catch { }
			return name;
			}


			/// <summary>
			/// 延时时间方法
			/// </summary>
			@@ -1928,11 +2083,74 @@
			state = seconds.ToString() + Language.StringByID(StringId.s);
			}
			}
			if (!string.IsNullOrEmpty(state)) {
			if (!string.IsNullOrEmpty(state))
			{
			state = Language.StringByID(StringId.delayLogic) + state;
			}
			return state;
			}
			/// <summary>
			/// 获取显示面熟文本
			/// </summary>
			/// <param name="dicList">状态数据列表</param>
			/// <returns></returns>
			private string GetText(List<Dictionary<string, string>> dicList)
			{
			string strtext = "";
			foreach (var dic in dicList)
			{
			string key = dic["key"];
			string value = dic["value"];
			string comparator = dic["comparator"];
			switch (key)
			{

			case "temperature":
			{
			if (comparator == ">")
			{
			strtext = ">" + value + "℃";
			}
			else if (comparator == "<")
			{
			strtext = "<" + value + "℃";
			}

			}
			break;
			case "humidity":
			{
			if (comparator == ">")
			{
			strtext = ">" + value + "%";
			}
			else if (comparator == "<")
			{
			strtext = "<" + value + "%";
			}

			}
			break;
			case "co2":
			{
			strtext = Language.StringByID(StringId.co2) + new PublicInterface { }.GetString("co2", value);
			}
			break;
			case "pm25":
			{
			strtext = Language.StringByID(StringId.pm25) + new PublicInterface { }.GetString("pm25", value);
			}
			break;
			case "tvoc":
			{
			strtext = Language.StringByID(StringId.tvoc) + new PublicInterface { }.GetString("tvoc", value);
			}
			break;
			}
			}
			return strtext;
			}

			}
			}