炫彩功能优化

wxr

2023-07-19 6fe1c5ebeb8312edc479a4576f05d80c5051a6c6

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

@@ -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;
                            }
@@ -962,6 +995,7 @@
                switch (outputTarget.target_type)
                {
                    case "1":
                    case "5":
                        {
                            //用sid找到设备；
                            var device = LogicMethod.Current.GetDevice(outputTarget.sid);
@@ -975,7 +1009,11 @@
                            //区别不同设备，显示不同设备状态
                            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:
                                    {
@@ -1013,11 +1051,14 @@
                                        }
                                    }
                                    break;
                               
                              
                                case SPK.LightRGB:
                                case SPK.LightRGBW:
                                case SPK.LightCCT:
                                case SPK.LightDimming:
                                    {
                                        
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string brightness = GetKeyValue("brightness", dicList);
                                        if (on_off == "on" && brightness != "")
@@ -1044,9 +1085,82 @@
                                                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.GroupControl: //群控
                                    {
                                        targetView.btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/groupControl.png";
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string brightness = GetKeyValue("brightness", dicList);
                                        string cct = GetKeyValue(FunctionAttributeKey.CCT, dicList);
                                        string colorful = GetKeyValue(FunctionAttributeKey.Colorful, dicList);
                                        if (on_off == "on" && brightness != "")
                                        {
                                            stateStr = Language.StringByID(StringId.onLogic) + brightness + "%";
                                        }
                                        else if (on_off == "on")
                                        {
                                            stateStr = Language.StringByID(StringId.onLogic);
                                        }
                                        else if (on_off == "off")
                                        {
                                            stateStr = Language.StringByID(StringId.offLogic);
                                        }
                                        else if (brightness != "")
                                        {
                                            stateStr = brightness + "%";
                                        }
                                        //色温这个属性才有效
                                        if (!string.IsNullOrEmpty(cct))
                                        {
                                            stateStr += "," + Language.StringByID(StringId.ColorTemperature) + cct + "k";
                                        }

                                        if (!string.IsNullOrEmpty(colorful))
                                        {
                                            stateStr += "," + Language.StringByID(StringId.ColorfulFunction);
                                            if (colorful == "on")
                                            {
                                                stateStr += Language.StringByID(StringId.onLogic);
                                            }
                                            else if (colorful == "off")
                                            {
                                                stateStr += Language.StringByID(StringId.offLogic);
                                            }

                                            break;
                                        }

                                        string rgb = GetKeyValue("rgb", 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 +1257,12 @@

                                        if (set_temp != "")
                                        {

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

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

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

                            }

                        }
                    }
                    break;
                case SPK.GroupControl://群控
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            switch (dic["key"])
                            {
                                case "on_off":
                                case "colorful":
                                    {
                                        if (value == "on")
                                        {
                                            button1.Text = Language.StringByID(StringId.onLogic);
                                        }
                                        else
                                        {
                                            button1.Text = Language.StringByID(StringId.offLogic);
                                        }
                                    }
                                    break;
                                case "brightness":
                                    {
                                        if (button1 == null)
                                        {
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button1.Text = value + "%";
                                    }
                                    break;
                                case "cct":
                                    {
                                        if (button1 == null)
                                        {
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button1.Text = value + "k";
                                    }
                                    break;
                                case "rgb":
                                    {
                                        if (button1 == null)
                                        {
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        if (!string.IsNullOrEmpty(value) && value.Length > 6)
                                        {
                                            button1.BackgroundColor = new LogicView.RGBColorView().GetBackgroundColor(value);
                                            button1.Tag = value;
                                        }
                                    }
                                    break;

                            }

                        }
@@ -1978,6 +2176,7 @@
                        }
                    }
                    break;
              
                case SPK.SensorGas:
                case SPK.SensorSmoke:
                    {
@@ -2046,6 +2245,23 @@
                        }
                    }
                    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:
                    {
                        foreach (var dic in dicList)