From 06696e6f225733a60b03eea4a7c6374053d92c1d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 14 四月 2020 14:15:35 +0800
Subject: [PATCH] 20200414

---
 HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/ResidentialManagePage.cs |   47 +++++++++++++++++++++++++++++++++++------------
 1 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/ResidentialManagePage.cs
index 3994c21..cff04e5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/ResidentialManagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/ResidentialManagePage.cs
@@ -1,4 +1,5 @@
 锘縰sing System;
+using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
 using Shared;
 
@@ -8,9 +9,24 @@
     {
         #region 鍖哄煙鎺т欢鍒楄〃
         FrameLayout bodyView;
-        #endregion
 
-        #region 鍖哄煙鍙橀噺
+        /// <summary>
+        /// 浣忓畢鍚嶇О鏄剧ず鎸夐挳
+        /// </summary>
+        Button btnResidenceName;
+        /// <summary>
+        /// 浣忓畢鍚嶇О缂栬緫鎸夐挳
+        /// </summary>
+        Button btnEditResidenceNameIcon;
+        /// <summary>
+        /// 浣忓畢鍦板潃缂栬緫鎸夐挳
+        /// </summary>
+        Button btnLocationAddressIcon;
+        /// <summary>
+        /// 浣忓畢鍦板潃
+        /// </summary>
+        Button btnResidenceAddress;
+
         /// <summary>
         /// 妤煎眰绠＄悊Row
         /// </summary>
@@ -20,6 +36,10 @@
         /// </summary>
         Button btnFloorManagementSkinIcon;
         /// <summary>
+        /// 妤煎眰鍚嶇О鏄剧ず鎸夐挳
+        /// </summary>
+        Button btnFloorManagementTitle;
+        /// <summary>
         /// 鎴块棿绠＄悊Row
         /// </summary>
         FrameLayout roomManagementRow;
@@ -27,6 +47,10 @@
         /// 鎴块棿绠＄悊璺宠浆鎸夐挳
         /// </summary>
         Button btnRoomManagementSkinIcon;
+        /// <summary>
+        /// 鎴块棿鍚嶇О
+        /// </summary>
+        Button btnRoomManagementTitle;
         #endregion
 
         public ResidentialManagePage()
@@ -39,7 +63,8 @@
 
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
 
-            new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.ResidenceManage));
+            new TopViewDiv(bodyView, Language.StringByID(StringId.ResidenceManage)).LoadTopView();
+            //new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.ResidenceManage));
 
             #region 浣忓畢鍚嶇О
             FrameLayout residenceNameRow;
@@ -60,18 +85,17 @@
             };
             residenceNameRow.AddChidren(btnResidenceNameTitle);
 
-            Button btnResidenceName = new Button()
+            btnResidenceName = new Button()
             {
                 X = Application.GetRealWidth(2)+ btnResidenceNameTitle.Right,
                 Width = Application.GetRealWidth(200),
-                Text = UserConfig.Instance.CurrentRegion.Name,
+                Text = DB_ResidenceData.residenceData.residecenInfo.Name,
                 TextSize = CSS_FontSize.TextFontSize,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.TextualColor,
             };
             residenceNameRow.AddChidren(btnResidenceName);
 
-            Button btnEditResidenceNameIcon;
             btnEditResidenceNameIcon = new Button()
             {
                 X = Application.GetRealWidth(333),
@@ -83,7 +107,8 @@
             residenceNameRow.AddChidren(btnEditResidenceNameIcon);
 
             residenceNameRow.AddChidren(
-                new Button() {
+                new Button()
+                {
                     Gravity = Gravity.CenterHorizontal,
                     Y = Application.GetRealHeight(49),
                     Height = Application.GetRealHeight(1),
@@ -112,7 +137,6 @@
             };
             residenceAddressRow.AddChidren(btnResidenceAddressTitle);
 
-            Button btnLocationAddressIcon;
             btnLocationAddressIcon = new Button()
             {
                 X = Application.GetRealWidth(333),
@@ -123,12 +147,11 @@
             };
             residenceAddressRow.AddChidren(btnLocationAddressIcon);
 
-            Button btnResidenceAddress;
             btnResidenceAddress = new Button()
             {
                 X = Application.GetRealWidth(2) + btnResidenceNameTitle.Right,
                 Width = Application.GetRealWidth(200),
-                Text = UserConfig.Instance.CurrentRegion.Name,
+                Text = DB_ResidenceData.residenceData.residecenInfo.Address,
                 TextSize = CSS_FontSize.TextFontSize,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.TextualColor,
@@ -145,7 +168,7 @@
             };
             bodyView.AddChidren(floorManagementRow);
 
-            Button btnFloorManagementTitle = new Button()
+            btnFloorManagementTitle = new Button()
             {
                 X = Application.GetRealWidth(16),
                 Width = Application.GetRealWidth(308),
@@ -186,7 +209,7 @@
             };
             bodyView.AddChidren(roomManagementRow);
 
-            var btnRoomManagementTitle = new Button()
+            btnRoomManagementTitle = new Button()
             {
                 X = Application.GetRealWidth(16),
                 Width = Application.GetRealWidth(300),

--
Gitblit v1.8.0