From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112

---
 HDL_ON/UI/UI0-Public/TopViewDiv.cs |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index df36a85..84a2cae 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -99,10 +99,10 @@
         /// <summary>
         /// 鎷ユ湁涓�涓洖璋冧簨浠�
         /// </summary>
-        /// <param name="action"></param>
-        public void LoadTopView(Action action)
+        /// <param name="backAct"></param>
+        public void LoadTopView(Action backAct)
         {
-            backAction = action;
+            backAction = backAct;
 
             LoadTopView();
         }
@@ -112,7 +112,7 @@
         /// </summary>
         /// <param name="frame"></param>
         /// <param name="tilte"></param>
-        public void LoadTopView(Function function, Action action)
+        public void LoadTopView_FunctionTop(Function function, Action action)
         {
             backAction = action;
 
@@ -130,18 +130,20 @@
 
             btnSetting.MouseUpEventHandler += (sender, e) =>
             {
-                LoadEvent_SkipFunctionSetting(function);
+                var infoView = new FunctionBaseInfoSetPage(function, action);
+                MainPage.BasePageView.AddChidren(infoView);
+                infoView.LoadPage();
+                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
             };
         }
+
         /// <summary>
         /// 鎴块棿鏍囬鍖哄煙
         /// </summary>
         /// <param name="room"></param>
         /// <param name="skipAction"></param>
-        public void LoadTopView(Room room,Action skipAction)
+        public void LoadTopView_SettingIcon(Action skipAction)
         {
-            //backAction = action;
-
             LoadTopView();
 
             var btnSetting = new Button()
@@ -165,7 +167,7 @@
         /// </summary>
         /// <param name="frame"></param>
         /// <param name="tilte"></param>
-        public void LoadTopView(string type, Action<string, string> callBack)
+        public void LoadTopView_AddIcon(string type, Action<string, string> callBack)
         {
             LoadTopView();
 
@@ -191,9 +193,9 @@
         /// <param name="type"></param>
         /// <param name="callBack"></param>
         /// <param name="action"></param>
-        public void LoadTopView(string type, Action<string, string> callBack,Action action)
+        public void LoadTopView_AddIcon_BackAction(string type, Action<string, string> callBack,Action action)
         {
-            LoadTopView(type, callBack);
+            LoadTopView_AddIcon(type, callBack);
 
             backAction = action;
         }

--
Gitblit v1.8.0