From 4c17caa61bc3b0a05a2b303bccdfedfbf3853f6d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 24 十一月 2020 15:58:10 +0800
Subject: [PATCH] 2020-11-24 1.优化登录界面失败提示。

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

diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 1e13358..0b31b9d 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="str">鏍囬</param>
+        /// <param name="needClose">鏄惁闇�瑕佸叧闂〉闈�</param>
+        public TopViewDiv(FrameLayout frame, string str, bool needClose)
+        {
+            baseView = frame;
+            title = str;
+            this.needClose = needClose;
         }
 
         /// <summary>
@@ -75,7 +92,7 @@
                 X = Application.GetRealWidth(10),
                 Y = Application.GetRealHeight(29),
                 Width = Application.GetRealWidth(40),
-                Height = Application.GetRealHeight(28),
+                Height = Application.GetRealWidth(28),
                 UnSelectedImagePath = "Public/BackIcon.png",
             };
             baseView.AddChidren(btnBack);
@@ -99,10 +116,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 +129,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,17 +147,44 @@
 
             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_SettingIcon(Action skipAction)
+        {
+            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) =>
+            {
+                skipAction();
+            };
+        }
 
         /// <summary>
         /// 鍚慺ramelayout娣诲姞椤堕儴鍖哄煙,鎷ユ湁娣诲姞鍥炬爣鐨勬寜閽�
         /// </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();
 
@@ -157,7 +201,6 @@
             btnAddIcon.MouseUpEventHandler += (sender, e) =>
             {
                 LoadEvent_AddEvent(type, callBack);
-
             };
         }
 
@@ -167,9 +210,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