packet类复原

wxr

2024-01-03 300a5d5370d10d97eb5dfdfa43bb0156c15d23e3

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

@@ -736,8 +736,13 @@
                case SPK.AvMusic:
                    {
                        #region 界面
                        ///开关
                        LogicView.FunTypeView switchVie = new LogicView.FunTypeView();
                        switchVie.btnText.TextID = StringId.switchLogic;
                        fLayout.AddChidren(switchVie.FLayoutView());
                        //提示语音
                        LogicView.FunTypeView funTypeView = new LogicView.FunTypeView();
                        funTypeView.frameLayout.Y = switchVie.frameLayout.Bottom;
                        funTypeView.btnText.TextID = StringId.tishiyin;
                        fLayout.AddChidren(funTypeView.FLayoutView());
                        ///音量
@@ -757,6 +762,12 @@
                        DelayView(fLayout, volView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件
                        ///开关点击事件
                        switchVie.btnClick.MouseUpEventHandler += (sender, e) =>
                        {

                            SwitchViewMethod(device, switchVie.btnState, 2);
                        };
                        ///提示语音点击事件
                        funTypeView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
@@ -820,7 +831,7 @@
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditDeviceState(device, index, funTypeView.btnState, volView.btnState, null, null);
                            GetEditDeviceState(device, index, switchVie.btnState, funTypeView.btnState, volView.btnState, null);
                        }

                        #endregion
@@ -1046,7 +1057,7 @@
            LogicView.FunTypeView delayView = new LogicView.FunTypeView();
            delayView.frameLayout.Y = bottomY;
            delayView.btnText.TextID = StringId.Delay;
            delayView.btnState.Text = strdelay + "s";
            delayView.btnState.Text = LogicMethod.Current.getTimeStr(strdelay);
            fLayout.AddChidren(delayView.FLayoutView());
            ///赋值对象
            this.btnDelay = delayView.btnState;
@@ -1056,9 +1067,9 @@
                InpOrOutLogicMethod inpOrOutLogicMethod = new InpOrOutLogicMethod();
                inpOrOutLogicMethod.Delayed(this, strdelay, (value) =>
                {
                    selectedState = "delay_" + strdelay;
                    strdelay = value.ToString();
                    delayView.btnState.Text = strdelay + "s";
                    delayView.btnState.Text = LogicMethod.Current.getTimeStr(strdelay);
                    selectedState = "delay_" + strdelay;
                });
            };

@@ -1291,7 +1302,7 @@
            if (this.btnDelay != null)
            {
                ///延时显示文本
                this.btnDelay.Text = outputs.delay + "s";
                this.btnDelay.Text =LogicMethod.Current.getTimeStr(outputs.delay);
                this.strdelay = outputs.delay;
            }
            InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4, attribute);