~wxr/OnPro.git - Gitblit

			@@ -247,7 +247,7 @@
			{
			inputView.btnState.Text = Language.StringByID(StringId.kaiqi);
			}


			}
			break;
			case SPK.SensorUtrasonic:
			@@ -307,12 +307,14 @@
			{
			string value = this.GetValue(dicList);
			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			if (value == "fall") {
			if (value == "fall")
			{
			inputView.btnState.Text = Language.StringByID(StringId.diedao);
			}
			}
			break;
			case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
			case SPK.SensorEnvironment:
			case SPK.SensorEnvironmentHailin:
			case SPK.SensorEnvironment2:
			case SPK.SensorEnvironment3:
			{
			@@ -376,7 +378,7 @@
			case SPK.SensorTemperature:
			{

			string str =this.GetText(dicList, "temperature");
			string str = this.GetText(dicList, "temperature");
			inputView.btnState.Text = str;
			}
			break;
			@@ -451,7 +453,7 @@


			}


			}
			inputView.btnState.Text = s;
			}
			@@ -462,7 +464,38 @@
			{
			inputView.btnState.Text = Language.StringByID(StringId.quyuruqingaojing);
			}


			}
			break;
			case SPK.Ev_Ipcam:
			if (inputCondition.identifier == "pir_event")
			{
			inputView.btnState.Text = Language.StringByID(StringId.On);
			}
			break;
			case SPK.SensorPirHold:
			{
			string value = this.GetKeyValue("people_status", dicList);
			if (string.IsNullOrEmpty(value))
			{
			inputView.btnState.Text = inputCondition.hold_time + "s";
			break;

			}

			inputView.btnState.Text = Language.StringByID(StringId.wuren);
			if (value == "true")
			{
			inputView.btnState.Text = Language.StringByID(StringId.youren);

			}
			if (!string.IsNullOrEmpty(inputCondition.hold_time) && int.Parse(inputCondition.hold_time) > 0)
			{

			inputView.btnState.Text += "持续" + inputCondition.hold_time + "s";
			}


			}
			break;
			}
			@@ -975,7 +1008,10 @@
			//区别不同设备，显示不同设备状态
			switch (device.spk)
			{

			case SPK.CommonSeries:
			targetView.btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/groupControl.png";
			stateStr = GetKeyValue("on_off", dicList) == "on" ? Language.StringByID(StringId.onLogic) : Language.StringByID(StringId.offLogic);
			break;
			//插座(有USB)
			case SPK.PanelSocket:
			{
			@@ -1018,6 +1054,24 @@
			case SPK.LightCCT:
			case SPK.LightDimming:
			{
			if(device.spk == SPK.LightRGB)
			{
			string colorful = GetKeyValue(FunctionAttributeKey.Colorful, dicList);
			if (!string.IsNullOrEmpty(colorful))
			{
			targetView.btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/groupControl.png";
			if (colorful == "on")
			{
			stateStr = Language.StringByID(StringId.onLogic);
			}
			else if (colorful == "off")
			{
			stateStr = Language.StringByID(StringId.offLogic);
			}

			break;
			}
			}
			string on_off = GetKeyValue("on_off", dicList);
			string brightness = GetKeyValue("brightness", dicList);
			if (on_off == "on" && brightness != "")
			@@ -1044,9 +1098,28 @@
			stateStr += "," +GetKeyValue("cct", dicList) + "k";
			}
			}
			if (device.spk == SPK.LightRGB)
			{
			string rgb = GetKeyValue("rgb", dicList);
			if (!string.IsNullOrEmpty(rgb) && rgb.Length > 6)
			{
			targetView.btnStateColor.Visible = true;
			targetView.btnStateColor.BackgroundColor = new LogicView.RGBColorView().GetBackgroundColor(rgb);
			}
			}
			if (device.spk == SPK.LightRGBW)
			{
			string rgb = GetKeyValue("rgbw", dicList);
			if (!string.IsNullOrEmpty(rgb) && rgb.Length > 6)
			{
			targetView.btnStateColor.Visible = true;
			targetView.btnStateColor.BackgroundColor = new LogicView.RGBColorView().GetBackgroundColor(rgb);
			}
			}

			}
			break;

			case SPK.CurtainSwitch:
			{
			foreach (var dic in dicList)
			@@ -1143,8 +1216,8 @@

			if (set_temp != "")
			{

			stateStr += set_temp + "℃,";
			string unit =GetTemperatureUnit(device);
			stateStr += set_temp + unit + ",";
			}

			if (mode != "")
			@@ -1241,8 +1314,8 @@
			}
			if (set_temp != "")
			{

			stateStr += set_temp + "℃,";
			string unit = GetTemperatureUnit(device);
			stateStr += set_temp + unit + ",";
			}
			if (mode != "")
			{
			@@ -1587,6 +1660,22 @@
			button3.Text = value + "k";
			}
			break;
			case "rgb":
			case "rgbw":
			{
			if (button3 == null)
			{
			//怕调试软件乱上东西导致抛异常
			break;
			}
			if (!string.IsNullOrEmpty(value) && value.Length > 6)
			{
			button3.BackgroundColor = new LogicView.RGBColorView().GetBackgroundColor(value);
			button3.Tag = value;
			}
			}
			break;

			}

			}
			@@ -1730,7 +1819,7 @@
			//怕调试软件乱上东西导致抛异常
			break;
			}
			button2.Text = value + "℃";
			button2.Text = value + GetTemperatureUnit(device); ;
			}
			break;
			case "mode":
			@@ -1843,7 +1932,7 @@
			//怕调试软件乱上东西导致抛异常
			break;
			}
			button2.Text = value + "℃";
			button2.Text = value + GetTemperatureUnit(device); ;
			}
			break;
			case "mode":
			@@ -1978,6 +2067,7 @@
			}
			}
			break;

			case SPK.SensorGas:
			case SPK.SensorSmoke:
			{
			@@ -2044,6 +2134,23 @@
			button1.Text = Language.StringByID(StringId.wuren);
			}
			}
			}
			break;
			case SPK.SensorPirHold:
			{
			foreach (var dic in dicList)
			{
			string value = dic["value"];
			if (value == "true")
			{
			button1.Text = Language.StringByID(StringId.youren);
			}
			else
			{
			button1.Text = Language.StringByID(StringId.wuren);
			}
			}

			}
			break;
			case SPK.SensorDoorWindow:
			@@ -2277,6 +2384,25 @@
			return dicList[0]["value"].ToString();
			}
			/// <summary>
			/// 获取温度单位
			/// </summary>
			/// <param name="device"></param>
			/// <returns></returns>
			public string GetTemperatureUnit(Entity.Function device)
			{
			string unit = string.Empty;
			if (device.GetAttribute("temperature_type") != null && device.GetAttribute("temperature_type").value.Count > 0)
			{
			unit = device.GetAttribute("temperature_type").value[0];
			}
			if (string.IsNullOrEmpty(unit))
			{
			//调试软件有空能上传为空
			unit = "℃";
			}
			return unit;
			}
			/// <summary>
			///获取自动化名称
			/// </summary>
			/// <returns> 新建自动化命名规则</returns>