From e75ccccb370b47305c6eadb321efb27c86cdd28b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 十一月 2021 09:57:24 +0800
Subject: [PATCH] 合并
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 82 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index b333fe4..95475ac 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -152,6 +152,10 @@
/// 鏅鸿兘闊崇鏂囨湰
/// </summary>
Button btnSmartSpeakerText;
+ /// <summary>
+ /// Siri鏂囨湰
+ /// </summary>
+ Button btnSiriText;
public PersonalCenterPage()
@@ -791,12 +795,13 @@
contentView.AddChidren(supportView);
-
+ int supportViewCellCount = 1;
#region 鏅鸿兘闊崇
if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
+ supportViewCellCount++;
//supportView 鍔犻珮 鏄剧ず3琛� 3*44
- supportView.Height = Application.GetRealWidth(2*44);
+ supportView.Height = Application.GetRealWidth(supportViewCellCount * 44);
FrameLayout smartSpeakerView = new FrameLayout()
{
@@ -850,6 +855,79 @@
#endregion
+ #region Siri
+ #if __IOS__
+ //if (Application.PhoneType >= 12)
+ {
+ supportViewCellCount++;
+ //supportView 鍔犻珮 鏄剧ず3琛� 3*44
+ supportView.Height = Application.GetRealWidth(supportViewCellCount * 44);
+
+ FrameLayout siriView = new FrameLayout()
+ {
+ Height = Application.GetRealWidth(44),
+ };
+ supportView.AddChidren(siriView);
+
+ //浣忓畢涓哄綋鍓嶈处鍙锋墠鏄剧ず鏅鸿兘闊崇鍏ュ彛
+ Button btnSiriIcon = new Button()
+ {
+ X = Application.GetRealWidth(12),
+ Y = Application.GetRealWidth(10),
+ Width = Application.GetMinRealAverage(24),
+ Height = Application.GetMinRealAverage(24),
+ UnSelectedImagePath = "PersonalCenter/SiriIcon.png",
+ };
+ siriView.AddChidren(btnSiriIcon);
+
+ btnSiriText = new Button()
+ {
+ X = Application.GetRealWidth(48),
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealWidth(44),
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.TextFontSize
+ };
+ if(Language.CurrentLanguage == "Chinese")
+ {
+ btnSiriText.Text = "Siri蹇嵎鏂瑰紡";
+ }else
+ {
+ btnSiriText.Text = "Siri Shortcut";
+ }
+
+ siriView.AddChidren(btnSiriText);
+
+
+ btnSiriText.MouseUpEventHandler = (sender, e) => {
+ var ddd =new Other.SkipControl();
+ ddd.SkipSiriView();
+ };
+
+ Button btnSiriRight = new Button()
+ {
+ X = Application.GetRealWidth(315),
+ Y = Application.GetRealWidth(14),
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ siriView.AddChidren(btnSiriRight);
+
+ var btnSmartSpeakerViewLine = new Button()
+ {
+ X = Application.GetRealWidth(48),
+ Y = Application.GetRealWidth(43),
+ Height = Application.GetRealHeight(1),
+ Width = Application.GetRealWidth(279),
+ BackgroundColor = CSS_Color.DividingLineColor
+ };
+ siriView.AddChidren(btnSmartSpeakerViewLine);
+ }
+ #endif
+ #endregion
+
#region 鑾峰彇鏀寔
//FrameLayout supView = new FrameLayout()
//{
--
Gitblit v1.8.0