From abc4e92e199962da76ae58c611f2616066053194 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 09:52:55 +0800
Subject: [PATCH] 2020-11-23 1.住宅相关接口替换。2.增加检测更新。3.增加服务器选择Dialog
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs
index 437656b..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() == StateCode.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() == StateCode.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;
}
}
@@ -199,7 +203,7 @@
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();
--
Gitblit v1.8.0