From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs | 82 +++++++++++++++++++++++++++-------------
1 files changed, 55 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
index c203417..5ad03f1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
@@ -20,6 +20,9 @@
/// </summary>
public void ShowForm()
{
+ //璁颁綇瀹冨師鏉ョ殑鏄电О
+ UserCenterResourse.UserInfo.OldUserName = UserCenterResourse.UserInfo.UserName;
+
//鍥犱负鍒殑鐢婚潰浼氳皟鐢ㄨ繖涓嚱鏁帮紝鐒跺悗鍒锋柊鐢婚潰
this.ClearBodyFrame();
@@ -98,7 +101,7 @@
rowName.UseClickStatu = false;
listMidFrame.AddChidren(rowName);
//搴曠嚎
- rowName.AddBottomLine();
+ var btnNameLine = rowName.AddBottomLine();
//鍚嶇ОView
rowName.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uName), 350);
//鍚嶇О杈撳叆
@@ -112,15 +115,29 @@
//杈撳叆缁撴潫浜嬩欢
txtName.FinishInputEvent += (() =>
{
- if (txtName.Text.Trim() == string.Empty)
- {
- //鎶婂悕绉拌繕鍘熷洖鍘�
- txtName.Text = UserCenterResourse.UserInfo.UserName;
- return;
- }
//鏇存柊鐢ㄦ埛鍚�
- this.SaveUserName(txtName.Text.Trim());
+ this.SaveUserName(txtName, true);
});
+ //杈撳叆鍊兼敼鍙樹簨浠�(2020.04.05:浠ュ墠閮藉畾姝昏鎸夊洖杞﹂敭鎵嶆洿鏂�,鐜板湪鍙堣鍚嶅瓧娌℃湁鍚屾
+ //鎵�浠ユ墠鍑烘涓嬬瓥,娣诲姞杩欎釜浜嬩欢)
+ txtName.TextChangeEventHandler += (sender, value) =>
+ {
+ UserCenterResourse.UserInfo.UserName = value;
+ };
+ //鍏夋爣鏀瑰彉浜嬩欢(2020.04.05:浠ュ墠閮藉畾姝昏鎸夊洖杞﹂敭鎵嶆洿鏂�,鐜板湪鍙堣鍚嶅瓧娌℃湁鍚屾
+ //鎵�浠ユ墠鍑烘涓嬬瓥,娣诲姞杩欎釜浜嬩欢)
+ txtName.FoucsChanged += (sender, focusEvent) =>
+ {
+ //鍏夋爣绂诲紑鏃�,鎵ц鍚嶅瓧淇敼
+ if (focusEvent.Focus == false)
+ {
+ //鏇存柊鐢ㄦ埛鍚�
+ this.SaveUserName(txtName, false);
+ }
+ };
+
+ //鑱斿姩绾跨殑鐘舵��
+ txtName.btnLine = btnNameLine;
var rowQrCode = new FrameRowControl(listMidFrame.rowSpace / 2);
listMidFrame.AddChidren(rowQrCode);
@@ -146,7 +163,6 @@
rowEmail.AddRightArrow();
//閭
var btnEmail = rowEmail.AddMostRightView(UserCenterResourse.UserInfo.Email, 500);
- btnEmail.IsBold = true;
if (string.IsNullOrEmpty(UserCenterResourse.UserInfo.Email) == true)
{
//鏈缃�,璇风粦瀹�
@@ -176,7 +192,6 @@
rowPhone.AddRightArrow();
//鎵嬫満鍙�
var btnPhone = rowPhone.AddMostRightView(UserCenterResourse.UserInfo.Phone, 500);
- btnPhone.IsBold = true;
if (string.IsNullOrEmpty(UserCenterResourse.UserInfo.Phone) == true)
{
//鏈缃�,璇风粦瀹�
@@ -184,7 +199,17 @@
}
else
{
- btnPhone.Text = "+" + UserCenterResourse.UserInfo.AreaCode + " " + UserCenterResourse.UserInfo.Phone;
+ string phoneNum = UserCenterResourse.UserInfo.Phone;
+ if (phoneNum.Length >= 11)
+ {
+ phoneNum = phoneNum.Substring(0, 3) + "".PadLeft(phoneNum.Length - 7, '*') + phoneNum.Substring(phoneNum.Length - 4, 4);
+ }
+ else if (phoneNum.Length >= 5)
+ {
+ //鎴栬杩欐槸鍥藉鐨勬墜鏈哄惂
+ phoneNum = phoneNum.Substring(0, 3) + "".PadLeft(phoneNum.Length - 5, '*') + phoneNum.Substring(phoneNum.Length - 2, 2);
+ }
+ btnPhone.Text = "+" + UserCenterResourse.UserInfo.AreaCode + " " + phoneNum;
}
rowPhone.ButtonClickEvent += (sender, e) =>
{
@@ -212,7 +237,6 @@
//寰俊銆丵Q
//var btnQQ = rowOther.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uWebChatAndQQ), 500);
var btnQQ = rowOther.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uWebChat), 500);
- btnQQ.IsBold = true;
rowOther.ButtonClickEvent += (sender, e) =>
{
var form = new OtherParty.OtherPartyAccountMenuForm();
@@ -229,7 +253,6 @@
rowSysPsw.AddRightArrow();
//鍘讳慨鏀�
var btnPsw = rowSysPsw.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uGotoEditor), 350);
- btnPsw.IsBold = true;
rowSysPsw.ButtonClickEvent += (sender, e) =>
{
var form = new Password.EditorAccountPasswordForm();
@@ -244,7 +267,6 @@
rowSecond.AddRightArrow();
//瀵嗙爜銆佹墜鍔裤�佹寚绾�
var btnSecand = rowSecond.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uPasswordGestureFingerPrint), 400);
- btnSecand.IsBold = true;
rowSecond.ButtonClickEvent += (sender, e) =>
{
var form = new SecondAuthenticationForm();
@@ -293,32 +315,38 @@
/// <summary>
/// 鏇存柊鐢ㄦ埛鍚�
/// </summary>
- /// <param name="userName">鏄电О</param>
- private async void SaveUserName(string userName)
+ /// <param name="txtName"></param>
+ private async void SaveUserName(TextInputExControl txtName, bool showMsg)
{
- if (UserCenterResourse.UserInfo.UserName == userName)
+ if (UserCenterResourse.UserInfo.UserName == string.Empty)
{
+ //鎶婂悕绉拌繕鍘熷洖鍘�
+ txtName.Text = UserCenterResourse.UserInfo.OldUserName;
+ UserCenterResourse.UserInfo.UserName = UserCenterResourse.UserInfo.OldUserName;
return;
}
- //鎵撳紑杩涘害鏉�
- this.ShowProgressBar();
-
+ if (UserCenterResourse.UserInfo.OldUserName == UserCenterResourse.UserInfo.UserName)
+ {
+ //鏃犻渶淇敼
+ return;
+ }
var pra = new SaveUserNamePra();
- pra.UserName = userName;
+ pra.UserName = UserCenterResourse.UserInfo.UserName;
bool result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdateUserName", false, pra);
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
if (result == false)
{
return;
}
- //鐢ㄦ埛鍚嶇О淇敼鎴愬姛!
- string msg = Language.StringByID(R.MyInternationalizationString.uUserNameSaveSuccess);
- this.ShowMassage(ShowMsgType.Tip, msg);
+ if (showMsg == true)
+ {
+ //鐢ㄦ埛鍚嶇О淇敼鎴愬姛!
+ string msg = Language.StringByID(R.MyInternationalizationString.uUserNameSaveSuccess);
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ }
- UserCenterResourse.UserInfo.UserName = userName;
+ UserCenterResourse.UserInfo.OldUserName = UserCenterResourse.UserInfo.UserName;
}
#endregion
--
Gitblit v1.8.0