~wxr/HDL_APP_Project.git

			@@ -104,7 +104,6 @@
			{
			GetEditState(device, index, view.btnState, null, null, null);
			}

			}
			break;
			//干接点
			@@ -161,7 +160,7 @@
			}
			break;
			//超声波传感器
			case SPK.SensoruUtrasonic:
			case SPK.SensorUtrasonic:
			{

			LogicView.FunTypeView view = new LogicView.FunTypeView();
			@@ -203,7 +202,9 @@
			}
			break;
			//环境检测传感器
			case SPK.SenesorEnvironment:
			case SPK.SensorEnvironment:
			case SPK.SensorEnvironment2:
			case SPK.SensorEnvironment3:
			{
			#region 界面
			///温度
			@@ -229,7 +230,11 @@
			LogicView.FunTypeView tvocView = new LogicView.FunTypeView();
			tvocView.frameLayout.Y = co2View.frameLayout.Bottom;
			tvocView.btnText.TextID = StringId.tvoc;
			fLayout.AddChidren(tvocView.FLayoutView());
			if (SPK.SensorEnvironment3 != device.spk)
			{
			fLayout.AddChidren(tvocView.FLayoutView());
			}

			#endregion
			#region 点击事件
			///温度点击事件
			@@ -266,6 +271,90 @@

			};
			#endregion
			}
			break;
			//温度传感器
			case SPK.SensorTemperature:
			{
			///温度
			LogicView.FunTypeView wenuView = new LogicView.FunTypeView();
			wenuView.btnText.TextID = StringId.wendu;
			fLayout.AddChidren(wenuView.FLayoutView());

			///温度点击事件
			wenuView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			new PublicInterface { }.ViewZuHe(this, StringId.wendugaoyu, StringId.wendudiyu, (intText, view) =>
			{
			InputBoxAction(device, intText, index, edit);
			});
			};
			}
			break;
			//湿度传感器
			case SPK.SensorHumidity:
			{
			///湿度
			LogicView.FunTypeView shiduView = new LogicView.FunTypeView();
			shiduView.btnText.TextID = StringId.shidu;
			fLayout.AddChidren(shiduView.FLayoutView());
			///湿度点击事件
			shiduView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			new PublicInterface { }.ViewZuHe(this, StringId.shidugaoyu, StringId.shidudiyu, (intText, view) =>
			{
			InputBoxAction(device, intText, index, edit);
			});

			};
			}
			break;
			//co2
			case SPK.SensorCO2:
			{


			///co2
			LogicView.FunTypeView co2View = new LogicView.FunTypeView();
			co2View.btnText.TextID = StringId.co2;
			fLayout.AddChidren(co2View.FLayoutView());

			///co2点击事件
			co2View.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			PmCo2TvocAction(this, device, "co2", StringId.co2, index, edit);
			};
			}
			break;
			//pm2.5
			case SPK.SensorPm25:
			{
			///pm2.5
			LogicView.FunTypeView pm25View = new LogicView.FunTypeView();
			pm25View.btnText.TextID = StringId.pm25;
			fLayout.AddChidren(pm25View.FLayoutView());

			///pm2.5点击事件
			pm25View.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			PmCo2TvocAction(this, device, "pm25", StringId.pm25, index, edit);
			};
			}
			break;
			//tvoc
			case SPK.SensorTVOC:
			{
			///tvoc
			LogicView.FunTypeView tvocView = new LogicView.FunTypeView();
			tvocView.btnText.TextID = StringId.tvoc;
			fLayout.AddChidren(tvocView.FLayoutView());

			///tvoc点击事件
			tvocView.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			PmCo2TvocAction(this, device, "tvoc", StringId.tvoc, index, edit);

			};
			}
			break;
			}
			@@ -366,7 +455,7 @@
			case SPK.SensorDuiShe:
			case SPK.SensorPir:
			case SPK.SensorDoorWindow:
			case SPK.SensoruUtrasonic:
			case SPK.SensorUtrasonic:
			{
			keyVlaue = "status";
			}
			@@ -537,7 +626,7 @@
			{
			var value = view.GetValue(key, text);
			selectedState = device.spk + "_"+ key;
			AddDictionary(key, value, "integer");
			AddDictionary(key, value, "integer","in");
			Save(device,index, edit);
			});
			}
			@@ -553,7 +642,7 @@
			private void GetEditState(Entity.Function device, int index, Button button1, Button button2, Button button3, Button button4)
			{
			Input inputs = Logic.currlogic.input[index];
			var dicList = inputs.condition as List<Dictionary<string, string>>;
			var dicList = inputs.condition;
			//清除之前旧数据
			dicSateteList.Clear();
			if (dicList.Count != 0)