From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'

---
 HDL_ON/UI/UI2/2-Classification/RoomPage.cs |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index f6386d2..2af49b6 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -23,9 +23,14 @@
         static Room room;
         Action skipEditPageAction;
         Action ReloadRoomName;
+        /// <summary>
+        /// 鍒犻櫎鎴块棿浜嬩欢
+        /// </summary>
+        Action deleteAction;
+
         #endregion
 
-        public RoomPage(Room r,Action rrn)
+        public RoomPage(Room r, Action rrn, Action delAction)
         {
             bodyView = this;
             room = r;
@@ -34,6 +39,7 @@
                 LoadEvent_SkipEditRoomPage();
             };
             ReloadRoomName = rrn;
+            deleteAction = delAction;
         }
         /// <summary>
         /// 閲嶈浇鐣岄潰
@@ -48,7 +54,7 @@
         {
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
 
-            new TopViewDiv(bodyView,room.name).LoadTopView_RoomTop(ReloadRoomName, skipEditPageAction);
+            new TopViewDiv(bodyView,room.roomName).LoadTopView_RoomTop(ReloadRoomName, skipEditPageAction);
 
             functionListView = new VerticalScrolViewLayout()
             {

--
Gitblit v1.8.0