From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs | 41 ++++++++++-------------------------------
1 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
index c1bc3e6..c86d489 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
@@ -17,7 +17,6 @@
}
-
/// <summary>
/// 鍔犺浇鑾峰彇浣忓畢瀛愯处鍙蜂俊鎭嚎绋�
/// </summary>
@@ -52,24 +51,6 @@
waitPage = null;
}
});
-
-#if DEBUG
- residenceMemberInfos.Add(new ResidenceMemberInfo()
- {
- Account = "娴嬭瘯鏁版嵁-璐﹀彿",
- UserName = "娴嬭瘯鏁版嵁-鐢ㄦ埛鍚�",
- Nickname = "娴嬭瘯鏁版嵁-鏄电О",
- SubAccountDistributedMark = Guid.NewGuid().ToString(),
- DistributedMark = Guid.NewGuid().ToString(),
- AccountType = 0,
- IsAllowRemoteCtrl = false,
- });
- Application.RunOnMainThread(() =>
- {
- LoadMemberRow();
- });
-#endif
-
}
})
{ IsBackground = true };
@@ -112,7 +93,7 @@
{
fs.Close();
}
- //-----------
+ //-----------鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
LoadMethod_GetMemberSharedDataList(mInfo);
}
residenceMemberInfos.Add(mInfo);
@@ -157,7 +138,7 @@
}
Application.RunOnMainThread(() =>
{
- waitPage.Hide();
+ waitPage?.Hide();
});
return result;
}
@@ -172,29 +153,27 @@
if (responePack.StateCode.ToUpper() == "SUCCESS")
{
var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ShareData>>(responePack.ResponseData.ToString());
- info.sharedDatas = responeObj;
- var sd = responeObj.Find((obj) => obj.HouseDistributedMark == DB_ResidenceData.residenceData.residecenInfo.RegionID );
- if (sd != null)
+ info.CurResidenceShareDate = responeObj;
+ foreach (var sd in info.CurResidenceShareDate)
{
- LoadMethod_GetMemberSharedData(sd,info);
- }
- else
- {
- LoadMethod_GetMemberSharedData(new ShareData(),info);
+ LoadMethod_GetMemberSharedData(sd);
}
}
}
+
/// <summary>
/// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹�
/// </summary>
/// <param name="info"></param>
- void LoadMethod_GetMemberSharedData(ShareData sd, ResidenceMemberInfo info)
+ bool LoadMethod_GetMemberSharedData(ShareData sd)
{
ResponsePack responePack = new HttpServerRequest().GetShareData(sd.DistributedMark,sd.HouseDistributedMark);
if (responePack.StateCode.ToUpper() == "SUCCESS")
{
- info.CurShareData = Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(responePack.ResponseData.ToString());
+ sd.ShareDataBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(responePack.ResponseData.ToString()).ShareDataBytes;
+ return true;
}
+ return false;
}
/// <summary>
--
Gitblit v1.8.0