From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs | 107 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 61 insertions(+), 46 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..2b6108e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -54,25 +54,25 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- Text = memberInfo.Nickname + "(" + memberInfo.UserName + ")",
+ Text = memberInfo.nickName + "(" + memberInfo.Account + ")",
};
headPortraitView.AddChidren(btnMemberName);
#region RoomList
- FrameLayout contentView = new FrameLayout()
+ VerticalScrolViewLayout roomListView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(138),
- Height = Application.GetRealHeight(485),
- BackgroundColor = CSS_Color.MainBackgroundColor,
+ Height = Application.GetRealHeight(471),
+ //BackgroundColor = CSS_Color.MainBackgroundColor,
};
- bodyView.AddChidren(contentView);
+ bodyView.AddChidren(roomListView);
var titleView = new FrameLayout()
{
BackgroundColor = CSS_Color.MainBackgroundColor,
Height = Application.GetRealWidth(44),
};
- contentView.AddChidren(titleView);
+ roomListView.AddChidren(titleView);
var btnTitle = new Button()
{
@@ -92,23 +92,25 @@
Height = Application.GetRealHeight(1),
BackgroundColor = CSS_Color.DividingLineColor,
};
- contentView.AddChidren(btnLine);
+ roomListView.AddChidren(btnLine);
//---------------------------------------------
- var roomListView = new VerticalScrolViewLayout()
- {
- Y = btnLine.Bottom,
- Height = Application.GetRealHeight(440),
- };
- contentView.AddChidren(roomListView);
+ //var roomListView = new VerticalScrolViewLayout()
+ //{
+ // Y = btnLine.Bottom,
+ // Height = Application.GetRealHeight(440),
+ //};
+ //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));
- }
- foreach (var room in DB_ResidenceData.residenceData.rooms)
+ //List<Function> funss = new List<Function>();
+ //if (memberInfo.CurResidenceShareDate.Count > 0)
+ //{
+ // foreach (var sd in memberInfo.CurResidenceShareDate)
+ // {
+ // funss.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(System.Text.Encoding.UTF8.GetString(sd.ShareDataBytes)));
+ // }
+ //}
+ foreach (var room in DB_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.GetRoomFunctions(false).Find((obj) => obj.sid == sd.fileName) != 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.functionList.GetAllFunction().Find((obj) => obj.sid == sd.fileName) == null)
+ {
+ new DAL.Server.HttpServerRequest().DeleteShareData(sd);
+ memberInfo.CurResidenceShareDate.Remove(sd);
+ }
+ else
+ {
+ i++;
}
}
@@ -152,7 +165,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
- Text = addCount + "/" + room.functions.Count.ToString(),
+ Text = addCount + "/" + room.GetRoomFunctions(false).Count.ToString(),
};
roomView.AddChidren(btnFunctionCount);
@@ -168,17 +181,19 @@
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
- var mmp = new MemberFunctionPermissionPage(memberInfo,room);
+ Action<string> refreshFunctionCount = (newCount) => {
+ btnFunctionCount.Text = newCount + "/" + room.GetRoomFunctions(false).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)
+ if (DB_ResidenceData.rooms.IndexOf(room) < DB_ResidenceData.rooms.Count - 2)
{
var btnRoomLine = new Button()
{
@@ -192,27 +207,27 @@
}
}
- if (DB_ResidenceData.residenceData.rooms.Count > 10)
- {
- roomListView.ScrollEnabled = true;
- }
- else
- {
- roomListView.ScrollEnabled = false;
+ //if (DB_ResidenceData.rooms.Count > 10)
+ //{
+ // roomListView.ScrollEnabled = true;
+ //}
+ //else
+ //{
+ // roomListView.ScrollEnabled = false;
- roomListView.AddChidren(new Button()
- {
- Height = Application.GetRealWidth(441),
- BackgroundColor = CSS_Color.BackgroundColor,
- });
- }
-
+ // roomListView.AddChidren(new Button()
+ // {
+ // Height = Application.GetRealWidth(441),
+ // BackgroundColor = CSS_Color.BackgroundColor,
+ // });
+ //}
#endregion
btnDelMember = new Button()
{
Y = Application.GetRealHeight(617),
- Height = MainPage.Increase ? Application.GetRealHeight(70) : Application.GetRealHeight(50),
+ //Height = MainPage.Increase ? Application.GetRealHeight(70) : Application.GetRealHeight(50),
+ Height = Application.GetRealHeight(50),
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.WarningColor,
--
Gitblit v1.8.0