上传一个合并的版本

黄学彪

2020-06-01 0bf9e65bc3ba98391e7835c922b15baab3c77876

 ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs

@@ -47,6 +47,10 @@
            frameTop.BackgroundColor = UserCenterColor.Current.White;

            bodyFrameLayout.AddChidren(frameTop);



            MostRightIconControl btnFingerSwicth = null;

            var touchIDSupper = TouchIDUtils.getTouchIDSupperType();

            if (touchIDSupper == TouchIDUtils.TouchIDSupperType.TouchID)

            {

            var rowFinger = new FrameRowControl(frameTop.rowSpace / 2);

            rowFinger.UseClickStatu = false;

            frameTop.AddChidren(rowFinger);

@@ -61,13 +65,19 @@
            btnEffect.TextColor = UserCenterColor.Current.TextGrayColor1;

            rowFinger.AddChidren(btnEffect, ChidrenBindMode.NotBind);

            //开关按钮

            var btnFingerSwicth = rowFinger.AddMostRightSwitchIcon();

                btnFingerSwicth = rowFinger.AddMostRightSwitchIcon();

            btnFingerSwicth.IsSelected = UserCenterResourse.AccountOption.FingerprintAuthentication;

            //底线

            rowFinger.AddBottomLine();

            }



            var rowPsw = new FrameRowControl(frameTop.rowSpace / 2);

            frameTop.AddChidren(rowPsw);

            //如果这个手机不支持TouchId的话,则容器减去这个行的高度

            if (touchIDSupper != TouchIDUtils.TouchIDSupperType.TouchID)

            {

                frameTop.Height -= rowPsw.Height;

            }

            //密码验证

            rowPsw.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uPasswordAuthentication), 400);

            //右箭头

@@ -158,6 +168,8 @@
            btnMsg2.TextColor = UserCenterColor.Current.TextGrayColor2;



            //指纹验证

            if (btnFingerSwicth != null)

            {

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

            {

                if (btnFingerSwicth.IsSelected == false)

@@ -192,6 +204,7 @@
                        () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); });//处理指纹验证

                }

            };

            }

            //密码验证

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

            {