From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1

---
 HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs |   61 +++++++++++++++++-------------
 1 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
index ea908e1..dcc83fb 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
@@ -10,35 +10,32 @@
     /// </summary>
     public class ComplaintsPage : FrameLayout
     {
+        /// <summary>
+        /// 
+        /// </summary>
         FrameLayout bodyView;
 
         /// <summary>
-        /// 褰撳墠
+        /// 
         /// </summary>
-        VerticalScrolViewLayout bodyScrolView;
-
         public ComplaintsPage()
         {
             bodyView = this;
+            BackgroundColor = CSS_Color.MainBackgroundColor;
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
         public void LoadPage()
         {
             new TopViewDiv(bodyView, Language.StringByID(StringId.Complaints)).LoadTopView();
-
-            int bodyY = Application.GetRealHeight(64);
-            bodyScrolView = new VerticalScrolViewLayout()
-            {
-                Y = bodyY,
-                Height = bodyView.Height - bodyY,
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
 
             #region 鎶曡瘔鑱旂郴
             FrameLayout phoneRow = new FrameLayout()
             {
                 Y = Application.GetRealHeight(64),
-                Height = Application.GetRealHeight(50),
+                Height = Application.GetRealWidth(50),
             };
             bodyView.AddChidren(phoneRow);
 
@@ -52,11 +49,15 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
             };
             phoneRow.AddChidren(btnPhoneTitle);
+            if(Language.CurrentLanguage == "English")
+            {
+                btnPhoneTitle.Text = "Tel.:";
+            }
 
             Button btnPhoneText = new Button()
             {
                 X = btnPhoneTitle.Right,
-                Width = Application.GetRealWidth(200),
+                Width = Application.GetRealWidth(266),
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.TextFontSize,
                 TextColor = CSS_Color.FirstLevelTitleColor,
@@ -68,10 +69,10 @@
             /// </summary>
             var btnImage = new Button()
             {
-                X = Application.GetRealWidth(339),
+                X = Application.GetRealWidth(343),
                 Gravity = Gravity.CenterVertical,
-                Width = Application.GetMinRealAverage(16),
-                Height = Application.GetMinRealAverage(16),
+                Width = Application.GetRealWidth(16),
+                Height = Application.GetRealWidth(16),
                 UnSelectedImagePath = "Public/Right.png",
             };
             phoneRow.AddChidren(btnImage);
@@ -91,7 +92,7 @@
             FrameLayout emailRow = new FrameLayout()
             {
                 Y = phoneRow.Bottom,
-                Height = Application.GetRealHeight(54),
+                Height = Application.GetRealWidth(54),
             };
             bodyView.AddChidren(emailRow);
 
@@ -109,9 +110,9 @@
             Button btnEmailText = new Button()
             {
                 X = btnEmailTitle.Right,
-                Y = Application.GetRealHeight(8),
-                Height = Application.GetRealHeight(20),
-                Width = Application.GetRealWidth(200),
+                Y = Application.GetRealWidth(8),
+                Height = Application.GetRealWidth(20),
+                Width = Application.GetRealWidth(266),
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.TextFontSize,
                 TextColor = CSS_Color.FirstLevelTitleColor,
@@ -122,24 +123,32 @@
             Button btnEmailTipText = new Button()
             {
                 X = btnEmailTitle.Right,
-                Y = btnEmailText.Bottom + Application.GetRealHeight(4),
-                Height = Application.GetRealHeight(20),
-                Width = Application.GetRealWidth(200),
+                Y = btnEmailText.Bottom + Application.GetRealWidth(4),
+                Height = Application.GetRealWidth(20),
+                Width = Application.GetRealWidth(266),
                 TextAlignment = TextAlignment.TopLeft,
                 TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                 TextColor = CSS_Color.PromptingColor1,
                 TextID = StringId.WillGivePriorityToTheTreatmen,
             };
             emailRow.AddChidren(btnEmailTipText);
+
+            if (Language.CurrentLanguage == "English")
+            {
+                btnEmailTitle.Width = Application.GetRealWidth(80);
+                emailRow.Height = Application.GetRealWidth(65);
+                btnEmailTipText.IsMoreLines = true;
+            }
+
             /// <summary>
             /// 鍓嶈繘鍥炬爣
             /// </summary>
             var btnImage2 = new Button()
             {
-                X = Application.GetRealWidth(339),
+                X = Application.GetRealWidth(343),
                 Gravity = Gravity.CenterVertical,
-                Width = Application.GetMinRealAverage(16),
-                Height = Application.GetMinRealAverage(16),
+                Width = Application.GetRealWidth(16),
+                Height = Application.GetRealWidth(16),
                 UnSelectedImagePath = "Public/Right.png",
             };
             emailRow.AddChidren(btnImage2);

--
Gitblit v1.8.0