Merge branch 'dev--wxr' into LcSdkV1

wxr

2022-11-23 5b77d9d57a6cddb474a66ca54401ad5ab0892db3

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

@@ -281,6 +281,7 @@
                                    }
                                    break;
                                case SPK.SenesorMegahealth:
                                case SPK.SensorMmvPose:
                                    {
                                        string key = this.GetKey(dicList);
                                        string value = this.GetValue(dicList);
@@ -922,11 +923,14 @@
                            //区别不同设备，显示不同设备状态
                            switch (device.spk)
                            {
                               
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                //插座
                                case SPK.PanelSocket:
                                case SPK.ElectricSocket:
                                //机械手
                                case SPK.MechanicalArm:
                                    {//开关

                                        foreach (var dic in dicList)
@@ -966,6 +970,14 @@
                                        else if (brightness != "")
                                        {
                                            stateStr = brightness + "%";
                                        }
                                        if (device.spk == SPK.LightCCT)
                                        {
                                            //色温这个属性才有效
                                            if (stateStr != Language.StringByID(StringId.offLogic) && GetKeyValue("cct", dicList) != "")
                                            {
                                                stateStr += "," +GetKeyValue("cct", dicList) + "k";
                                            }
                                        }

                                    }
@@ -1435,6 +1447,8 @@
                //开关灯光
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                    //机械手
                case SPK.MechanicalArm:
                    {
                        foreach (var dic in dicList)
                        {
@@ -1480,6 +1494,16 @@
                                            break;
                                        }
                                        button2.Text = value + "%";
                                    }
                                    break;
                                case "cct":
                                    {
                                        if (button3 == null)
                                        {
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button3.Text = value + "k";
                                    }
                                    break;
                            }
@@ -1997,6 +2021,7 @@
                    }
                    break;
                case SPK.SenesorMegahealth:
                case SPK.SensorMmvPose:
                    {
                        foreach (var dic in dicList)
                        {
@@ -2189,6 +2214,7 @@
                            //区别不同设备，显示不同设备状态
                            switch (device.spk)
                            {
                                case SPK.MechanicalArm:
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                    {//开关灯