From 264f86c363a6a019fac8eb138877fee9e4734e2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 21 八月 2021 17:45:44 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7

---
 HDL_ON/UI/UI0-Public/TopViewDiv.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 27de3ca..d7f18f7 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -131,7 +131,7 @@
             LoadTopView();
         }
 
-        public void LoadTopView_RoomTop(Action backAction ,Action editAction)
+        public void LoadTopView_RoomTop(Action backAction, Action editAction)
         {
             this.backAction = backAction;
 
@@ -275,7 +275,7 @@
         /// <summary>
         /// 妤煎眰绠$悊椤堕儴鏍�
         /// </summary>
-        public void LoadTopView_FloorTopView(Action<string> callBack,Action action)
+        public void LoadTopView_FloorTopView(Action<string> callBack, Action action)
         {
             LoadTopView();
 
@@ -340,7 +340,7 @@
         /// <summary>
         /// 鎴愬憳椤堕儴鏍�
         /// </summary>
-        public void LoadTopView_MemberTopView(Action callBack, Action action)
+        public void LoadTopView_MemberTopView(Action addAction, Action action)
         {
             LoadTopView();
             backAction = action;
@@ -376,7 +376,7 @@
                 Height = Application.GetMinRealAverage(28),
                 UnSelectedImagePath = "FunctionIcon/ArmCenter/HistoryIcon.png",
             };
-            contentView.AddChidren(btnAddIcon);
+            //contentView.AddChidren(btnAddIcon);
 
             btnAddIcon.MouseUpEventHandler += (sender, e) =>
             {

--
Gitblit v1.8.0