~wxr/OnPro.git - Gitblit

			@@ -1098,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)
			@@ -1197,8 +1216,8 @@

			if (set_temp != "")
			{
			string unit = device.GetAttribute("temperature_type") == null ? "°" : device.GetAttribute("temperature_type").state;
			stateStr += set_temp + unit+",";
			string unit =GetTemperatureUnit(device);
			stateStr += set_temp + unit + ",";
			}

			if (mode != "")
			@@ -1295,7 +1314,7 @@
			}
			if (set_temp != "")
			{
			string unit = device.GetAttribute("temperature_type") == null ? "°" : device.GetAttribute("temperature_type").state;
			string unit = GetTemperatureUnit(device);
			stateStr += set_temp + unit + ",";
			}
			if (mode != "")
			@@ -1641,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;

			}

			}
			@@ -1784,7 +1819,7 @@
			//怕调试软件乱上东西导致抛异常
			break;
			}
			button2.Text = value + "℃";
			button2.Text = value + GetTemperatureUnit(device); ;
			}
			break;
			case "mode":
			@@ -1897,7 +1932,7 @@
			//怕调试软件乱上东西导致抛异常
			break;
			}
			button2.Text = value + "℃";
			button2.Text = value + GetTemperatureUnit(device); ;
			}
			break;
			case "mode":
			@@ -2349,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>