From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
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 8cfd9ac..8cb52a4 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;
@@ -290,6 +290,7 @@
this.CloseForm();
//鎸囧畾鏂板缓瀵嗙爜妯″紡
this.LoadFormMethodByName("EditorSecondaryPasswordForm", "SetNewPasswordFormMode");
+ this.LoadFormMethodByName("EditorGesturePasswordForm", "SetNewPasswordFormMode");
}
#endregion
--
Gitblit v1.8.0