Merge branch 'WJC' into temp-wxr

wxr

2021-03-08 8e5ba5665861b29a4b8da0335c81d620aa891862

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs

@@ -171,7 +171,7 @@
        ///<param name="stateVuale">之前的状态值</param>
        /// <param name="action">返回回调</param>
        /// <returns></returns>
        public void FLayoutView(FrameLayout frame, int text1, int text2, string stateVuale, Action<int> action)
        public void FLayoutView(FrameLayout frame, int text1, int text2, string stateVuale, Action<int> action,bool tag=true)
        {
            int i = 2;
            frameLayout.Y = Application.GetRealHeight(603 - (44 * i));
@@ -207,13 +207,19 @@
            btnOn.MouseUpEventHandler += (sender2, e2) =>
            {
                action(btnOn.TextID);
                frame.RemoveFromParent();
                if (tag)
                {
                    frame.RemoveFromParent();
                }
            };
            //点击事件
            btnOff.MouseUpEventHandler += (sender3, e3) =>
            {
                action(btnOff.TextID);
                frame.RemoveFromParent();
                if (tag)
                {
                    frame.RemoveFromParent();
                }
            };