From 531f1380ec8478e109118cf96bc2c9f31e9278d1 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 六月 2021 09:27:23 +0800
Subject: [PATCH] 代码同步

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs |   62 ++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index 2b9b5f8..36b8206 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -147,6 +147,20 @@
         Button btnResetPasswordText;
         Button btnResetPasswordRight;
         #endregion
+
+
+        #region 涓汉閫夐」-鏂板浣忓畢
+        /// <summary>
+        /// 涓汉閫夐」-鏂板浣忓畢鍖哄煙
+        /// </summary>
+        FrameLayout addResidenceView;
+        /// <summary>
+        /// 鏂板浣忓畢鎻愮ず鏂囨湰
+        /// </summary>
+        Button btnAddResidenceText;
+        Button btnAddResidenceScan;
+        #endregion
+
         #endregion
 
         #endregion
@@ -232,8 +246,7 @@
             /// </summary>
             optionListView = new VerticalScrolViewLayout()
             {
-                //Y = headPortraitView.Bottom + Application.GetRealHeight(8),
-                Height = Application.GetRealHeight(51 * 5),
+                Height = Application.GetRealHeight(51 * 6),
                 BackgroundColor = CSS_Color.MainBackgroundColor,
                 ScrollEnabled = false,
             };
@@ -465,7 +478,6 @@
                 UnSelectedImagePath = "Public/Right.png",
             };
             thirdPartyAuthorizationView.AddChidren(btnThirdPartyAuthorizationRight);
-            //optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
             #endregion
             #region 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙
             /// <summary>
@@ -498,8 +510,46 @@
                 UnSelectedImagePath = "Public/Right.png",
             };
             resetPasswordView.AddChidren(btnResetPasswordRight);
-            //optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
+            optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
             #endregion
+
+            #region 涓汉閫夐」-娣诲姞浣忓畢
+            addResidenceView = new FrameLayout()
+            {
+                Height = Application.GetRealHeight(50),
+            };
+            optionListView.AddChidren(addResidenceView);
+            btnAddResidenceScan = new Button()
+            {
+                X = Application.GetRealWidth(319),
+                Gravity = Gravity.CenterVertical,
+                Width = Application.GetMinRealAverage(30),
+                Height = Application.GetMinRealAverage(30),
+                UnSelectedImagePath = "Public/ScanGrey.png",
+            };
+            addResidenceView.AddChidren(btnAddResidenceScan);
+            btnAddResidenceText = new Button()
+            {
+                X = Application.GetRealWidth(16),
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextID = StringId.AddResidence,
+            };
+            addResidenceView.AddChidren(btnAddResidenceText);
+
+            btnAddResidenceText.MouseUpEventHandler = (sender, e) =>
+            {
+                Scan.OpenScan((scanString) =>
+                {
+                    //鎵ц缁戝畾浣忓畢
+                    new BindingResidencePage().DoBindResidence(scanString);
+                });
+            };
+
+            #endregion
+
+
             #endregion
 
             #region 瑙i攣璁剧疆鍖哄煙
@@ -514,7 +564,7 @@
             interpretationSettingsView = new FrameLayout()
             {
                 BackgroundColor = CSS_Color.MainBackgroundColor,
-                Height = Application.GetRealHeight(66),
+                Height = Application.GetRealHeight(70),
             };
             bodyScrolView.AddChidren(interpretationSettingsView);
             if(Language.CurrentLanguage != "Chinese")
@@ -538,7 +588,7 @@
                 X = Application.GetRealWidth(16),
                 Y = btnInterpretationSettingsTitle.Bottom,
                 Height = Application.GetRealHeight(32),
-                Width = Application.GetRealWidth(290),
+                Width = Application.GetRealWidth(310),
                 TextAlignment = TextAlignment.TopLeft,
                 TextColor = CSS_Color.PromptingColor1,
                 TextSize = CSS_FontSize.TextFontSize,

--
Gitblit v1.8.0