From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1

---
 HDL_ON/UI/UI0-Public/TopViewDiv.cs |   77 +++++++++++++++++++++++++++++++-------
 1 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index df36a85..d561905 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -20,7 +20,6 @@
         /// </summary>
         FrameLayout contentView;
 
-
         /// <summary>
         /// 鍚庨��鎸夐挳
         /// </summary>
@@ -32,6 +31,11 @@
         string title;
 
         /// <summary>
+        /// 鏄惁闇�瑕佸叧闂〉闈�
+        /// </summary>
+        bool needClose = true;
+
+        /// <summary>
         /// 鍚庨��鏃惰Е鍙戝浜嬩欢
         /// </summary>
         Action backAction;
@@ -40,6 +44,19 @@
         {
             baseView = frame;
             title = str;
+        }
+
+        /// <summary>
+        /// TopViewDiv
+        /// </summary>
+        /// <param name="frame">鐖舵帶浠�</param>
+        /// <param name="title">鏍囬</param>
+        /// <param name="needClose">鏄惁闇�瑕佸叧闂〉闈�</param>
+        public TopViewDiv(FrameLayout frame, string title, bool needClose)
+        {
+            baseView = frame;
+            this.title = title;
+            this.needClose = needClose;
         }
 
         /// <summary>
@@ -70,7 +87,7 @@
             };
             baseView.AddChidren(contentView);
 
-            btnBack = new Button()
+            Button btnBackIcon = new Button()
             {
                 X = Application.GetRealWidth(10),
                 Y = Application.GetRealHeight(29),
@@ -78,13 +95,19 @@
                 Height = Application.GetRealWidth(28),
                 UnSelectedImagePath = "Public/BackIcon.png",
             };
+            baseView.AddChidren(btnBackIcon);
+
+            btnBack = new Button()
+            {
+                Width = Application.GetRealWidth(50),
+            };
             baseView.AddChidren(btnBack);
 
             Button btnTilte = new Button()
             {
                 Gravity = Gravity.CenterHorizontal,
                 Y = Application.GetRealHeight(30),
-                Width = Application.GetRealWidth(150),
+                Width = Application.GetRealWidth(270),
                 Height = Application.GetRealHeight(25),
                 TextAlignment = TextAlignment.Center,
                 TextSize = CSS_FontSize.HeadlineFontSize,
@@ -99,12 +122,34 @@
         /// <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();
+        }
+
+        public void LoadTopView_RoomTop(Action backAction ,Action editAction)
+        {
+            this.backAction = backAction;
+
+            LoadTopView();
+
+            var btnSetting = new Button()
+            {
+                X = Application.GetRealWidth(337),
+                Y = Application.GetRealHeight(29),
+                Width = Application.GetMinRealAverage(28),
+                Height = Application.GetMinRealAverage(28),
+                UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
+            };
+            contentView.AddChidren(btnSetting);
+
+            btnSetting.MouseUpEventHandler = (sender, e) =>
+            {
+                editAction();
+            };
         }
 
         /// <summary>
@@ -112,7 +157,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;
 
@@ -128,20 +173,22 @@
             };
             contentView.AddChidren(btnSetting);
 
-            btnSetting.MouseUpEventHandler += (sender, e) =>
+            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 +212,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 +238,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