From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs
index e002904..310d994 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs
+++ b/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 = 8;
+            frameBack.Radius = (uint)Application.GetRealHeight(17);
             bodyFrameLayout.AddChidren(frameBack);
 
             //鎵嬪娍楠岃瘉鎺т欢
@@ -59,10 +59,10 @@
             };
             gestureControl.FinishInputEvent += (Password, pswLeng) =>
             {
-                if (UserCenterResourse.Option.GestureAuthentication != Password)
+                if (UserCenterResourse.AccountOption.GestureAuthentication != Password)
                 {
-                    UserCenterResourse.Option.PasswordGestureInputCount--;
-                    if (UserCenterResourse.Option.PasswordGestureInputCount <= 0)
+                    UserCenterResourse.AccountOption.PasswordGestureInputCount--;
+                    if (UserCenterResourse.AccountOption.PasswordGestureInputCount <= 0)
                     {
                         //绠$悊鍛樿韩浠介獙璇佸け璐�,璇烽噸鏂扮櫥褰�
                         string msg2 = Language.StringByID(R.MyInternationalizationString.uCheckAdministratorFailAndReload);
@@ -75,7 +75,7 @@
                     return;
                 }
                 //閲嶇疆鍓╀綑瀵嗙爜娆℃暟
-                UserCenterResourse.Option.ResetPasswordCount();
+                UserCenterResourse.AccountOption.ResetPasswordCount();
                 //鐣岄潰鍏抽棴
                 this.CloseForm();
                 SuccessAction?.Invoke();
@@ -86,7 +86,7 @@
             var btnTouch = new BottomLeftClickButton(frameBack.Width / 2, Application.GetRealHeight(127));
             frameBack.AddChidren(btnTouch);
             btnTouch.InitControl(i_TouchText);
-            if (UserCenterResourse.Option.FingerprintAuthentication == false)
+            if (UserCenterResourse.AccountOption.FingerprintAuthentication == false)
             {
                 //娌℃湁鍚敤Touch ID
                 btnTouch.CanClick = false;
@@ -117,13 +117,13 @@
                         TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = null;
 
                         //瀵嗙爜楠岃瘉
-                        if (string.IsNullOrEmpty(UserCenterResourse.Option.PswAuthentication) == false)
+                        if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.PswAuthentication) == false)
                         {
                             var form = new PswSecondarySecurityForm();
                             this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
                         }
                         //鎵嬪娍楠岃瘉
-                        else if (string.IsNullOrEmpty(UserCenterResourse.Option.GestureAuthentication) == false)
+                        else if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == false)
                         {
                             var form = new PswGestureSecirityForm();
                             this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
@@ -142,7 +142,7 @@
             var btnPsw = new BottomRightClickButton(frameBack.Width - btnTouch.Width, btnTouch.Height);
             frameBack.AddChidren(btnPsw);
             btnPsw.InitControl(i_PasswordText);
-            if (string.IsNullOrEmpty(UserCenterResourse.Option.PswAuthentication) == true)
+            if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.PswAuthentication) == true)
             {
                 //娌℃湁鍚敤瀵嗙爜寮�閿�
                 btnPsw.CanClick = false;

--
Gitblit v1.8.0