Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs

@@ -189,10 +189,10 @@
            var btnTiyan = new NormalViewControl(300, 100, true);

            btnTiyan.Y = btnLoginByCode.Y;

            btnTiyan.TextAlignment = TextAlignment.Center;

            btnTiyan.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnTiyan.TextColor = UserCenterColor.Current.TextOrangeColor;

            btnTiyan.TextSize = 12;

            btnTiyan.Gravity = Gravity.CenterHorizontal;

            btnTiyan.Text = "游客体验";

            btnTiyan.TextID = R.MyInternationalizationString.uExperienceAccount;

            frameMidBack.AddChidren(btnTiyan);

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

            {

@@ -637,14 +637,10 @@
            //字体总宽度

            int fontWidth = 0;

            int btnWidth = 0;

#if Android



            //特殊的误差值

            int speceilValue = Application.GetRealWidth(20);

#endif

#if iOS

            //特殊的误差值

            int speceilValue = Application.GetRealWidth(10);

#endif

            int speceilValue = ControlCommonResourse.TwoTextSpace;



            //我已阅读并同意

            var btnMsg1 = new NormalViewControl(100, 90, true);

            btnMsg1.Gravity = Gravity.CenterVertical;