合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/NewGateWayMenuSelectForm.cs

@@ -87,7 +87,7 @@
                frameBack1.UseClickStatu = false;

                frameBack1.Y = Application.GetRealHeight(1420);

                frameBack1.Gravity = Gravity.CenterHorizontal;

                frameBack1.RadiusEx = 12;

                frameBack1.Radius = 12;

                frameBack1.Width = Application.GetRealWidth(1034);

                frameBack1.Height = Application.GetRealHeight(300);

                frameBack1.BackgroundColor = UserCenterColor.Current.White;

@@ -135,7 +135,7 @@
                frameBack2.UseClickStatu = false;

                frameBack2.Y = frameBack1.Bottom + Application.GetRealHeight(23);

                frameBack2.Gravity = Gravity.CenterHorizontal;

                frameBack2.RadiusEx = 12;

                frameBack2.Radius = 12;

                frameBack2.Width = Application.GetRealWidth(1034);

                frameBack2.Height = Application.GetRealHeight(156);

                frameBack2.BackgroundColor = UserCenterColor.Current.White;