2024年07月25日17:24:45

mac

2024-07-25 3f6685c77beeb12baf840733fb890860f4c26e7c

 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());
                        ///音量
@@ -754,9 +759,41 @@


                        ///设备延时iewv
                        DelayView(fLayout, volView.frameLayout.Bottom);
                        var delayView = DelayView(fLayout, volView.frameLayout.Bottom);
                        if (edit )
                        {
                            Output outputs = Logic.currlogic.output[index];
                            var dicList = outputs.status.Find((obj) => obj.ContainsValue(FunctionAttributeKey.OnOff));
                            if (dicList != null)
                            {
                                if (dicList.ContainsValue( "off") || dicList.ContainsValue("pause"))
                                {
                                    funTypeView.frameLayout.Visible = false;
                                    volView.frameLayout.Visible = false;
                                    delayView.frameLayout.Y = switchVie.frameLayout.Bottom;
                                }
                            }
                        }
                        #endregion
                        #region 点击事件
                        ///开关点击事件
                        switchVie.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            SwitchViewMethod(device, switchVie.btnState, 2, (v) => {
                                if (v == "on")
                                {
                                    funTypeView.frameLayout.Visible = true;
                                    volView.frameLayout.Visible = true;
                                    delayView.frameLayout.Y = volView.frameLayout.Bottom;
                                }
                                else
                                {
                                    funTypeView.frameLayout.Visible = false;
                                    volView.frameLayout.Visible = false;
                                    delayView.frameLayout.Y = switchVie.frameLayout.Bottom;
                                }
                            });
                        };
                        ///提示语音点击事件
                        funTypeView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
@@ -820,7 +857,7 @@
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditDeviceState(device, index, funTypeView.btnState, volView.btnState, null, null);
                            GetEditDeviceState(device, index, switchVie.btnState, funTypeView.btnState, volView.btnState, null);
                        }

                        #endregion
@@ -991,6 +1028,23 @@
                                    dicList.AddRange(diclist);//再添加其它属性
                                    dicSateteList = dicList;//重新赋值
                                }
                                var onoffDic = dicSateteList.Find((obj) => obj.ContainsValue("on_off"));
                                if (onoffDic != null)
                                {
                                    if (onoffDic.ContainsValue("off"))
                                    {
                                        for(int i =0;i<dicSateteList.Count;)
                                        {
                                            var d = dicSateteList[i];
                                            if(!d.ContainsValue("on_off") || d.ContainsValue("delay"))
                                            {
                                                dicSateteList.Remove(d);
                                                continue;
                                            }
                                            i++;
                                        }
                                    }
                                }
                            }
                            break;
                        case SPK.GroupControl:
@@ -1041,12 +1095,12 @@
        /// </summary>
        /// <param name="fLayout">父控件</param>
        /// <param name="bottomY">在哪个控件下面</param>
        private void DelayView(FrameLayout fLayout, int bottomY)
        private LogicView.FunTypeView DelayView(FrameLayout fLayout, int bottomY)
        {
            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,11 +1110,12 @@
                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;
                });
            };
            return delayView;

        }

@@ -1070,7 +1125,8 @@
        /// <param name="device"></param>
        /// <param name="button"></param>
        /// <param name="len">显示选择View数量</param>
        private void SwitchViewMethod(Entity.Function device, Button button, int len)
        /// <param name="action">点击回调事件，用来给音乐刷新界面使用，wxr 2024-01-04 16:03:47</param>
        private void SwitchViewMethod(Entity.Function device, Button button, int len,Action<string> action = null)
        {
            #region 界面
            FrameLayout frame = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence };
@@ -1131,11 +1187,11 @@

                        }
                        break;

                }

                //数据封装
                AddDictionary(key, value);
                action?.Invoke(value);
            });
            #endregion
        }
@@ -1291,7 +1347,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);