From 30b5770f56f99c1f92e933ad31cf7d2af58b033c Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 02 十二月 2020 16:31:48 +0800
Subject: [PATCH] 20201202
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs | 67 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index 924655f..0afb065 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,25 +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.CurResidenceShareDate.Count > 0)
//{
// foreach (var sd in memberInfo.CurResidenceShareDate)
// {
- // funss.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(CommonPage.MyEncodingUTF8.GetString(sd.ShareDataBytes)));
+ // funss.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(System.Text.Encoding.UTF8.GetString(sd.ShareDataBytes)));
// }
//}
- foreach (var room in DB_ResidenceData.rooms)
+ foreach (var room in DB_ResidenceData.Rooms)
{
var roomView = new FrameLayout()
{
@@ -128,7 +128,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- Text = room.name,
+ Text = room.roomName,
};
roomView.AddChidren(btnRoomName);
@@ -136,7 +136,7 @@
int addCount = 0;
foreach (var sd in memberInfo.CurResidenceShareDate)
{
- if (room.GetRoomFunctions(false).Find((obj) => obj.sid == sd.ShareName) != null)
+ if (room.GetRoomFunctions(false).Find((obj) => obj.sid == sd.fileName) != null)
{
addCount++;
}
@@ -145,7 +145,7 @@
for(int i= 0;i< memberInfo.CurResidenceShareDate.Count;)
{
var sd = memberInfo.CurResidenceShareDate[i];
- if (DB_ResidenceData.functionList.GetAllFunction().Find((obj) => obj.sid == sd.ShareName) == null)
+ if (DB_ResidenceData.functionList.GetAllFunction().Find((obj) => obj.sid == sd.fileName) == null)
{
new DAL.Server.HttpServerRequest().DeleteShareData(sd);
memberInfo.CurResidenceShareDate.Remove(sd);
@@ -193,7 +193,7 @@
btnRoomName.MouseUpEventHandler = eHandler;
btnRight.MouseUpEventHandler = eHandler;
- if (DB_ResidenceData.rooms.IndexOf(room) < DB_ResidenceData.rooms.Count - 2)
+ if (DB_ResidenceData.Rooms.IndexOf(room) < DB_ResidenceData.Rooms.Count - 2)
{
var btnRoomLine = new Button()
{
@@ -207,26 +207,27 @@
}
}
- if (DB_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