From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
index d2d4498..b5838b4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs
@@ -15,7 +15,6 @@
LoadEvent_OptionClick();
}
-
/// <summary>
/// 搴曢儴鎿嶄綔鎸夐挳鐐瑰嚮浜嬩欢
/// </summary>
@@ -39,11 +38,11 @@
}
foreach (var f in funs_New)
{
- var sd = funs.Find((obj) => obj.ShareName == f.ShareName);
+ var sd = funs.Find((obj) => obj.fileName == f.fileName);
//濡傛灉璇ュ姛鑳藉凡缁忓垎浜紝鏇存柊鍘熸湁鐨勬暟鎹�
if (null != sd)
{
- sd.ShareDataBytes = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(f));
+ sd.ShareDataBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(f));
result = EditShareData(sd);
}
else//濡傛灉璇ュ姛鑳芥湭琚垎浜紝鍒欐柊澧炲垎浜�
@@ -82,7 +81,7 @@
}
else
{
- //var sharedBytes = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(funs_New));
+ //var sharedBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(funs_New));
var page = new ChooseShareMemberTargetListPage(funs_New);
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
@@ -97,14 +96,15 @@
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 != StateCode.SUCCESS)
{
return false;
}
else
{
- ssdd.DistributedMark = responePack.ResponseData.ToString();
+ var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(responePack.Data.ToString());
+ ssdd.id = responeObj.id;
// 鏇存柊鍏变韩鏁版嵁
return EditShareData(ssdd);
}
@@ -115,8 +115,8 @@
/// <param name="function"></param>
bool LoadMethod_DelSharedData(ShareData sd)
{
- ResponsePack responePack = new HttpServerRequest().DeleteShareData(sd);
- if (responePack.StateCode.ToUpper() != "SUCCESS")
+ var responePack = new HttpServerRequest().DeleteShareData(sd);
+ if (responePack.Code != StateCode.SUCCESS)
{
return false;
}
@@ -131,8 +131,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;
}
@@ -147,7 +147,7 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
btnChoose.IsSelected = !btnChoose.IsSelected;
- var sd = funs.Find((obj) => obj.ShareName == function.sid);
+ var sd = funs.Find((obj) => obj.fileName == function.sid);
if (btnChoose.IsSelected)
{
try
@@ -166,16 +166,16 @@
else
{
var newSd = new ShareData();
- newSd.ShareName = function.sid;
- newSd.HouseDistributedMark = DB_ResidenceData.residenceData.residecenInfo.RegionID;
- newSd.ShareDataBytes = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(function));
- newSd.SubAccountDistributedMark = memberInfo.SubAccountDistributedMark;
+ newSd.fileName = function.sid;
+ newSd.homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID;
+ newSd.ShareDataBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(function));
+ newSd.childAccountId = memberInfo.childAccountId;
funs_New.Add(newSd);
}
btnChooseAll.IsSelected = true;
- foreach (var f in room.functions)
+ foreach (var f in room.GetRoomFunctions(false))
{
- if (funs_New.Find((obj) => obj.ShareName == f.sid) == null)
+ if (funs_New.Find((obj) => obj.fileName == f.sid) == null)
{
btnChooseAll.IsSelected = false;
break;
@@ -189,7 +189,7 @@
}
else
{
- var onFuns = funs_New.Find((obj) => obj.ShareName == function.sid);
+ var onFuns = funs_New.Find((obj) => obj.fileName == function.sid);
if (funs_New.Contains(onFuns))
{
funs_New.Remove(onFuns);
@@ -221,21 +221,21 @@
funs_New = new List<ShareData>();
if (btnChooseAll.IsSelected)
{
- foreach(var f in room.functions)
+ foreach(var f in room.GetRoomFunctions(false))
{
var ssdd = new ShareData();
- ssdd.ShareName = f.sid;
- ssdd.HouseDistributedMark = DB_ResidenceData.residenceData.residecenInfo.RegionID;
- ssdd.ShareDataBytes = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(f));
- ssdd.SubAccountDistributedMark = memberInfo.SubAccountDistributedMark;
+ ssdd.fileName = f.sid;
+ ssdd.homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID;
+ ssdd.ShareDataBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(f));
+ ssdd.childAccountId = memberInfo.childAccountId;
funs_New.Add(ssdd);
}
}
else
{
- foreach(var f in room.functions)
+ foreach(var f in room.GetRoomFunctions(false))
{
- var sd = funs.Find((obj) => obj.ShareName == f.sid);
+ var sd = funs.Find((obj) => obj.fileName == f.sid);
if (sd != null)
{
funs_Del.Add(sd);
--
Gitblit v1.8.0