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/FunctionBaseInfoSetPage.cs |   59 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index af59d9a..6c3064a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -9,18 +9,38 @@
     {
         #region 鎺т欢鍒楄〃
         FrameLayout bodyView;
-
+        /// <summary>
+        /// 鍔熻兘鍚嶇О鏄剧ず鎸夐挳
+        /// </summary>
+        Button btnFunctionName;
+        /// <summary>
+        /// 鍔熻兘鍚嶇О缂栬緫鎸夐挳
+        /// </summary>
+        Button btnEditName;
+        /// <summary>
+        /// 浣嶇疆淇℃伅鏄剧ず鎸夐挳
+        /// </summary>
+        Button btnLocationValues;
+        /// <summary>
+        /// 浣嶇疆淇℃伅璺宠浆缂栬緫鎸夐挳
+        /// </summary>
+        Button btnLocationInfoRight;
 
         #endregion
 
         #region 灞�閮ㄥ彉閲�
         Function function;
+        /// <summary>
+        /// 鍚庨��鏃讹紝鍒锋柊涔嬪墠鐣岄潰鐨勬樉绀轰俊鎭�
+        /// </summary>
+        Action actionRefresh;
         #endregion
 
-        public FunctionBaseInfoSetPage(Function func)
+        public FunctionBaseInfoSetPage(Function func,Action action)
         {
             bodyView = this;
             function = func;
+            actionRefresh = action;
         }
         /// <summary>
         /// 鍔犺浇鐣岄潰
@@ -28,7 +48,7 @@
         public void LoadPage()
         {
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-            new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.Setting));
+            new TopViewDiv(bodyView, Language.StringByID(StringId.Setting)).LoadTopView(actionRefresh);
 
             #region name view
             var nameView = new FrameLayout()
@@ -50,7 +70,7 @@
             };
             nameView.AddChidren(btnNameText);
 
-            var btnNameValues = new Button()
+            btnFunctionName = new Button()
             {
                 X = Application.GetRealWidth(186),
                 Width = Application.GetRealWidth(137),
@@ -59,9 +79,9 @@
                 TextSize = CSS_FontSize.TextFontSize,
                 Text = function.name,
             };
-            nameView.AddChidren(btnNameValues);
+            nameView.AddChidren(btnFunctionName);
 
-            var btnEditName = new Button()
+            btnEditName = new Button()
             {
                 X = Application.GetRealWidth(333),
                 Gravity = Gravity.CenterVertical,
@@ -81,17 +101,6 @@
                     Height = Application.GetRealHeight(1)
                 });
 
-            btnEditName.MouseUpEventHandler += (sender, e) => {
-                //鍒涘缓鍥炶皟浜嬩欢
-                Action<string> callBackAction = (name) =>
-                {
-                    function.name = name;
-                    DB_ResidenceData.residenceData.SaveResidenceData();
-                };
-                new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, function.name, callBackAction);
-            };
-
-
             #endregion
 
             #region 浣嶇疆绠$悊
@@ -103,7 +112,7 @@
             };
             bodyView.AddChidren(locationMagtView);
 
-            var btnLocationMagtText = new Button()
+            var btnLocationMagtTitle = new Button()
             {
                 X = Application.GetRealWidth(16),
                 Width = Application.GetRealWidth(160),
@@ -112,9 +121,9 @@
                 TextSize = CSS_FontSize.SubheadingFontSize,
                 TextID = StringId.LocationManagement,
             };
-            locationMagtView.AddChidren(btnLocationMagtText);
+            locationMagtView.AddChidren(btnLocationMagtTitle);
 
-            var btnLocationValues = new Button()
+            btnLocationValues = new Button()
             {
                 X = Application.GetRealWidth(186),
                 Width = Application.GetRealWidth(137),
@@ -125,7 +134,7 @@
             };
             locationMagtView.AddChidren(btnLocationValues);
 
-            var btnLocationMagtRight = new Button()
+            btnLocationInfoRight = new Button()
             {
                 X = Application.GetRealWidth(339),
                 Gravity = Gravity.CenterVertical,
@@ -133,7 +142,7 @@
                 Height = Application.GetMinRealAverage(16),
                 UnSelectedImagePath = "Public/RightIcon.png",
             };
-            locationMagtView.AddChidren(btnLocationMagtRight);
+            locationMagtView.AddChidren(btnLocationInfoRight);
 
             locationMagtView.AddChidren(
                 new Button()
@@ -144,10 +153,6 @@
                     Width = Application.GetRealWidth(343),
                     Height = Application.GetRealHeight(1)
                 });
-            btnLocationMagtRight.MouseUpEventHandler += (sender, e) =>
-            {
-                SkipChooseRoomPage();
-            };
             #endregion
 
             #region 鍏变韩
@@ -224,7 +229,7 @@
 
             #endregion
 
-
+            LoadEventList();
         }
 
 

--
Gitblit v1.8.0