2023年11月15日17:24:32

mac

2023-11-15 22aa441f75affc5dd6c984bf4b04ff583cfeec8d

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

@@ -473,7 +473,7 @@
                                    }
                                    break;
                                case SPK.Ev_Ipcam:
                                    if (inputCondition.identifier == "motiondetect_event")
                                    if (inputCondition.identifier == Constant.intelligentDetection_event)
                                    {
                                        inputView.btnState.Text = Language.StringByID(StringId.shi);
                                    }
@@ -489,7 +489,7 @@
                                        string value = this.GetKeyValue("people_status", dicList);
                                        if (string.IsNullOrEmpty(value))
                                        {
                                            inputView.btnState.Text = LogicMethod.Current.getTimeStr(inputCondition.hold_time).Replace("0s","");
                                            inputView.btnState.Text = LogicMethod.Current.getTimeStr(inputCondition.hold_time).Replace("0s", "");
                                            break;

                                        }
@@ -504,6 +504,17 @@
                                        {
                                            int time = int.Parse(inputCondition.hold_time);
                                            inputView.btnState.Text += "持续" + LogicMethod.Current.getTimeStr(inputCondition.hold_time).Replace("0s", "");
                                        }
                                        if (!string.IsNullOrEmpty(inputCondition.detect_type))
                                        {
                                            if (inputCondition.detect_type == "1")
                                            {
                                                inputView.btnState.Text += "," + Language.StringByID(StringId.gaibiancaizhixing);
                                            }
                                            else
                                            {
                                                inputView.btnState.Text += "," + Language.StringByID(StringId.shoudaojiuzhixing);
                                            }
                                        }


@@ -1495,17 +1506,32 @@
                                case SPK.MusicStandard:
                                case SPK.AvMusic:
                                    {
                                        string on_off = GetKeyValue("on_off", 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 (!string.IsNullOrEmpty(on_off))
                                        {
                                            stateStr = stateStr.Substring(1, stateStr.Length - 1);
                                            if (on_off == "on")
                                            {
                                                stateStr = Language.StringByID(StringId.onLogic);
                                            }
                                            else
                                            {
                                                stateStr = Language.StringByID(StringId.offLogic);
                                            }
                                        }
                                        else if (stateStr.EndsWith(Language.StringByID(StringId.volumeMusic)))

                                        if (!string.IsNullOrEmpty(song_name))
                                        {
                                            stateStr = stateStr.Substring(0, stateStr.Length - 3);
                                            stateStr += "," + song_name;
                                        }

                                        if (!string.IsNullOrEmpty(volume))
                                        {
                                            stateStr += "," + volume;
                                        }

                                    }
                                    break;
                                case SPK.ElectricalTvHisense:
@@ -2483,13 +2509,24 @@
                    {
                        foreach (var dic in dicList)
                        {
                            if (dic["key"] == "song_name")
                            if (dic["key"] == "on_off")
                            {
                                button1.Text = dic["value"]?.ToString();
                                if (dic["value"] == "on")
                                {
                                    button1.Text = Language.StringByID(StringId.onLogic);
                                }
                                else
                                {
                                    button1.Text = Language.StringByID(StringId.offLogic);
                                }
                            }
                            else if (dic["key"] == "song_name")
                            {
                                button2.Text = dic["value"]?.ToString();
                            }
                            else if (dic["key"] == "volume")
                            {
                                button2.Text = dic["value"]?.ToString();
                                button3.Text = dic["value"]?.ToString();
                            }
                        }
                    }