From 52e05a5fb6e07afbb14960fc3cbb8a8971e19eb2 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 25 十一月 2020 20:08:56 +0800
Subject: [PATCH] 2020-11-25 1.TOKEN过期刷新处理
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index f5c010e..91a039c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -54,7 +54,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- Text = memberInfo.Nickname + "(" + memberInfo.UserName + ")",
+ Text = memberInfo.nickName + "(" + memberInfo.Account + ")",
};
headPortraitView.AddChidren(btnMemberName);
@@ -107,10 +107,10 @@
//{
// 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.residenceData.rooms)
+ foreach (var room in DB_ResidenceData.rooms)
{
var roomView = new FrameLayout()
{
@@ -136,7 +136,7 @@
int addCount = 0;
foreach (var sd in memberInfo.CurResidenceShareDate)
{
- if (room.functions.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.residenceData.functionList.functions.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);
@@ -165,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);
@@ -182,7 +182,7 @@
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
Action<string> refreshFunctionCount = (newCount) => {
- btnFunctionCount.Text = newCount + "/" + room.functions.Count.ToString();
+ btnFunctionCount.Text = newCount + "/" + room.GetRoomFunctions(false).Count.ToString();
};
var mmp = new MemberFunctionPermissionPage(memberInfo, room,refreshFunctionCount);
MainPage.BasePageView.AddChidren(mmp);
@@ -193,7 +193,7 @@
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()
{
@@ -207,7 +207,7 @@
}
}
- if (DB_ResidenceData.residenceData.rooms.Count > 10)
+ if (DB_ResidenceData.rooms.Count > 10)
{
roomListView.ScrollEnabled = true;
}
@@ -226,7 +226,8 @@
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