Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomMenuSelectForm.cs

@@ -59,7 +59,7 @@
            //菜单的桌布控件

            this.frameMenuTable = new FrameLayout();

            frameMenuTable.Gravity = Gravity.CenterHorizontal;

            frameMenuTable.Radius = 12;

            frameMenuTable.Radius = (uint)Application.GetRealHeight(35);

            frameMenuTable.Width = Application.GetRealWidth(1034);

            frameMenuTable.Height = this.menuHeight * menuCount;

            frameMenuTable.BackgroundColor = UserCenterColor.Current.White;

@@ -69,7 +69,7 @@
            var frameCancel = new FrameLayout();

            frameCancel.Y = frameAnimateTable.Height - this.menuHeight - Application.GetRealHeight(23);

            frameCancel.Gravity = Gravity.CenterHorizontal;

            frameCancel.Radius = 12;

            frameCancel.Radius = (uint)Application.GetRealHeight(35);

            frameCancel.Width = Application.GetRealWidth(1034);

            frameCancel.Height = this.menuHeight;

            frameCancel.BackgroundColor = UserCenterColor.Current.White;

@@ -132,11 +132,6 @@
                selectEvent?.Invoke();

                selectEvent = null;

            };



            if ((this.frameMenuTable.ChildrenCount / 2) + 1 == this.m_MenuCount)

            {

                this.frameAnimateTable.Animate = Animate.DownToUp;

            }

        }



        #endregion