From f788a1e320b8505435ed66e2456ddb2d0a838f76 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 19 十一月 2020 19:58:14 +0800
Subject: [PATCH] 2020-11-19 1.优化绑定和解绑页面。2.修改密码功能实现，UI界面实现，接口实现。

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

diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index aa18db3..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>
@@ -30,6 +29,11 @@
         /// 鏍囬鍚嶇О
         /// </summary>
         string title;
+
+        /// <summary>
+        /// 鏄惁闇�瑕佸叧闂〉闈�
+        /// </summary>
+        bool needClose = true;
 
         /// <summary>
         /// 鍚庨��鏃惰Е鍙戝浜嬩欢
@@ -42,6 +46,25 @@
             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>
+        /// 
+        /// </summary>
+        /// <param name="dialog">鏄剧ず鐨刣ialog</param>
+        /// <param name="frame">dialog鐨勭埗绐椾綋</param>
+        /// <param name="str">鏍囬鏂囨湰</param>
         public TopViewDiv(Dialog dialog, FrameLayout frame, string str)
         {
             baseDialog = dialog;
@@ -69,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);
@@ -93,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();
         }
@@ -106,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;
 
@@ -124,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();
 
@@ -151,7 +201,6 @@
             btnAddIcon.MouseUpEventHandler += (sender, e) =>
             {
                 LoadEvent_AddEvent(type, callBack);
-
             };
         }
 
@@ -161,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