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 | 106 +++++++++++++++++++++++++++++------------------------
1 files changed, 58 insertions(+), 48 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
index c2723b7..6eb3d6b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
@@ -61,18 +61,18 @@
//Button btnSecurityBg;
- ///// <summary>
- ///// 璁剧疆闂ㄩ攣閫夐」鎻愮ず
- ///// </summary>
- //Button btnDoorlockSelectionTip;
- ///// <summary>
- ///// 璁剧疆闂ㄩ攣閫夐」閫変腑鍥炬爣
- ///// </summary>
- //Button btnDoorlockSelectionIcon;
- ///// <summary>
- ///// 璁剧疆闂ㄩ攣閫夐」鑳屾櫙
- ///// </summary>
- //Button btnDoorlockBg;
+ /// <summary>
+ /// 璁剧疆闂ㄩ攣閫夐」鎻愮ず
+ /// </summary>
+ Button btnDoorlockSelectionTip;
+ /// <summary>
+ /// 璁剧疆闂ㄩ攣閫夐」閫変腑鍥炬爣
+ /// </summary>
+ Button btnDoorlockSelectionIcon;
+ /// <summary>
+ /// 璁剧疆闂ㄩ攣閫夐」鑳屾櫙
+ /// </summary>
+ Button btnDoorlockBg;
#endregion
/// <summary>
@@ -186,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()
@@ -216,6 +221,11 @@
TextID = StringId.UnprotectedTipMsg,
};
topContentView.AddChidren(btnTipMsg);
+ if (Language.CurrentLanguage == "Engligh")
+ {
+ btnTip2.Height = Application.GetRealHeight(40);
+ topContentView.Height = Application.GetRealHeight(360);
+ }
LoadEventList();
@@ -359,46 +369,46 @@
#region Doorlock
- //optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });
+ optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });
- //FrameLayout doorlockDiv = new FrameLayout()
- //{
- // Width = Application.GetRealWidth(94),
- //};
- //optionView.AddChidren(doorlockDiv);
+ FrameLayout doorlockDiv = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(94),
+ };
+ optionView.AddChidren(doorlockDiv);
- //btnDoorlockBg = new Button()
- //{
- // Height = Application.GetRealWidth(174),
- // UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/4.png",
- // SelectedImagePath = "PersonalCenter/AppUnlockSetting/4On.png"
- //};
- //doorlockDiv.AddChidren(btnDoorlockBg);
+ btnDoorlockBg = new Button()
+ {
+ Height = Application.GetRealWidth(174),
+ UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/4.png",
+ SelectedImagePath = "PersonalCenter/AppUnlockSetting/4On.png"
+ };
+ doorlockDiv.AddChidren(btnDoorlockBg);
- //btnDoorlockSelectionIcon = 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",
- //};
- //doorlockDiv.AddChidren(btnDoorlockSelectionIcon);
+ btnDoorlockSelectionIcon = 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",
+ };
+ doorlockDiv.AddChidren(btnDoorlockSelectionIcon);
- //btnDoorlockSelectionTip = new Button()
- //{
- // X = Application.GetRealWidth(30),
- // Y = Application.GetRealWidth(174),
- // Width = Application.GetRealWidth(74),
- // Height = Application.GetRealWidth(30),
- // TextID = StringId.RemoteUnlocking,
- // TextAlignment = TextAlignment.CenterLeft,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // SelectedTextColor = CSS_Color.MainColor,
- // TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel
- //};
- //doorlockDiv.AddChidren(btnDoorlockSelectionTip);
+ btnDoorlockSelectionTip = new Button()
+ {
+ X = Application.GetRealWidth(30),
+ Y = Application.GetRealWidth(174),
+ Width = Application.GetRealWidth(74),
+ Height = Application.GetRealWidth(30),
+ TextID = StringId.RemoteUnlocking,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel
+ };
+ doorlockDiv.AddChidren(btnDoorlockSelectionTip);
#endregion
#endregion
--
Gitblit v1.8.0