From 351bdda734832d821a9764b0cde8be5d83c4ec50 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 01 十二月 2022 09:56:25 +0800
Subject: [PATCH] 2022年12月01日09:56:23

---
 ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs |   67 +++++++++++++++++++++++++++------
 1 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
index 5eb8f1c..1ed7e3a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
@@ -77,7 +77,8 @@
             btnName.Gravity = Gravity.CenterHorizontal;
             btnName.TextAlignment = TextAlignment.Center;
             btnName.TextSize = 16;
-            btnName.Text = memberResult.MemberName;
+            //濡傛灉瀹冩湰韬氨娌″悕瀛楃殑璇濓紝鎶婁粬鐨処D浣滀负鏄电О
+            btnName.Text = string.IsNullOrEmpty(memberResult.UserName) == true ? memberResult.Account : memberResult.UserName;
             bodyFrameLayout.AddChidren(btnName);
 
             //璇风‘璁よ处鍙锋槸鍚︽纭畕0}濡傛纭鐐瑰嚮纭
@@ -124,26 +125,48 @@
             //寮�鍚繘搴︽潯
             this.ShowProgressBar();
 
-            //娣诲姞鎴愬憳
-            var memberInfoRes = HdlMemberLogic.Current.AddMember(memberResult.Account, memberResult.MemberName);
-            if (memberInfoRes == null)
+            var pra = new BindSubAccountPra();
+            pra.SubAccount = memberResult.Account;
+
+            bool result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindSubAccount", false, pra);
+            if (result == false)
             {
                 //鍏抽棴杩涘害鏉�
                 this.CloseProgressBar();
                 return;
             }
-            //娣诲姞瀛愯处鍙锋椂,鎺ュ彛骞朵笉杩斿洖杩欎簺涓滆タ,鎵�浠ラ渶瑕佹墜鍔ㄨ祴鍊�
-            memberInfoRes.ChildNickName = memberResult.MemberName;
-            if (memberResult.Account.Contains("@") == true)
+
+            //鑾峰彇杩欎釜鎴愬憳鐨凷ubDistributedMark
+            var pra2 = new MemberListInfoPra();
+            string resultValue = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra2);
+            //鍏抽棴杩涘害鏉�
+            this.CloseProgressBar();
+
+            if (string.IsNullOrEmpty(resultValue) == true)
             {
-                memberInfoRes.ChildAccountEmail = memberResult.Account;
+                return;
             }
-            else
+            List<MemberInfoRes> listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MemberInfoRes>>(resultValue);
+            MemberInfoRes memberInfoRes = null;
+            foreach (var info in listInfo)
             {
-                memberInfoRes.ChildAccountPhone = memberResult.Account;
+                //褰撹处鍙风粦瀹氫簡閭鏃�,瀹冭繑鍥炵殑鏄偖绠辫处鍙�
+                if (info.Account == memberResult.Account
+                    || info.Account == memberResult.Email)
+                {
+                    memberInfoRes = info;
+                    break;
+                }
+            }
+            if (memberInfoRes == null)
+            {
+                //鍑虹幇鎰忓鎯呭喌,鏁版嵁涓㈠け
+                string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownErrorAndLostData);
+                this.ShowMassage(ShowMsgType.Tip, msg);
+                return;
             }
 
-            string iconPath = System.IO.Path.Combine(HdlFileNameResourse.UserPictrueDirectory, memberInfoRes.ChildAccountId + ".png");
+            string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, memberInfoRes.DistributedMark + ".png");
             if (memberResult.HeadImage != null)
             {
                 //鍐欏叆澶村儚鍐呭
@@ -154,12 +177,12 @@
             {
                 //鎴愬憳娣诲姞鎴愬姛
                 var form = new AddMemberSuccessForm();
-                form.AddForm(memberResult);
+                form.AddForm(memberInfoRes, memberInfoRes.DistributedMark);
                 form.FormCloseEvent += (() =>
                 {
                     this.CloseForm();
                     //鍏抽棴鎵嬪姩杈撳叆鎴愬憳ID鐨勭敾闈�
-                    HdlFormLogic.Current.CloseFormByFormName("AddMemberByIdForm");
+                    this.CloseFormByFormName("AddMemberByIdForm");
                     //娣诲姞鎴愬憳
                     this.LoadFormMethodByName("MemberListForm", "AddRowLayoutByOtherForm", memberInfoRes);
                 });
@@ -167,5 +190,23 @@
         }
 
         #endregion
+
+        #region 鈻� 缁撴瀯浣揰____________________________
+
+        /// <summary>
+        /// 缁戝畾鎴愬憳ID鍒颁綇瀹呯殑鍚姩鍙傛暟
+        /// </summary>
+        private class BindSubAccountPra : IfacePraCommon
+        {
+            /// <summary>
+            /// 瀛愯处鍙稩D
+            /// </summary>
+            public string SubAccount = string.Empty;
+            /// <summary>
+            /// 浣忓畢ID
+            /// </summary>
+            public string HouseDistributedMark = Common.Config.Instance.Home.Id;
+        }
+        #endregion
     }
 }

--
Gitblit v1.8.0