2022年11月04日16:26:44

wjc

2022-11-04 94d6591af7870ba0f1f7797310c07581d6fcd0b4

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

@@ -922,11 +922,14 @@
                            //区别不同设备，显示不同设备状态
                            switch (device.spk)
                            {
                               
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                //插座
                                case SPK.PanelSocket:
                                case SPK.ElectricSocket:
                                //机械手
                                case SPK.MechanicalArm:
                                    {//开关

                                        foreach (var dic in dicList)
@@ -1274,12 +1277,15 @@
                                case SPK.MusicStandard:
                                case SPK.AvMusic:
                                    {
                                        foreach (var dic in dicList)
                                        string song_name = GetKeyValue("song_name", dicList);
                                        string volume = GetKeyValue("volume", dicList);
                                        stateStr = song_name + ";" +Language.StringByID(StringId.volumeMusic)+volume;
                                        if (stateStr.StartsWith(";"))
                                        {
                                            if (dic["key"] == "song_name")
                                            {
                                                stateStr = dic["value"]?.ToString();
                                            }
                                            stateStr = stateStr.Substring(1, stateStr.Length - 1);
                                        }else if (stateStr.EndsWith(Language.StringByID(StringId.volumeMusic)))
                                        {
                                            stateStr = stateStr.Substring(0, stateStr.Length - 3);
                                        }
                                    }
                                    break;
@@ -1432,6 +1438,8 @@
                //开关灯光
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                    //机械手
                case SPK.MechanicalArm:
                    {
                        foreach (var dic in dicList)
                        {
@@ -2065,6 +2073,10 @@
                            {
                                button1.Text = dic["value"]?.ToString();
                            }
                            else if (dic["key"] == "volume")
                            {
                                button2.Text = dic["value"]?.ToString();
                            }
                        }
                    }
                    break;
@@ -2182,6 +2194,7 @@
                            //区别不同设备，显示不同设备状态
                            switch (device.spk)
                            {
                                case SPK.MechanicalArm:
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                    {//开关灯