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/MemberPermissionPage.cs | 46 ++++++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 16 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs index 265b3cb..f5c010e 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs @@ -102,12 +102,14 @@ }; contentView.AddChidren(roomListView); - List<Function> funss = new List<Function>(); - if (memberInfo.CurShareData.ShareDataBytes != null) - { - funss = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Function>>( - CommonPage.MyEncodingUTF8.GetString(memberInfo.CurShareData.ShareDataBytes)); - } + //List<Function> funss = new List<Function>(); + //if (memberInfo.CurResidenceShareDate.Count > 0) + //{ + // foreach (var sd in memberInfo.CurResidenceShareDate) + // { + // funss.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(CommonPage.MyEncodingUTF8.GetString(sd.ShareDataBytes))); + // } + //} foreach (var room in DB_ResidenceData.residenceData.rooms) { var roomView = new FrameLayout() @@ -132,14 +134,25 @@ //璁$畻宸茬粡鍔犲叆鎴块棿鐨勮澶囨暟閲� int addCount = 0; - foreach (var d in memberInfo.sharedDatas) + foreach (var sd in memberInfo.CurResidenceShareDate) { - foreach(var f in funss) + if (room.functions.Find((obj) => obj.sid == sd.ShareName) != null) { - if (room.functions.Find((obj) => obj.sid == f.sid) != null) - { - addCount++; - } + addCount++; + } + } + //绉婚櫎褰撳墠浣忓畢宸茬粡涓嶅瓨鍦ㄧ殑鍔熻兘 + for(int i= 0;i< memberInfo.CurResidenceShareDate.Count;) + { + var sd = memberInfo.CurResidenceShareDate[i]; + if (DB_ResidenceData.residenceData.functionList.functions.Find((obj) => obj.sid == sd.ShareName) == null) + { + new DAL.Server.HttpServerRequest().DeleteShareData(sd); + memberInfo.CurResidenceShareDate.Remove(sd); + } + else + { + i++; } } @@ -168,15 +181,17 @@ EventHandler<MouseEventArgs> eHandler = (sender, e) => { - var mmp = new MemberFunctionPermissionPage(memberInfo,room); + Action<string> refreshFunctionCount = (newCount) => { + btnFunctionCount.Text = newCount + "/" + room.functions.Count.ToString(); + }; + var mmp = new MemberFunctionPermissionPage(memberInfo, room,refreshFunctionCount); MainPage.BasePageView.AddChidren(mmp); - mmp.LoadPage(); + mmp.LoadPage(StringId.PermissionToUse); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; roomView.MouseUpEventHandler = eHandler; btnRoomName.MouseUpEventHandler = eHandler; btnRight.MouseUpEventHandler = eHandler; - if (DB_ResidenceData.residenceData.rooms.IndexOf(room) < DB_ResidenceData.residenceData.rooms.Count - 2) { @@ -206,7 +221,6 @@ BackgroundColor = CSS_Color.BackgroundColor, }); } - #endregion btnDelMember = new Button() -- Gitblit v1.8.0