From f500e14c0a994487070380c50c85e0929cbc8e63 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 05 一月 2021 10:48:04 +0800
Subject: [PATCH] 2021-01-05 1.更新
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountModifyPassword.cs | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountModifyPassword.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountModifyPassword.cs
index fea7fb9..cf96960 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountModifyPassword.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountModifyPassword.cs
@@ -68,10 +68,11 @@
};
BodyView.AddChidren (ResetPasswrodView);
+ var viewX = (Application.GetRealWidth (640) - Application.GetMinRealAverage (500)) / 2;
var curPasswordView = new FrameLayout () {
- Width = Application.GetRealWidth (500),
- Height = Application.GetRealHeight (90),
- X = Application.GetRealWidth (70),
+ Width = Application.GetMinRealAverage (500),
+ Height = Application.GetMinRealAverage (90),
+ X = viewX,
Y = Application.GetRealHeight (200),
BackgroundImagePath = "Register/Register_Password_kuang.png",
};
@@ -80,8 +81,8 @@
var etCurPassword = new EditText () {
Width = Application.GetRealWidth (400),
X = Application.GetRealWidth (100),
- PlaceholderText = Language.StringByID (R.MyInternationalizationString.PleaseEnterOldPassword),
PlaceholderTextColor = SkinStyle.Current.PlaceholderTextColor,
+ PlaceholderText = Language.StringByID (R.MyInternationalizationString.PleaseEnterOldPassword),
TextAlignment = TextAlignment.CenterLeft,
SecureTextEntry = true,
TextColor = SkinStyle.Current.TextColor1,
@@ -89,9 +90,9 @@
curPasswordView.AddChidren (etCurPassword);
var newPasswordView = new FrameLayout () {
- Width = Application.GetRealWidth (500),
- Height = Application.GetRealHeight (90),
- X = Application.GetRealWidth (70),
+ Width = Application.GetMinRealAverage (500),
+ Height = Application.GetMinRealAverage (90),
+ X = viewX,
Y = curPasswordView.Bottom + Application.GetRealHeight (70),
BackgroundImagePath = "Register/Register_Password_kuang.png",
Radius = (uint)Application.GetRealHeight (0),
@@ -101,8 +102,8 @@
var etNewPassword = new EditText () {
Width = Application.GetRealWidth (400),
X = Application.GetRealWidth (100),
- PlaceholderText = Language.StringByID (R.MyInternationalizationString.PleaseSetNewPasword),
PlaceholderTextColor = SkinStyle.Current.PlaceholderTextColor,
+ PlaceholderText = Language.StringByID (R.MyInternationalizationString.PleaseSetNewPasword),
TextAlignment = TextAlignment.CenterLeft,
TextColor = SkinStyle.Current.TextColor1,
SecureTextEntry = true
@@ -110,9 +111,9 @@
newPasswordView.AddChidren (etNewPassword);
var confrimFpasswordView = new FrameLayout () {
- Width = Application.GetRealWidth (500),
- Height = Application.GetRealHeight (90),
- X = Application.GetRealWidth (70),
+ Width = Application.GetMinRealAverage (500),
+ Height = Application.GetMinRealAverage (90),
+ X = viewX,
Y = newPasswordView.Bottom + Application.GetRealHeight (70),
BackgroundImagePath = "Register/Register_Password_kuang.png",
};
@@ -122,8 +123,8 @@
Width = Application.GetRealWidth (400),
Height = Application.GetRealHeight (90),
X = Application.GetRealWidth (100),
- PlaceholderText = Language.StringByID (R.MyInternationalizationString.PleaseConfirmNewPassword),
PlaceholderTextColor = SkinStyle.Current.PlaceholderTextColor,
+ PlaceholderText = Language.StringByID (R.MyInternationalizationString.PleaseConfirmNewPassword),
TextAlignment = TextAlignment.CenterLeft,
TextColor = SkinStyle.Current.TextColor1,
SecureTextEntry = true
@@ -168,6 +169,15 @@
if (string.IsNullOrEmpty (etNewPassword.Text.Trim ())) {
new Alert ("", Language.StringByID (R.MyInternationalizationString.NewPasswordIsEmpty),
Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ } else if (!string.IsNullOrEmpty(MainPage.LoginUser.Name) && etNewPassword.Text.Trim ().Contains (MainPage.LoginUser.Name)) {
+ //瀵嗙爜涓嶈兘鍖呭惈鐢ㄦ埛鍚�
+ new Alert ("", ErrorCode.PasswordNotUsername,
+ Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ return;
+ } else if (!CommonUtlis.Current.CheckPassword (etNewPassword.Text.Trim ())) {
+ new Alert ("", ErrorCode.PasswordStrengthNotMatch,
+ Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ //return;
} else if (etNewPassword.Text.Trim () != etConfrimPassword.Text.Trim ()) {
new Alert ("", Language.StringByID (R.MyInternationalizationString.PleaseConfirmPasswordIsCorrect),
Language.StringByID (R.MyInternationalizationString.Close)).Show ();
@@ -177,7 +187,7 @@
try {
var requestObj = new UpdatePasswordObj () { OldPassword = oldPassword, NewPassword = newPassword };
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
- var revertObj = MainPage.RequestHttps (API.UpdatePassword, requestJson, true);
+ var revertObj = MainPage.RequestHttps (API.UpdatePassword, requestJson);
if (revertObj.StateCode.ToUpper() == "SUCCESS") {
MainPage.LoginUser.Password = newPassword;
MainPage.LoginUser.SaveUserInfo ();
--
Gitblit v1.8.0