From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3

---
 ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
index 5eb8f1c..fe53862 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
@@ -13,7 +13,7 @@
         /// <summary>
         /// 鎴愬憳淇℃伅
         /// </summary>
-        private AccountInfoResult memberResult = null;
+        private AccountInfoResult AccountResult = null;
 
         #endregion
 
@@ -25,7 +25,7 @@
         /// <param name="i_infoResult">鎴愬憳淇℃伅</param>
         public void ShowForm(AccountInfoResult i_infoResult)
         {
-            this.memberResult = i_infoResult;
+            this.AccountResult = i_infoResult;
 
             //璁剧疆鏍囬淇℃伅
             base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uMemberInformation));
@@ -48,9 +48,9 @@
             btnUserIcon.Height = this.GetPictrueRealSize(207);
             btnUserIcon.Width = this.GetPictrueRealSize(207);
             btnUserIcon.Radius = (uint)this.GetPictrueRealSize(207) / 2;
-            if (memberResult.HeadImage != null)
+            if (AccountResult.HeadImage != null)
             {
-                btnUserIcon.ImageBytes = memberResult.HeadImage;
+                btnUserIcon.ImageBytes = AccountResult.HeadImage;
             }
             else
             {
@@ -65,7 +65,7 @@
             btnUserId.IsBold = true;
             btnUserId.Y = Application.GetRealHeight(472);
             btnUserId.Gravity = Gravity.CenterHorizontal;
-            btnUserId.Text = memberResult.Account;
+            btnUserId.Text = AccountResult.Account;
             btnUserId.TextAlignment = TextAlignment.Center;
             btnUserId.TextColor = UserCenterColor.Current.TextGrayColor1;
             bodyFrameLayout.AddChidren(btnUserId);
@@ -77,7 +77,7 @@
             btnName.Gravity = Gravity.CenterHorizontal;
             btnName.TextAlignment = TextAlignment.Center;
             btnName.TextSize = 16;
-            btnName.Text = memberResult.MemberName;
+            btnName.Text = AccountResult.MemberName;
             bodyFrameLayout.AddChidren(btnName);
 
             //璇风‘璁よ处鍙锋槸鍚︽纭畕0}濡傛纭鐐瑰嚮纭
@@ -125,7 +125,7 @@
             this.ShowProgressBar();
 
             //娣诲姞鎴愬憳
-            var memberInfoRes = HdlMemberLogic.Current.AddMember(memberResult.Account, memberResult.MemberName);
+            var memberInfoRes = HdlMemberLogic.Current.AddMember(AccountResult.Account, AccountResult.MemberName);
             if (memberInfoRes == null)
             {
                 //鍏抽棴杩涘害鏉�
@@ -133,28 +133,31 @@
                 return;
             }
             //娣诲姞瀛愯处鍙锋椂,鎺ュ彛骞朵笉杩斿洖杩欎簺涓滆タ,鎵�浠ラ渶瑕佹墜鍔ㄨ祴鍊�
-            memberInfoRes.ChildNickName = memberResult.MemberName;
-            if (memberResult.Account.Contains("@") == true)
+            memberInfoRes.ChildNickName = AccountResult.MemberName;
+            if (AccountResult.Account.Contains("@") == true)
             {
-                memberInfoRes.ChildAccountEmail = memberResult.Account;
+                memberInfoRes.ChildAccountEmail = AccountResult.Account;
             }
             else
             {
-                memberInfoRes.ChildAccountPhone = memberResult.Account;
+                memberInfoRes.ChildAccountPhone = AccountResult.Account;
             }
 
             string iconPath = System.IO.Path.Combine(HdlFileNameResourse.UserPictrueDirectory, memberInfoRes.ChildAccountId + ".png");
-            if (memberResult.HeadImage != null)
+            if (AccountResult.HeadImage != null)
             {
                 //鍐欏叆澶村儚鍐呭
-                Shared.IO.FileUtils.WriteFileByBytes(iconPath, memberResult.HeadImage);
+                Shared.IO.FileUtils.WriteFileByBytes(iconPath, AccountResult.HeadImage);
             }
+
+            //鍏抽棴杩涘害鏉�
+            this.CloseProgressBar();
 
             HdlThreadLogic.Current.RunMain(() =>
             {
                 //鎴愬憳娣诲姞鎴愬姛
                 var form = new AddMemberSuccessForm();
-                form.AddForm(memberResult);
+                form.AddForm(memberInfoRes);
                 form.FormCloseEvent += (() =>
                 {
                     this.CloseForm();

--
Gitblit v1.8.0