From efcffde735fa65ae34bae0bcc86313b74ed0e36c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 20 五月 2024 13:47:38 +0800
Subject: [PATCH] 优化离线数据

---
 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs |  283 ++++++++++++++++++++++----------------------------------
 1 files changed, 111 insertions(+), 172 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
index 5a069c5..b79d50f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
@@ -34,83 +34,87 @@
         public void LoadPage()
         {
             bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
-            new TopViewDiv(bodyView, Language.StringByID(StringId.AddMember)).LoadTopView();
+            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddMember));
+            topView.maginY = 10;
+            topView.LoadTopView();
 
+            var btnMemberName = new Button()
+            {
+                Y = Application.GetRealHeight(70+10),
+                X = Application.GetRealWidth(16),
+                Height = Application.GetRealHeight(32),
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.TextFontSize,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextID = StringId.MemberName,
+            };
+            bodyView.AddChidren(btnMemberName);
+
+            etMemberName = new EditText()
+            {
+                Y = btnMemberName.Bottom,
+                X = Application.GetRealWidth(16),
+                Width = Application.GetRealWidth(356),
+                Height = Application.GetRealHeight(40),
+                TextColor = CSS_Color.TextualColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextAlignment = TextAlignment.CenterLeft,
+                PlaceholderText = Language.StringByID(StringId.PleaseEnterContent),
+                PlaceholderTextColor = CSS_Color.PromptingColor2
+            };
+            bodyView.AddChidren(etMemberName);
+
+            var btnLine = new Button()
+            {
+                Y = etMemberName.Bottom,
+                Gravity = Gravity.CenterHorizontal,
+                Width = Application.GetRealWidth(343),
+                Height = Application.GetRealHeight(1),
+                BackgroundColor = CSS_Color.DividingLineColor,
+            };
+            bodyView.AddChidren(btnLine);
+
+
+            var btnTitle = new Button()
+            {
+                Y = btnLine.Bottom + Application.GetRealHeight(20),
+                X = Application.GetRealWidth(16),
+                Height = Application.GetRealHeight(32),
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.TextFontSize,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextID = StringId.MemberAccount,
+            };
+            bodyView.AddChidren(btnTitle);
+
+            etMemberAccount = new EditText()
+            {
+                Y = btnTitle.Bottom,
+                X = Application.GetRealWidth(16),
+                Width = Application.GetRealWidth(356),
+                Height = Application.GetRealHeight(40),
+                TextColor = CSS_Color.TextualColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextAlignment = TextAlignment.CenterLeft,
+                PlaceholderText = Language.StringByID(StringId.PleaseEnterContent),
+                PlaceholderTextColor = CSS_Color.PromptingColor2
+            };
+            bodyView.AddChidren(etMemberAccount);
+
+            var btnLine1 = new Button()
+            {
+                Y = etMemberAccount.Bottom,
+                Gravity = Gravity.CenterHorizontal,
+                Width = Application.GetRealWidth(343),
+                Height = Application.GetRealHeight(1),
+                BackgroundColor = CSS_Color.DividingLineColor,
+            };
+            bodyView.AddChidren(btnLine1);
+
+            int btnAddmemberY = 30;
             if (Entity.DB_ResidenceData.Instance.SupportFacePass)
             {
-                var btnMemberName = new Button()
-                {
-                    Y = Application.GetRealHeight(70),
-                    X = Application.GetRealWidth(16),
-                    Height = Application.GetRealHeight(32),
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.TextFontSize,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextID = StringId.MemberName,
-                };
-                bodyView.AddChidren(btnMemberName);
-
-                etMemberName = new EditText()
-                {
-                    Y = btnMemberName.Bottom,
-                    X = Application.GetRealWidth(16),
-                    Width = Application.GetRealWidth(356),
-                    Height = Application.GetRealHeight(40),
-                    TextColor = CSS_Color.TextualColor,
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    PlaceholderText = Language.StringByID(StringId.PleaseEnterContent),
-                    PlaceholderTextColor = CSS_Color.PromptingColor2
-                };
-                bodyView.AddChidren(etMemberName);
-
-                var btnLine = new Button()
-                {
-                    Y = etMemberName.Bottom,
-                    Gravity = Gravity.CenterHorizontal,
-                    Width = Application.GetRealWidth(343),
-                    Height = Application.GetRealHeight(1),
-                    BackgroundColor = CSS_Color.DividingLineColor,
-                };
-                bodyView.AddChidren(btnLine);
-
-
-                var btnTitle = new Button()
-                {
-                    Y = btnLine.Bottom + Application.GetRealHeight(20),
-                    X = Application.GetRealWidth(16),
-                    Height = Application.GetRealHeight(32),
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.TextFontSize,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextID = StringId.MemberAccount,
-                };
-                bodyView.AddChidren(btnTitle);
-
-                etMemberAccount = new EditText()
-                {
-                    Y = btnTitle.Bottom,
-                    X = Application.GetRealWidth(16),
-                    Width = Application.GetRealWidth(356),
-                    Height = Application.GetRealHeight(40),
-                    TextColor = CSS_Color.TextualColor,
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    PlaceholderText = Language.StringByID(StringId.PleaseEnterContent),
-                    PlaceholderTextColor = CSS_Color.PromptingColor2
-                };
-                bodyView.AddChidren(etMemberAccount);
-
-                var btnLine1 = new Button()
-                {
-                    Y = etMemberAccount.Bottom,
-                    Gravity = Gravity.CenterHorizontal,
-                    Width = Application.GetRealWidth(343),
-                    Height = Application.GetRealHeight(1),
-                    BackgroundColor = CSS_Color.DividingLineColor,
-                };
-                bodyView.AddChidren(btnLine1);
-
+                btnAddmemberY = 203;
                 #region 浜鸿劯绠$悊
                 var btnMemberFaceTitle = new Button()
                 {
@@ -190,7 +194,7 @@
                         TextAlignment = TextAlignment.CenterLeft,
                         TextColor = CSS_Color.TextualColor,
                         TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                        Text = "    涓轰繚鎶ゆ偍鐨勪釜浜洪殣绉佹潈鐩婏紝鐗瑰悜鎮ㄩ�氱煡骞剁敵璇锋槑纭悓鎰忔巿鏉冦�傝浣犱粩缁嗛槄璇�",
+                        TextID = StringId.FaceProTipText1,
                         IsMoreLines = true,
                     };
                     contentView.AddChidren(btnMsg);
@@ -204,9 +208,10 @@
                         TextAlignment = TextAlignment.CenterLeft,
                         TextColor = CSS_Color.MainColor,
                         TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                        Text = "    銆奜n Pro浜鸿劯淇℃伅閲囬泦鍗忚銆�",
+                        TextID = StringId.FaceProTipText2,
                         IsMoreLines = true,
                     };
