From 171bf03f3664226eeff2b20ee9bd2e914b63a17d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 13 三月 2020 09:18:50 +0800
Subject: [PATCH] 20200313

---
 HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
index 9fe1775..61768ae 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
@@ -38,18 +38,34 @@
 
         #region 鍖哄煙鍙橀噺
         Light light;
+        Button btnCollection_Out;
+        Button btnFunctionName_Out;
+        Button btnFromFloor_Out;
+        /// <summary>
+        /// 鍒锋柊鏄剧ず淇℃伅
+        /// </summary>
+        Action actionRefresh;
         #endregion
 
         public RelayPage(Light func)
         {
             bodyView = this;
             light = func;
-        }
 
-        public void LoadPage()
+        }
+        /// <summary>
+        /// 鍔犺浇鐣岄潰
+        /// </summary>
+        /// <param name="btnCollectionIcon">鏀惰棌鎸夐挳</param>
+        /// <param name="btnFunctionName">鍔熻兘鍚嶇О淇℃伅鎸夐挳</param>
+        /// <param name="btnFromFloor">鍔熻兘妤煎眰淇℃伅鎸夐挳</param>
+        public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
         {
+            btnCollection_Out = btnCollectionIcon;
+            btnFunctionName_Out = btnFunctionNameOut;
+            btnFromFloor_Out = btnFromFloorOut;
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-            new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.Lights), light);
+            //new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.Lights), light);
 
             controlView = new FrameLayout()
             {
@@ -103,10 +119,11 @@
             {
                 Gravity = Gravity.CenterHorizontal,
                 Y = Application.GetRealHeight(102),
-                Width = Application.GetRealWidth(168),
+                Width = Application.GetRealWidth(168-40),
                 Height = Application.GetRealHeight(288),
-                UnSelectedImagePath = "FunctionIcon/Light/RelayCloseIcon.png",
-                SelectedImagePath = "FunctionIcon/Light/RelayOpenIcon.png",
+                BackgroundColor = CSS_Color.PromptingColor2,
+                SelectedBackgroundColor= CSS_Color.AuxiliaryColor1,
+                Radius = (uint)Application.GetRealWidth(40),
                 IsSelected = light.state != 0
             };
             controlView.AddChidren(btnSwitchIcon);
@@ -125,6 +142,7 @@
 
             LoadEventList();
 
+            new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView(light, actionRefresh);
 
         }
     }

--
Gitblit v1.8.0