Merge branch 'Dev-Branch-2024' into wjc

mac

2024-07-25 16bea1d248f0010049bceaa562939297fa26b130

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

@@ -759,14 +759,40 @@


                        ///设备延时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);
                            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) =>
@@ -1002,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:
@@ -1052,7 +1095,7 @@
        /// </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;
@@ -1072,6 +1115,7 @@
                    selectedState = "delay_" + strdelay;
                });
            };
            return delayView;

        }

@@ -1081,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 };
@@ -1142,11 +1187,11 @@

                        }
                        break;

                }

                //数据封装
                AddDictionary(key, value);
                action?.Invoke(value);
            });
            #endregion
        }