From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs
index af5834a..f788e5f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs
@@ -55,7 +55,9 @@
txtoldPsw.PlaceholderText = Language.StringByID(R.MyInternationalizationString.PleaseInputOldPsw);
rowOldPsw.AddChidren(txtoldPsw);
//搴曠嚎
- rowOldPsw.AddBottomLine();
+ var btnOldLine = rowOldPsw.AddBottomLine();
+ //鑱斿姩绾跨殑鐘舵��
+ txtoldPsw.btnLine = btnOldLine;
//鍥炬爣
var btnoldPswIcon = rowOldPsw.AddMostRightEmptyIcon(58, 58);
btnoldPswIcon.UnSelectedImagePath = "Item/HidenPWD.png";
@@ -93,7 +95,9 @@
txtNewPsw.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputNewPassword);
rowNewPsw.AddChidren(txtNewPsw);
//搴曠嚎
- rowNewPsw.AddBottomLine();
+ var btnNewLine = rowNewPsw.AddBottomLine();
+ //鑱斿姩绾跨殑鐘舵��
+ txtNewPsw.btnLine = btnNewLine;
//鍥炬爣
var btnNewPswIcon = rowNewPsw.AddMostRightEmptyIcon(58, 58);
btnNewPswIcon.UnSelectedImagePath = "Item/HidenPWD.png";
@@ -173,7 +177,7 @@
}
//瀵嗙爜宸茬粡淇敼锛岃閲嶆柊鐧诲綍
string msg = Language.StringByID(R.MyInternationalizationString.uPasswordIsHadChangedAndLoginAgain);
- this.ShowMassage(ShowMsgType.Normal, msg, () =>
+ this.ShowMassage(ShowMsgType.Remind, msg, () =>
{
//浠庢柊鐧诲綍
UserCenterLogic.ReLoginAgain(Common.Config.Instance.Account);
--
Gitblit v1.8.0