From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 09:01:53 +0800
Subject: [PATCH] 更新

---
 HDL_ON/UI/UI0-Public/TopViewDiv.cs |   67 ++++++++++++++++++++++++++++++---
 1 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 27de3ca..34c732e 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;
 
@@ -158,11 +158,39 @@
         }
 
         /// <summary>
+        /// 鐏厜鍔熻兘鍒楄〃鐣岄潰
+        /// 甯︾粍鍚堣皟鍏夌紪杈�
+        /// </summary>
+        /// <param name="backAction"></param>
+        /// <param name="editAction"></param>
+        public void LoadTopView_LightFunction( Action editAction)
+        {
+            LoadTopView();
+
+            var btnSetting = new Button()
+            {
+                X = Application.GetRealWidth(337),
+                Y = Application.GetRealHeight(29),
+                Width = Application.GetMinRealAverage(28),
+                Height = Application.GetMinRealAverage(28),
+                UnSelectedImagePath = "FunctionIcon/Light/LightScene/SetLightSceneIcon.png",
+            };
+
+            contentView.AddChidren(btnSetting);
+            btnSetting.MouseUpEventHandler = (sender, e) =>
+            {
+                editAction();
+            };
+        }
+
+
+
+        /// <summary>
         /// 鍚慺ramelayout娣诲姞椤堕儴鍖哄煙,鎷ユ湁閰嶇疆鍥炬爣鎸夐挳
         /// </summary>
         /// <param name="frame"></param>
         /// <param name="tilte"></param>
-        public void LoadTopView_FunctionTop(Function function, Action action)
+        public void LoadTopView_FunctionTop(Function function, Action action,bool locationSet = true)
         {
             backAction = action;
 
@@ -186,7 +214,7 @@
             {
                 var infoView = new FunctionBaseInfoSetPage(function, action);
                 MainPage.BasePageView.AddChidren(infoView);
-                infoView.LoadPage();
+                infoView.LoadPage(locationSet);
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
             };
         }
@@ -275,7 +303,7 @@
         /// <summary>
         /// 妤煎眰绠＄悊椤堕儴鏍�
         /// </summary>
-        public void LoadTopView_FloorTopView(Action<string> callBack,Action action)
+        public void LoadTopView_FloorTopView(Action<string> callBack, Action action)
         {
             LoadTopView();
 
@@ -338,9 +366,36 @@
             };
         }
         /// <summary>
+        /// 鍗忚绠＄悊椤堕儴
+        /// 甯︽挙閿�鍚屾剰鎸夐挳
+        /// </summary>
+        public void LoadTopView_WithdrawalConsent(Action withdrawalConsentAction)
+        {
+            LoadTopView();
+
+            var btnAddIcon = new Button()
+            {
+                X = Application.GetRealWidth(352-100),
+                Y = Application.GetRealHeight(29),
+                Width = Application.GetMinRealAverage(100),
+                Height = Application.GetMinRealAverage(28),
+                TextID = StringId.WithdrawalConsent,
+                TextAlignment = TextAlignment.CenterRight,
+                TextColor = CSS_Color.MainColor,
+                TextSize = CSS_FontSize.TextFontSize,
+            };
+            contentView.AddChidren(btnAddIcon);
+
+            btnAddIcon.MouseUpEventHandler += (sender, e) =>
+            {
+                withdrawalConsentAction?.Invoke();
+            };
+        }
+
+        /// <summary>
         /// 鎴愬憳椤堕儴鏍�
         /// </summary>
-        public void LoadTopView_MemberTopView(Action callBack, Action action)
+        public void LoadTopView_MemberTopView(Action addAction, Action action)
         {
             LoadTopView();
             backAction = action;
@@ -376,7 +431,7 @@
                 Height = Application.GetMinRealAverage(28),
                 UnSelectedImagePath = "FunctionIcon/ArmCenter/HistoryIcon.png",
             };
-            contentView.AddChidren(btnAddIcon);
+            //contentView.AddChidren(btnAddIcon);
 
             btnAddIcon.MouseUpEventHandler += (sender, e) =>
             {

--
Gitblit v1.8.0