合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

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

@@ -43,7 +43,7 @@
            frameBack.Width = Application.GetRealWidth(965);

            frameBack.Height = Application.GetRealHeight(1486);

            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Radius = 6;

            frameBack.Radius = 8;

            bodyFrameLayout.AddChidren(frameBack);



            //手势验证控件

@@ -83,13 +83,9 @@
            };



            //Touch ID开锁

            var btnTouch = new NormalClickButton(frameBack.Width / 2, Application.GetRealHeight(127));

            btnTouch.BackgroundColor = 0xfff5f6fa;

            btnTouch.oldBackgroundColor = 0xfff5f6fa;

            btnTouch.Gravity = Gravity.BottomLeft;

            btnTouch.Text = i_TouchText;

            btnTouch.TextColor = UserCenterColor.Current.TextColor1;

            var btnTouch = new BottomLeftClickButton(frameBack.Width / 2, Application.GetRealHeight(127));

            frameBack.AddChidren(btnTouch);

            btnTouch.InitControl(i_TouchText);

            if (UserCenterResourse.Option.FingerprintAuthentication == false)

            {

                //没有启用Touch ID

@@ -143,13 +139,9 @@
            };



            //密码开锁

            var btnPsw = new NormalClickButton(frameBack.Width / 2, Application.GetRealHeight(127));

            btnPsw.BackgroundColor = 0xff232323;

            btnPsw.oldBackgroundColor = 0xfff5f6fa;

            btnPsw.Text = i_PasswordText;

            btnPsw.TextColor = UserCenterColor.Current.White;

            btnPsw.Gravity = Gravity.BottomRight;

            var btnPsw = new BottomRightClickButton(frameBack.Width - btnTouch.Width, btnTouch.Height);

            frameBack.AddChidren(btnPsw);

            btnPsw.InitControl(i_PasswordText);

            if (string.IsNullOrEmpty(UserCenterResourse.Option.PswAuthentication) == true)

            {

                //没有启用密码开锁