From 10b78a1626106f18a6b2f68bd2b8cafd2a99683c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 12 八月 2020 11:31:59 +0800
Subject: [PATCH] 2020-08-12 4.喜爱页面，增加房间场景添加支持。 5.Alexa,添加设备页面增加修改备注功能，点击OK后，增加设备备注名字不匹配然后自动更新操作。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountModifyPassword.cs | 64 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 15 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountModifyPassword.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountModifyPassword.cs
index 3b6f27b..9e869be 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
@@ -175,17 +176,20 @@
string oldPassword = etCurPassword.Text.Trim ();
string newPassword = etNewPassword.Text.Trim ();
try {
- var requestObj = new UpdatePasswordObj () { OldPassword = oldPassword, Password = newPassword };
+ var requestObj = new UpdatePasswordObj () { OldPassword = oldPassword, NewPassword = newPassword };
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
- var revertObj = MainPage.RequestHttps ("UpdatePassword", requestJson);
- if (revertObj.StateCode == "SUCCESS") {
+ var revertObj = MainPage.RequestHttps (API.UpdatePassword, requestJson);
+ if (revertObj.StateCode.ToUpper() == "SUCCESS") {
MainPage.LoginUser.Password = newPassword;
MainPage.LoginUser.SaveUserInfo ();
Application.RunOnMainThread (() => {
this.RemoveFromParent ();
new Alert ("", Language.StringByID (R.MyInternationalizationString.PasswordModificationSuccess), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
+ } else {
+ ShowErrorInfo (revertObj.StateCode);
}
+
} catch {
Application.RunOnMainThread (() => {
new Alert ("", Language.StringByID (R.MyInternationalizationString.FailureToServer),
@@ -216,5 +220,35 @@
};
}
+
+ void ShowErrorInfo (string stateCodeStr)
+ {
+ string mes = "";
+ if (stateCodeStr == "NewPasswordAndOldPasswordEqual") {
+ //鍘熷瘑鐮佸拰鏂板瘑鐮佺浉鍚�
+ mes = ErrorCode.NewPasswordAndOldPasswordEqual;
+ } else if (stateCodeStr == "OldPwdNoYes") {
+ //鍘熷瘑鐮侀敊璇�
+ mes = ErrorCode.OldPwdNoYes;
+ } else if (stateCodeStr == "AccountNoExists") {
+ //鐢ㄦ埛涓嶅瓨鍦�
+ mes = ErrorCode.ACCOUNTNOEXISTS;
+ } else if (stateCodeStr == "Fail") {
+ // 鎿嶄綔澶辫触
+ mes = ErrorCode.OperationFailed;
+ } else if (stateCodeStr == ErrorCode.NetworkError) {
+ mes = ErrorCode.NetworkError;
+ } else {
+ mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr;
+
+ }
+ if (!string.IsNullOrEmpty (mes)) {
+ Application.RunOnMainThread (() => {
+ new Alert ("", mes, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+ });
+ }
+
+
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0