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/UnlockSetting/AppUnlockSettingsPage.cs |  112 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
index 5266860..6eb3d6b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
@@ -46,19 +46,19 @@
         /// </summary>
         Button btnStartupBg;
 
-
-        /// <summary>
-        /// 璁剧疆瀹夐槻閫夐」鎻愮ず
-        /// </summary>
-        Button btnSecuritySelectionTip;
-        /// <summary>
-        /// 璁剧疆瀹夐槻閫夐」閫変腑鍥炬爣
-        /// </summary>
-        Button btnSecuritySelectionIcon;
-        /// <summary>
-        /// 璁剧疆瀹夐槻閫夐」鑳屾櫙
-        /// </summary>
-        Button btnSecurityBg;
+        #region F3闃舵
+        ///// <summary>
+        ///// 璁剧疆瀹夐槻閫夐」鎻愮ず
+        ///// </summary>
+        //Button btnSecuritySelectionTip;
+        ///// <summary>
+        ///// 璁剧疆瀹夐槻閫夐」閫変腑鍥炬爣
+        ///// </summary>
+        //Button btnSecuritySelectionIcon;
+        ///// <summary>
+        ///// 璁剧疆瀹夐槻閫夐」鑳屾櫙
+        ///// </summary>
+        //Button btnSecurityBg;
 
 
         /// <summary>
@@ -73,6 +73,7 @@
         /// 璁剧疆闂ㄩ攣閫夐」鑳屾櫙
         /// </summary>
         Button btnDoorlockBg;
+        #endregion
 
         /// <summary>
         /// 瀵嗙爜浣跨敤閫夋嫨鐨勮缁嗗唴瀹规彁绀�
@@ -185,8 +186,13 @@
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                 BackgroundColor = CSS_Color.MainBackgroundColor,
                 TextID = StringId.MultipleChoicesOfPagesYouNeedToProtect,
+                IsMoreLines = true,
             };
             topContentView.AddChidren(btnTip2);
+            if(Language.CurrentLanguage == "Engligh")
+            {
+                btnTip2.Height = Application.GetRealHeight(30);
+            }
 
 
             optionView = new HorizontalScrolViewLayout()
@@ -215,6 +221,11 @@
                 TextID = StringId.UnprotectedTipMsg,
             };
             topContentView.AddChidren(btnTipMsg);
+            if (Language.CurrentLanguage == "Engligh")
+            {
+                btnTip2.Height = Application.GetRealHeight(40);
+                topContentView.Height = Application.GetRealHeight(360);
+            }
 
             LoadEventList();
 
@@ -312,48 +323,48 @@
             startupDiv.AddChidren(btnStartupSelectionTip);
             #endregion
 
-
+            #region F3闃舵
             #region Security
-            optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });
+            //optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });
 
-            FrameLayout securityDiv = new FrameLayout()
-            {
-                Width = Application.GetRealWidth(94),
-            };
-            optionView.AddChidren(securityDiv);
+            //FrameLayout securityDiv = new FrameLayout()
+            //{
+            //    Width = Application.GetRealWidth(94),
+            //};
+            //optionView.AddChidren(securityDiv);
 
-            btnSecurityBg = new Button()
-            {
-                Height = Application.GetRealWidth(174),
-                UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/3.png",
-                SelectedImagePath = "PersonalCenter/AppUnlockSetting/3On.png"
-            };
-            securityDiv.AddChidren(btnSecurityBg);
+            //btnSecurityBg = new Button()
+            //{
+            //    Height = Application.GetRealWidth(174),
+            //    UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/3.png",
+            //    SelectedImagePath = "PersonalCenter/AppUnlockSetting/3On.png"
+            //};
+            //securityDiv.AddChidren(btnSecurityBg);
 
-            btnSecuritySelectionIcon = new Button()
-            {
-                X = Application.GetRealWidth(5),
-                Y = Application.GetRealWidth(174),
-                Width = Application.GetRealWidth(30),
-                Height = Application.GetRealWidth(30),
-                UnSelectedImagePath = "Public/ChooseIcon.png",
-                SelectedImagePath = "Public/ChooseOnIcon.png",
-            };
-            securityDiv.AddChidren(btnSecuritySelectionIcon);
+            //btnSecuritySelectionIcon = new Button()
+            //{
+            //    X = Application.GetRealWidth(5),
+            //    Y = Application.GetRealWidth(174),
+            //    Width = Application.GetRealWidth(30),
+            //    Height = Application.GetRealWidth(30),
+            //    UnSelectedImagePath = "Public/ChooseIcon.png",
+            //    SelectedImagePath = "Public/ChooseOnIcon.png",
+            //};
+            //securityDiv.AddChidren(btnSecuritySelectionIcon);
 
-            btnSecuritySelectionTip = new Button()
-            {
-                X = Application.GetRealWidth(30),
-                Y = Application.GetRealWidth(174),
-                Width = Application.GetRealWidth(74),
-                Height = Application.GetRealWidth(30),
-                TextID = StringId.DefenseAndUndefense,
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                SelectedTextColor = CSS_Color.MainColor,
-                TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel
-            };
-            securityDiv.AddChidren(btnSecuritySelectionTip);
+            //btnSecuritySelectionTip = new Button()
+            //{
+            //    X = Application.GetRealWidth(30),
+            //    Y = Application.GetRealWidth(174),
+            //    Width = Application.GetRealWidth(74),
+            //    Height = Application.GetRealWidth(30),
+            //    TextID = StringId.DefenseAndUndefense,
+            //    TextAlignment = TextAlignment.CenterLeft,
+            //    TextColor = CSS_Color.FirstLevelTitleColor,
+            //    SelectedTextColor = CSS_Color.MainColor,
+            //    TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel
+            //};
+            //securityDiv.AddChidren(btnSecuritySelectionTip);
             #endregion
 
 
@@ -399,6 +410,7 @@
             };
             doorlockDiv.AddChidren(btnDoorlockSelectionTip);
             #endregion
+            #endregion
 
             optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });
         }

--
Gitblit v1.8.0