From 145b157ba183ebf877c93ed2dbb01ec737c993d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 十二月 2020 18:59:33 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index 638796a..5dcbbdf 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -140,7 +140,7 @@
// 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.residenceData.Rooms)
{
var roomView = new FrameLayout()
{
@@ -222,8 +222,9 @@
roomView.MouseUpEventHandler = eHandler;
btnRoomName.MouseUpEventHandler = eHandler;
btnRight.MouseUpEventHandler = eHandler;
+ btnFunctionCount.MouseUpEventHandler = eHandler;
- if (DB_ResidenceData.Rooms.IndexOf(room) < DB_ResidenceData.Rooms.Count - 2)
+ if (DB_ResidenceData.residenceData.Rooms.IndexOf(room) < DB_ResidenceData.residenceData.Rooms.Count - 2)
{
var btnRoomLine = new Button()
{
--
Gitblit v1.8.0