wxr
2023-07-10 a6e32221aa4bc5019a066fad90c4955064647cae
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -467,6 +467,12 @@
                                    }
                                    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);
@@ -1002,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:
                                    {
@@ -1045,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 != "")