From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC

---
 ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs
index 491a55a..f748108 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs
@@ -81,7 +81,7 @@
             var btnCode = new NormalViewControl(302, 127, true);
             btnCode.X = rowPhone.Right + Application.GetRealWidth(35);
             btnCode.Y = Application.GetRealHeight(23);
-            btnCode.Radius = (uint)Application.GetMinRealAverage(4);
+            btnCode.Radius = 4;
             btnCode.TextID = R.MyInternationalizationString.uGetVerificationCode;
             btnCode.TextColor = UserCenterColor.Current.White;
             btnCode.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
@@ -291,6 +291,7 @@
             this.CloseForm();
             //鎸囧畾鏂板缓瀵嗙爜妯″紡
             this.LoadFormMethodByName("EditorSecondaryPasswordForm", "SetNewPasswordFormMode");
+            this.LoadFormMethodByName("EditorGesturePasswordForm", "SetNewPasswordFormMode");
         }
 
         #endregion

--
Gitblit v1.8.0