From 17c8d94258154ab2e9f6d2cf821202c873b9f118 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 16 十二月 2020 15:39:15 +0800
Subject: [PATCH] 22222
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
index fb69eb6..172eb57 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
@@ -35,8 +35,17 @@
Action<string> refreshFunctionCount;
+ /// <summary>
+ /// 涔嬪墠鐨勫垎浜垪琛�
+ /// </summary>
List<ShareData> funs;
+ /// <summary>
+ /// 灞炰簬褰撳墠鎴块棿鏈�缁堢殑璁惧鍒嗕韩鍒楄〃
+ /// </summary>
List<ShareData> funs_New;
+ /// <summary>
+ /// 鍒犻櫎鐨勫垎浜垪琛�
+ /// </summary>
List<ShareData> funs_Del;
public MemberFunctionPermissionPage(ResidenceMemberInfo mInfo, Room r, Action<string> action)
@@ -119,7 +128,7 @@
Y = Application.GetRealHeight(519 + 64),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(220),
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealWidth(44),
BackgroundColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.MainBackgroundColor,
@@ -148,7 +157,7 @@
void LoadFunctionRow(List<ShareData> shareDatas)
{
contentView.RemoveAll();
- foreach (var function in room.functions)
+ foreach (var function in room.GetRoomFunctions(false))
{
var roomView = new FrameLayout()
{
@@ -180,9 +189,13 @@
Tag = "ChooseIcon"
};
roomView.AddChidren(btnChoose);
- if (shareDatas.Find((obj) => obj.ShareName == function.sid) != null)
+
+ var shareData = shareDatas.Find((obj) => obj.shareTypeId == function.deviceId);
+ if (shareData != null)
{
btnChoose.IsSelected = true;
+ //鍒锋柊灞炰簬褰撳墠鎴块棿鐨勫垎浜粺璁�
+ funs_New.Add(shareData);
}
else
{
@@ -194,12 +207,12 @@
var btnLine = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(49),
- Height = Application.GetMinReal(1),
+ //Y = Application.GetRealHeight(49),
+ Height = Application.GetRealHeight(1),
Width = Application.GetRealWidth(343),
BackgroundColor = CSS_Color.DividingLineColor,
};
- roomView.AddChidren(btnLine);
+ contentView.AddChidren(btnLine);
}
}
--
Gitblit v1.8.0