2023年08月22日17:48:30

wjc

2023-08-22 8cefc1f93fc2db49465a5dd11ce94ed11267ea53

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

@@ -1015,7 +1015,7 @@
                            //区别不同设备，显示不同设备状态
                            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);
@@ -1057,14 +1057,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 != "")
@@ -1088,7 +1088,7 @@
                                            //色温这个属性才有效
                                            if (stateStr != Language.StringByID(StringId.offLogic) && GetKeyValue("cct", dicList) != "")
                                            {
                                                stateStr += "," +GetKeyValue("cct", dicList) + "k";
                                                stateStr += "," + GetKeyValue("cct", dicList) + "k";
                                            }
                                        }
                                        if (device.spk == SPK.LightRGB)
@@ -1264,7 +1264,7 @@

                                        if (set_temp != "")
                                        {
                                            string unit =GetTemperatureUnit(device);
                                            string unit = GetTemperatureUnit(device);
                                            stateStr += set_temp + unit + ",";
                                        }

@@ -1475,14 +1475,41 @@
                                    {
                                        string song_name = GetKeyValue("song_name", dicList);
                                        string volume = GetKeyValue("volume", dicList);
                                        stateStr = song_name + ";" +Language.StringByID(StringId.volumeMusic)+volume;
                                        stateStr = song_name + ";" + Language.StringByID(StringId.volumeMusic) + volume;
                                        if (stateStr.StartsWith(";"))
                                        {
                                            stateStr = stateStr.Substring(1, stateStr.Length - 1);
                                        }else if (stateStr.EndsWith(Language.StringByID(StringId.volumeMusic)))
                                        } else if (stateStr.EndsWith(Language.StringByID(StringId.volumeMusic)))
                                        {
                                            stateStr = stateStr.Substring(0, stateStr.Length - 3);
                                        }
                                    }
                                    break;
                                case SPK.ElectricalTvHisense:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string signal = GetKeyValue("signal", dicList);
                                        if (!string.IsNullOrEmpty(on_off))
                                        {
                                            if (on_off == "1")
                                            {
                                                stateStr = Language.StringByID(StringId.onLogic);
                                            }
                                            else
                                            {
                                                stateStr = Language.StringByID(StringId.offLogic);
                                            }

                                        }
                                        if (!string.IsNullOrEmpty(stateStr))
                                        {
                                            stateStr += ",";
                                        }
                                        if (!string.IsNullOrEmpty(signal))
                                        {
                                            stateStr += signal.Replace("_", " ");
                                        }
                                        stateStr = stateStr.TrimEnd(',');
                                    }
                                    break;
                            }
@@ -2415,8 +2442,6 @@
                        button1.Tag = tag;
                    }
                    break;
               

                case SPK.MusicStandard:
                case SPK.AvMusic:
                    {
@@ -2456,6 +2481,46 @@
                        button2.Tag = tag;
                    }
                    break;
                case SPK.ElectricalTvHisense:
                    {
                        foreach (var dic in dicList)
                        {
                            string value = dic["value"];
                            switch (dic["key"])
                            {
                                case "on_off":
                                    {
                                        switch (value)
                                        {
                                            case "1":
                                                {
                                                    button1.Text = Language.StringByID(StringId.onLogic);
                                                }
                                                break;
                                            case "0":
                                                {
                                                    button1.Text = Language.StringByID(StringId.offLogic);
                                                }
                                                break;
                                        }
                                    }
                                    break;
                                case "signal":
                                    {
                                        if (button2 == null)
                                        {
                                            //怕调试软件乱上东西导致抛异常
                                            break;
                                        }
                                        button2.Text = value.Replace("_", " ");
                                    }
                                    break;
                            }

                        }
                    }
                    break;


            }
        }