合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

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

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

            frameBack.Height = Application.GetRealHeight(1711);

            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Radius = 6;

            frameBack.Radius = 8;

            bodyFrameLayout.AddChidren(frameBack);



            //密码输入控件

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



            //手势开锁

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

            btnGesture.oldBackgroundColor = 0xfff5f6fa;

            btnGesture.BackgroundColor = 0xfff5f6fa;

            btnGesture.Text = i_GestureText;

            btnGesture.TextColor = UserCenterColor.Current.TextColor1;

            btnGesture.Gravity = Gravity.BottomLeft;

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

            frameBack.AddChidren(btnGesture);

            btnGesture.InitControl(i_GestureText);

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

            {

                //没有启用手势开锁

@@ -106,13 +102,9 @@
            };



            //Touch ID开锁

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

            btnTouch.BackgroundColor = 0xff232323;

            btnTouch.oldBackgroundColor = 0xff232323;

            btnTouch.Text = i_TouchText;

            btnTouch.TextColor = UserCenterColor.Current.White;

            btnTouch.Gravity = Gravity.BottomRight;

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

            frameBack.AddChidren(btnTouch);

            btnTouch.InitControl(i_TouchText);

            if (UserCenterResourse.Option.FingerprintAuthentication == false)

            {

                //没有启用Touch ID