From a56a485926a8927f904d7f4795c371c25b35753a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 22 十二月 2020 18:18:15 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
old mode 100644
new mode 100755
index 9798f7e..2914390
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -234,21 +234,7 @@
};
roomView.AddChidren(btnRoomName);
- //濡傛灉鎴块棿涓虹┖锛屼唬琛ㄧ鐞嗘棤鍒嗛厤鍖哄煙
- if (mRoom != null)
- {
- //鏄剧ず鎴块棿鍚�
- btnRoomName.Text = mRoom.roomName;
- roomFunctionList = mRoom.GetRoomFunctions(false);
- roomId = mRoom.roomId;
- }
- else
- {
- //鏄剧ず鏃犲尯鍩熷姛鑳�
- btnRoomName.TextID = StringId.NoAreaFunction;
- roomFunctionList = unallocatedList;
- roomId = null;
- }
+
var btnFunctionCount = new Button()
{
@@ -272,9 +258,26 @@
UnSelectedImagePath = "Public/Right.png",
};
roomView.AddChidren(btnRight);
- //鍒嗗壊绾�
- var lineView = new LineView(roomView.Height - Application.GetRealHeight(1));
- roomView.AddChidren(lineView);
+
+ //濡傛灉鎴块棿涓虹┖锛屼唬琛ㄧ鐞嗘棤鍒嗛厤鍖哄煙
+ if (mRoom != null)
+ {
+ //鏄剧ず鎴块棿鍚�
+ btnRoomName.Text = mRoom.roomName;
+ roomFunctionList = mRoom.GetRoomFunctions(false);
+ roomId = mRoom.roomId;
+ //娣诲姞鍒嗗壊绾�
+ var lineView = new LineView(roomView.Height - Application.GetRealHeight(1));
+ roomView.AddChidren(lineView);
+ }
+ else
+ {
+ //鏄剧ず鏃犲尯鍩熷姛鑳�
+ btnRoomName.TextID = StringId.NoAreaFunction;
+ roomFunctionList = unallocatedList;
+ roomId = null;
+ }
+
//鍒犻櫎鎸夐挳
var deleteBtn = new Button()
{
--
Gitblit v1.8.0