+
                     contentView.AddChidren(btnMsg1);
 
                     Button btnMsg2 = new Button()
@@ -218,7 +223,7 @@
                         TextAlignment = TextAlignment.CenterLeft,
                         TextColor = CSS_Color.TextualColor,
                         TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                        Text = "    鑻ュ悓鎰忚鍗忚锛岃鐐瑰嚮銆愬悓鎰忋�戞寜閿紝琛ㄧず鎮ㄥ凡缁忕悊瑙e苟鍚屾剰浜鸿劯淇℃伅閲囬泦鍗忚銆�",
+                        TextID = StringId.FaceProTipText3,
                         IsMoreLines = true,
                     };
                     contentView.AddChidren(btnMsg2);
@@ -276,11 +281,12 @@
                         {
                             url = "https://developer.hdlcontrol.com/Face information collection protocol.html";
                         }
-                        new WebViewDialog().LoadPage("浜鸿劯淇℃伅閲囬泦鍗忚", url);
+                        new WebViewDialog().LoadPage(Language.StringByID(StringId.GetFaceProtocol), url);
 
                         dialog.Close();
                     };
-                    btnConfirm.MouseUpEventHandler = (sender2, e2) => {
+                    btnConfirm.MouseUpEventHandler = (sender2, e2) =>
+                    {
                         dialog.Close();
                         OnAppConfig.Instance.FaceManagementTip = true;
                         OnAppConfig.Instance.SaveConfig();
@@ -291,104 +297,37 @@
                 btnAddFace.MouseUpEventHandler = eFaceHandler;
                 #endregion
 
-
-                btnAddMember = new Button()
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Y = btnAddFace.Bottom + Application.GetRealHeight(30),
-                    Width = Application.GetRealWidth(220),
-                    Height = Application.GetRealWidth(44),
-                    Radius = (uint)Application.GetRealWidth(22),
-                    BorderWidth = 0,
-                    BorderColor = 0x00000000,
-                    BackgroundColor = CSS_Color.MainColor,
-                    TextColor = CSS_Color.MainBackgroundColor,
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    IsBold = true,
-                    TextAlignment = TextAlignment.Center,
-                    TextID = StringId.Confirm,
-                };
-                bodyView.AddChidren(btnAddMember);
-
-
-                btnScan = new Button()
-                {
-                    Y = btnTitle.Bottom,
-                    Width = Application.GetRealWidth(40),
-                    Height = Application.GetRealWidth(40),
-                    X = Application.GetRealWidth(310),
-                    UnSelectedImagePath = "Public/Scan.png"
-                };
-                bodyView.AddChidren(btnScan);
-
             }
