From e08a444a9d7acea0cf39f50d22d29179f6a59292 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 09:37:11 +0800
Subject: [PATCH] 2020-12-1

---
 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs |   67 +++++++++++----------------------
 1 files changed, 23 insertions(+), 44 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs
index 1539479..d3bf8f2 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs
@@ -95,7 +95,7 @@
                     {
                         foreach (var f in addFuns)
                         {
-                            var sd = member.CurResidenceShareDate.Find((obj) => obj.ShareName == f.ShareName);
+                            var sd = member.CurResidenceShareDate.Find((obj) => obj.fileName == f.fileName);
                             //濡傛灉璇ュ姛鑳藉凡缁忓垎浜紝鏇存柊鍘熸湁鐨勬暟鎹�
                             if (null != sd)
                             {
@@ -104,7 +104,7 @@
                             }
                             else//濡傛灉璇ュ姛鑳芥湭琚垎浜紝鍒欐柊澧炲垎浜�
                             {
-                                f.SubAccountDistributedMark = member.SubAccountDistributedMark;
+                                f.childAccountId = member.childAccountId;
                                 result = LoadMethod_AddShareData(f);
                             }
                             if (!result)
@@ -144,16 +144,20 @@
         bool LoadMethod_AddShareData(ShareData ssdd)
         {
             //澧炲姞鍏变韩鏁版嵁鐩綍
-            ResponsePack responePack = new HttpServerRequest().AddShareData(ssdd);
-            if (responePack.StateCode.ToUpper() != "SUCCESS")
+            var responePack = new HttpServerRequest().AddShareData(ssdd);
+            if (responePack.Code.ToUpper() != "SUCCESS")
             {
                 return false;
             }
             else
             {
-                ssdd.DistributedMark = responePack.ResponseData.ToString();
-                // 鏇存柊鍏变韩鏁版嵁
-                return EditShareData(ssdd);
+                //ssdd.id = responePack.ResponseData.ToString();
+                var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(responePack.Data.ToString());
+                ssdd.id = responeObj.id;
+                //2020-11-22 
+                return true;
+                //// 鏇存柊鍏变韩鏁版嵁
+                //return EditShareData(ssdd);
             }
         }
 
@@ -162,8 +166,8 @@
         /// </summary>
         bool EditShareData(ShareData sd)
         {
-            ResponsePack responePack = new HttpServerRequest().EditShareData(sd);
-            if (responePack.StateCode.ToUpper() == "SUCCESS")
+            var responePack = new HttpServerRequest().EditShareData(sd);
+            if (responePack.Code == StateCode.SUCCESS)
             {
                 return true;
             }
@@ -179,10 +183,10 @@
         /// <param name="info"></param>
         void LoadMethod_GetMemberSharedDataList(ResidenceMemberInfo info)
         {
-            ResponsePack responePack = new HttpServerRequest().GetShareDataByMemberAccount(info.SubAccountDistributedMark);
-            if (responePack.StateCode.ToUpper() == "SUCCESS")
+            var responePack = new HttpServerRequest().GetShareDataByMemberAccount(info.childAccountId);
+            if (responePack.Code == StateCode.SUCCESS)
             {
-                var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ShareData>>(responePack.ResponseData.ToString());
+                var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ShareData>>(responePack.Data.ToString());
                 info.CurResidenceShareDate = responeObj;
             }
         }
@@ -193,13 +197,13 @@
         bool LoadMethod_GetResidenceMemberAccount()
         {
             var result = false;
-            ResponsePack responePack = new HttpServerRequest().GetResidenceMemberAccount();
-            if (responePack.StateCode.ToUpper() == "SUCCESS")
+            var responePack = new HttpServerRequest().GetResidenceMemberAccount();
+            if (responePack.Code == StateCode.SUCCESS)
             {
-                memberList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>>(responePack.ResponseData.ToString());
+                memberList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>>(responePack.Data.ToString());
                 foreach (var mInfo in memberList)
                 {
-                    ResponsePack memberInfoResponePack = new HttpServerRequest().GetResidenceMemberAccountInfo(mInfo.Account);
+                    ResponsePack memberInfoResponePack = new HttpServerRequest().GetResidenceMemberAccountInfo(mInfo.childAccountId);
                     var dataStr = JObject.FromObject(memberInfoResponePack.ResponseData);
                     FileStream fs = null;
                     try
@@ -207,7 +211,7 @@
                         var headImageString = dataStr.GetValue("HeadImage").ToString();
                         var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
                         var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
-                        var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", mInfo.DistributedMark + ".png");
+                        var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", mInfo.childAccountId + ".png");
                         fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
                         fs.Write(headImageBytes, 0, headImageBytes.Length);
                         fs.Flush();
@@ -231,37 +235,12 @@
             //澶辫触
             else
             {
-                string tipStr = "Sever erorr";
-                switch (responePack.StateCode)
-                {
-                    case "ValidCodeAndPhoneNoEqual":
-                        tipStr = Language.StringByID(StringId.VerificationCodeError);
-                        break;
-                    case "USERNAMEORPWDERROR":
-                        tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
-                        break;
-                    case "ACCOUNTNOEXISTS":
-                        tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
-                        break;
-                    case "NoRecord":
-                        tipStr = Language.StringByID(StringId.PlsGetTheVerificationCode);
-                        break;
-                    case "Self:Net_Error":
-                        tipStr = Language.StringByID(StringId.NetworkAnomaly);
-                        break;
-                }
+                //鎻愮ず
+                IMessageCommon.Current.ShowErrorInfoAlter(responePack.Code);
                 //璐﹀彿鎴栬�呭瘑鐮侀敊璇�
                 Application.RunOnMainThread(() =>
                 {
                     waitPage.Hide();
-                    //鎻愮ず鍘熷洜
-                    var tip = new Tip()
-                    {
-                        Text = tipStr,
-                        CloseTime = 1,
-                        Direction = AMPopTipDirection.None
-                    };
-                    tip.Show(bodyView);
                 });
             }
             Application.RunOnMainThread(() =>

--
Gitblit v1.8.0