Merge branch 'wjc' into Dev-1.9

wxr

2023-07-19 607e4db3b1a4ad059fc8d719117dab7eae9f20d2

 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs

@@ -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,7 +1216,11 @@

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

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

                            }

                        }