-            else
+
+            btnAddMember = new Button()
             {
-                var btnTitle2 = new Button()
-                {
-                    Y = Application.GetRealHeight(70),
-                    X = Application.GetRealWidth(16),
-                    Height = Application.GetRealHeight(32),
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.TextFontSize,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextID = StringId.NewMemberAccount,
-                };
-                bodyView.AddChidren(btnTitle2);
+                Gravity = Gravity.CenterHorizontal,
+                Y = btnLine1.Bottom + Application.GetRealHeight(btnAddmemberY),
+                Width = Application.GetRealWidth(220),
+                Height = Application.GetRealWidth(44),
+                Radius = (uint)Application.GetRealWidth(22),
+                BorderWidth = 0,
+                BorderColor = 0x00000000,
+                BackgroundColor = CSS_Color.MainColor,
+                TextColor = CSS_Color.MainBackgroundColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                IsBold = true,
+                TextAlignment = TextAlignment.Center,
+                TextID = StringId.Confirm,
+            };
+            bodyView.AddChidren(btnAddMember);
 
-                etMemberAccount = new EditText()
-                {
-                    Y = btnTitle2.Bottom,
-                    X = Application.GetRealWidth(16),
-                    Width = Application.GetRealWidth(356),
-                    Height = Application.GetRealHeight(40),
-                    TextColor = CSS_Color.TextualColor,
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    PlaceholderText = Language.StringByID(StringId.PleaseEnterContent),
-                    PlaceholderTextColor = CSS_Color.PromptingColor2
-                };
-                bodyView.AddChidren(etMemberAccount);
 
-                var btnLine = new Button()
-                {
-                    Y = etMemberAccount.Bottom,
-                    Gravity = Gravity.CenterHorizontal,
-                    Width = Application.GetRealWidth(343),
-                    Height = Application.GetRealHeight(1),
-                    BackgroundColor = CSS_Color.DividingLineColor,
-                };
-                bodyView.AddChidren(btnLine);
+            btnScan = new Button()
+            {
+                Y = btnTitle.Bottom,
+                Width = Application.GetRealWidth(40),
+                Height = Application.GetRealWidth(40),
+                X = Application.GetRealWidth(310),
+                UnSelectedImagePath = "Public/Scan.png"
+            };
+            bodyView.AddChidren(btnScan);
 
-                btnAddMember = new Button()
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Y = Application.GetRealHeight(244),
-                    Width = Application.GetRealWidth(220),
-                    Height = Application.GetRealWidth(44),
-                    Radius = (uint)Application.GetRealWidth(22),
-                    BorderWidth = 0,
-                    BorderColor = 0x00000000,
-                    BackgroundColor = CSS_Color.MainColor,
-                    TextColor = CSS_Color.MainBackgroundColor,
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    IsBold = true,
-                    TextAlignment = TextAlignment.Center,
-                    TextID = StringId.Confirm,
-                };
-                bodyView.AddChidren(btnAddMember);
-
-                btnScan = new Button()
-                {
-                    Y = btnAddMember.Bottom,
-                    Height = Application.GetRealHeight(44),
-                    TextAlignment = TextAlignment.Center,
-                    TextColor = CSS_Color.MainColor,
-                    TextSize = CSS_FontSize.TextFontSize,
-                    TextID = StringId.ScanQRCoden,
-                };
-                bodyView.AddChidren(btnScan);
-            }
             LoadEventList();
         }
 

--
Gitblit v1.8.0