From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 09:01:53 +0800
Subject: [PATCH] 更新
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 287 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 205 insertions(+), 82 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index fa1c927..2e19364 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -1,6 +1,7 @@
锘縰sing Shared;
using HDL_ON.UI.CSS;
using HDL_ON.Entity;
+using HDL_ON.DriverLayer;
namespace HDL_ON.UI
{
@@ -84,10 +85,10 @@
/// 鍖哄煙鎴愬憳灏忓尯鍩熸枃鏈�
/// </summary>
Button btnResidenceMemberText;
- /// <summary>
- /// 鍖哄煙瀹夋斁灏忓尯鍩�
- /// </summary>
- FrameLayout residenceArmView;
+ ///// <summary>
+ ///// 鍖哄煙瀹夋斁灏忓尯鍩�
+ ///// </summary>
+ //FrameLayout residenceArmView;
/// <summary>
/// 鍖哄煙鎴愬畨鏀惧皬鍖哄煙鍥炬爣
/// </summary>
@@ -151,6 +152,10 @@
/// 鏅鸿兘闊崇鏂囨湰
/// </summary>
Button btnSmartSpeakerText;
+ /// <summary>
+ /// Siri鏂囨湰
+ /// </summary>
+ Button btnSiriText;
public PersonalCenterPage()
@@ -282,21 +287,21 @@
contentView.RemoveAll();
#region 浣忓畢淇℃伅鍖哄煙
- if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && DB_ResidenceData.Instance.GatewayType == 1)
- {
- residenceInfoView = new FrameLayout()
- {
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(213),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(12),
- BorderColor = 0x00FFFFFF,
- BorderWidth = 0,
- };
- contentView.AddChidren(residenceInfoView);
- }
- else
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && DB_ResidenceData.Instance.GatewayType == 1)
+ //{
+ // residenceInfoView = new FrameLayout()
+ // {
+ // Gravity = Gravity.CenterHorizontal,
+ // Width = Application.GetRealWidth(343),
+ // Height = Application.GetRealHeight(213),
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ // Radius = (uint)Application.GetRealHeight(12),
+ // BorderColor = 0x00FFFFFF,
+ // BorderWidth = 0,
+ // };
+ // contentView.AddChidren(residenceInfoView);
+ //}
+ //else
{
residenceInfoView = new FrameLayout()
{
@@ -444,34 +449,34 @@
if (DB_ResidenceData.Instance.GatewayType == 1)
{
#region ---瀹夋斁鍖哄煙
- residenceArmView = new FrameLayout()
- {
- X = residenceMemberView.Right,
- Y = Application.GetRealHeight(68),
- Width = Application.GetRealWidth(64 + 48),
- Height = Application.GetRealHeight(64),
- };
- residenceInfoView.AddChidren(residenceArmView);
- btnResidenceArmIcon = new Button
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(5),
- Width = Application.GetMinRealAverage(30),
- Height = Application.GetMinRealAverage(30),
- UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
- SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png",
- };
- residenceArmView.AddChidren(btnResidenceArmIcon);
- btnResidenceArmText = new Button()
- {
- Y = btnResidenceManageIcon.Bottom,
- Height = Application.GetRealHeight(29),
- TextID = StringId.Undefense,
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel
- };
- residenceArmView.AddChidren(btnResidenceArmText);
+ //residenceArmView = new FrameLayout()
+ //{
+ // X = residenceMemberView.Right,
+ // Y = Application.GetRealHeight(68),
+ // Width = Application.GetRealWidth(64 + 48),
+ // Height = Application.GetRealHeight(64),
+ //};
+ //residenceInfoView.AddChidren(residenceArmView);
+ //btnResidenceArmIcon = new Button
+ //{
+ // Gravity = Gravity.CenterHorizontal,
+ // Y = Application.GetRealHeight(5),
+ // Width = Application.GetMinRealAverage(30),
+ // Height = Application.GetMinRealAverage(30),
+ // UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
+ // SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png",
+ //};
+ //residenceArmView.AddChidren(btnResidenceArmIcon);
+ //btnResidenceArmText = new Button()
+ //{
+ // Y = btnResidenceManageIcon.Bottom,
+ // Height = Application.GetRealHeight(29),
+ // TextID = StringId.Undefense,
+ // TextAlignment = TextAlignment.Center,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ //};
+ //residenceArmView.AddChidren(btnResidenceArmText);
#endregion
}
@@ -541,9 +546,9 @@
#region ---娣诲姞鍔熻兘鍖哄煙
residenceAddFunctionView = new FrameLayout()
{
- //X = residenceMemberView.Right,
- X = Application.GetRealWidth(28 - 24),
- Y = residenceManageView.Bottom,
+ X = residenceMemberView.Right,
+ //X = Application.GetRealWidth(28 - 24),
+ Y = Application.GetRealHeight(68),//residenceManageView.Bottom,
Width = Application.GetRealWidth(64 + 48),
Height = Application.GetRealWidth(64),
};
@@ -585,34 +590,34 @@
if (DB_ResidenceData.Instance.GatewayType == 1)
{
#region ---瀹夋斁鍖哄煙
- residenceArmView = new FrameLayout()
- {
- X = Application.GetRealWidth(28 - 24),
- Y = Application.GetRealHeight(68),
- Width = Application.GetRealWidth(64 + 48),
- Height = Application.GetRealWidth(64),
- };
- residenceInfoView.AddChidren(residenceArmView);
- btnResidenceArmIcon = new Button
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(5),
- Width = Application.GetMinRealAverage(30),
- Height = Application.GetMinRealAverage(30),
- UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
- SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png",
- };
- residenceArmView.AddChidren(btnResidenceArmIcon);
- btnResidenceArmText = new Button()
- {
- Y = btnResidenceArmIcon.Bottom,
- Height = Application.GetRealHeight(29),
- TextID = StringId.Undefense,
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel
- };
- residenceArmView.AddChidren(btnResidenceArmText);
+ //residenceArmView = new FrameLayout()
+ //{
+ // X = Application.GetRealWidth(28 - 24),
+ // Y = Application.GetRealHeight(68),
+ // Width = Application.GetRealWidth(64 + 48),
+ // Height = Application.GetRealWidth(64),
+ //};
+ //residenceInfoView.AddChidren(residenceArmView);
+ //btnResidenceArmIcon = new Button
+ //{
+ // Gravity = Gravity.CenterHorizontal,
+ // Y = Application.GetRealHeight(5),
+ // Width = Application.GetMinRealAverage(30),
+ // Height = Application.GetMinRealAverage(30),
+ // UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
+ // SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png",
+ //};
+ //residenceArmView.AddChidren(btnResidenceArmIcon);
+ //btnResidenceArmText = new Button()
+ //{
+ // Y = btnResidenceArmIcon.Bottom,
+ // Height = Application.GetRealHeight(29),
+ // TextID = StringId.Undefense,
+ // TextAlignment = TextAlignment.Center,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ //};
+ //residenceArmView.AddChidren(btnResidenceArmText);
#endregion
}
#region F3闃舵
@@ -772,7 +777,7 @@
#endregion
#endregion
- #region 鏅鸿兘闊崇銆佽幏鍙栨敮鎸併�佸叧浜嶰N+ 绛夎彍鍗曞垪琛�
+ #region 鏅鸿兘闊崇銆佽幏鍙栨敮鎸併�佸叧浜嶰n Pro 绛夎彍鍗曞垪琛�
contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
supportView = new VerticalScrolViewLayout()
@@ -790,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()
{
@@ -849,12 +855,129 @@
#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()
//{
// Height = Application.GetRealWidth(44),
+ // BackgroundColor = 0xFFFF0000,
//};
//supportView.AddChidren(supView);
+ //supView.MouseUpEventHandler = (sender, e) => {
+ // Dialog dialog = new Dialog();
+
+ // var bodyView = new FrameLayout();
+ // dialog.AddChidren(bodyView);
+
+ // var contentView = new VerticalScrolViewLayout()
+ // {
+ // Height = Application.GetRealHeight(600),
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ // };
+ // bodyView.AddChidren(contentView);
+
+ // var btnClose = new Button()
+ // {
+ // Y = Application.GetRealHeight(600),
+ // Height = Application.GetRealHeight(67),
+ // BackgroundColor = CSS_Color.WarningColor,
+ // Text = "鍏� 闂�",
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextSize = CSS_FontSize.SubheadingFontSize,
+ // };
+ // btnClose.MouseUpEventHandler = (sender, e) => {
+ // dialog.Close();
+ // };
+ // bodyView.AddChidren(btnClose);
+
+ // foreach (var msg in Control.Ins.MsgInfoList)
+ // {
+ // var et = new TextView()
+ // {
+ // IsMoreLines = true,
+ // Height = Application.GetRealHeight(150),
+ // Width = Application.GetRealWidth(300),
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.TextFontSize,
+ // Text = msg,
+ // };
+ // contentView.AddChidren(et);
+ // }
+
+ // dialog.Show();
+ //};
//Button btnSupportIcon = new Button()
//{
@@ -899,7 +1022,7 @@
//supView.AddChidren(btnSupportViewLine);
#endregion
- #region 鍏充簬ON+
+ #region 鍏充簬On Pro
FrameLayout aboutView = new FrameLayout()
{
Height = Application.GetRealWidth(44),
--
Gitblit v1.8.0