请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

 ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs

@@ -21,15 +21,15 @@
        /// <summary>

        /// TopMenuFrameLayout
        /// </summary>
        public FrameLayout topMenuFrameLayout = null;
        public NormalFrameLayout topMenuFrameLayout = null;
        /// <summary>
        /// TopFrameLayout
        /// </summary>
        public FrameLayout topFrameLayout = null;
        public NormalFrameLayout topFrameLayout = null;
        /// <summary>
        /// bodyFrameLayout
        /// </summary>
        public FrameLayout bodyFrameLayout = null;
        public NormalFrameLayout bodyFrameLayout = null;
        /// <summary>

        /// 左滑使能

        /// </summary>
@@ -102,14 +102,14 @@
            }

            //TopMenuFrameLayout做成
            topMenuFrameLayout = new FrameLayout();
            topMenuFrameLayout = new NormalFrameLayout();
            topMenuFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight;
            topMenuFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
            topMenuFrameLayout.Name = "topMenuFrameLayout";
            this.AddChidren(topMenuFrameLayout);


            //TopFrameLayout做成
            topFrameLayout = new FrameLayout();
            topFrameLayout = new NormalFrameLayout();
            topFrameLayout.Height = ControlCommonResourse.TopFrameHeight;
            topFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
            topFrameLayout.Y = topMenuFrameLayout.Bottom;
@@ -121,6 +121,7 @@
            btnLine.BackgroundColor = 0x40000000;
            btnLine.Y = topFrameLayout.Height - 1;
            topFrameLayout.AddChidren(btnLine);
            topFrameLayout.AddTag("btnLine", btnLine);


            //返回键
            var btnBack = new BackViewControl();
@@ -168,7 +169,7 @@
            {
                bodyFrameLayout.RemoveAll();
            }

            bodyFrameLayout = new FrameLayout();
            bodyFrameLayout = new NormalFrameLayout();
            bodyFrameLayout.Height = ControlCommonResourse.BodyFrameHeight;
            bodyFrameLayout.Y = topFrameLayout.Bottom;
            bodyFrameLayout.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
@@ -291,6 +292,9 @@
                frame.AddChidren(btnReLoad);

                btnReLoad.ButtonClickEvent += (sender, e) =>

                {

                    //点击重新加载时,允许再次联网

                    HdlWifiLogic.Current.CanAccessHttp = true;



                    //清除全部控件

                    this.ClearBodyFrame();