合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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

@@ -155,19 +155,30 @@
                    {

                        //开启指纹验证失败！请前往手机{0}设置开启指纹开锁验证

                        string msg = Language.StringByID(R.MyInternationalizationString.uUseFingerprintAuthenticationFailMsg);

                        if (msg.Contains("{0}") == true)

                        {

                            msg = string.Format(msg, "\r\n");

                        }

                        msg = msg.Replace("{0}", "\r\n");

                        this.ShowMassage(ShowMsgType.Normal, msg);

                        return;

                    }

                    //将Touch ID用于「ZigBee」{0}更改安防设置和开启门锁时使用

                    string msg2 = Language.StringByID(R.MyInternationalizationString.uUseFingerprintAuthenticationMsg);

                    msg2 = msg2.Replace("{0}", "\r\n");

                    this.ShowMassage(ShowMsgType.Confirm, msg2, () =>

                    {

                        //如果设置有安全验证,想要修改它,必须先通过安全验证

                        //如果没有设置有安全验证,则无需验证

                        HdlCheckLogic.Current.CheckSecondarySecurity(

                            () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); },//处理指纹验证

                            () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); });//处理指纹验证

                    });

                }

                //如果设置有安全验证,想要修改它,必须先通过安全验证

                //如果没有设置有安全验证,则无需验证

                HdlCheckLogic.Current.CheckSecondarySecurity(

                    () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); },//处理指纹验证

                    () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); });//处理指纹验证

                else

                {

                    //如果设置有安全验证,想要修改它,必须先通过安全验证

                    //如果没有设置有安全验证,则无需验证

                    HdlCheckLogic.Current.CheckSecondarySecurity(

                        () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); },//处理指纹验证

                        () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); });//处理指纹验证

                }

            };

            //密码验证

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

@@ -194,11 +205,13 @@
                {

                    //如果设置有其他验证方式,则需要验证,否则直接跳过验证

                    HdlCheckLogic.Current.CheckSecondarySecurity(

                   () => { },

                   () => { });

                   () => { var form = new Password.EditorGesturePasswordForm(); form.AddForm(); },

                   () => { var form = new Password.EditorGesturePasswordForm(); form.AddForm(); });

                }

                else

                {

                    var form = new Password.EditorGesturePasswordForm();

                    form.AddForm();

                }

            };

            //远程开锁

@@ -237,19 +250,11 @@
                    this.ShowMassage(ShowMsgType.Normal, msg);

                    return;

                }

                //将Touch ID用于「ZigBee」{0}更改安防设置和开启门锁时使用

                string msg2 = Language.StringByID(R.MyInternationalizationString.uUseFingerprintAuthenticationMsg);

                if (msg2.Contains("{0}") == true)

                {

                    msg2 = string.Format(msg2, "\r\n");

                }

                this.ShowMassage(ShowMsgType.Confirm, msg2, () =>

                {

                    UserCenterResourse.Option.FingerprintAuthentication = !btnFingerSwicth.IsSelected;

                    UserCenterResourse.Option.Save();

                    //重新刷新界面

                    this.InitMiddleFrame();

                });



                UserCenterResourse.Option.FingerprintAuthentication = !btnFingerSwicth.IsSelected;

                UserCenterResourse.Option.Save();

                //重新刷新界面

                this.InitMiddleFrame();

            }

            else

            {