From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

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

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs
index d1bbf78..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";
@@ -130,6 +134,7 @@
             msgControl.Y = Application.GetRealHeight(582);
             msgControl.TextAlignment = TextAlignment.Center;
             msgControl.TextColor = 0xfff75858;
+            msgControl.IsBold = true;
             bodyFrameLayout.AddChidren(msgControl);
 
             //纭淇敼
@@ -172,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