From cf3d4880046912f8b46c9e54769986a179faa26c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 08 四月 2021 18:01:13 +0800
Subject: [PATCH] 2021-04-08 1.更新音箱功能
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 100 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index df6caf4..17c99a0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -140,7 +140,7 @@
/// <summary>
/// 鑾峰彇鏀寔灏忓尯鍩�
/// </summary>
- FrameLayout supportView;
+ VerticalScrolViewLayout supportView;
/// <summary>
/// 鑾峰彇鏀寔鏂囨湰
/// </summary>
@@ -150,6 +150,10 @@
/// 鍏充簬On鏂囨湰
/// </summary>
Button btnAboutOnText;
+ /// <summary>
+ /// 鏅鸿兘闊崇鏂囨湰
+ /// </summary>
+ Button btnSmartSpeakerText;
#endregion
@@ -724,9 +728,11 @@
//softSettingView.AddChidren(btnGeneralSettingsRight);
#endregion
#endregion
- #region 鑾峰彇鏀寔
+
+ #region 鏅鸿兘闊崇銆佽幏鍙栨敮鎸併�佸叧浜嶰N+ 绛夎彍鍗曞垪琛�
contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
- supportView = new FrameLayout()
+
+ supportView = new VerticalScrolViewLayout()
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
@@ -735,18 +741,87 @@
Radius = (uint)Application.GetRealHeight(12),
BorderColor = 0x00FFFFFF,
BorderWidth = 0,
+ ScrollEnabled = false,
+ VerticalScrollBarEnabled = false,//闅愯棌婊氬姩鏉�
};
contentView.AddChidren(supportView);
+
+
+
+ #region 鏅鸿兘闊崇
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ //supportView 鍔犻珮 鏄剧ず3琛� 3*44
+ supportView.Height = Application.GetRealWidth(3*44);
+
+ FrameLayout smartSpeakerView = new FrameLayout()
+ {
+ Height = Application.GetRealWidth(44),
+ };
+ supportView.AddChidren(smartSpeakerView);
+
+ //浣忓畢涓哄綋鍓嶈处鍙锋墠鏄剧ず鏅鸿兘闊崇鍏ュ彛
+ Button btnSmartSpeakerIcon = new Button()
+ {
+ X = Application.GetRealWidth(12),
+ Y = Application.GetRealWidth(10),
+ Width = Application.GetMinRealAverage(24),
+ Height = Application.GetMinRealAverage(24),
+ UnSelectedImagePath = "PersonalCenter/SmartSpeaker.png",
+ };
+ smartSpeakerView.AddChidren(btnSmartSpeakerIcon);
+
+ btnSmartSpeakerText = new Button()
+ {
+ X = Application.GetRealWidth(48),
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealWidth(44),
+ TextID = StringId.SmartSpeaker,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.TextFontSize
+ };
+ smartSpeakerView.AddChidren(btnSmartSpeakerText);
+
+ Button btnSmartSpeakerRight = new Button()
+ {
+ X = Application.GetRealWidth(315),
+ Y = Application.GetRealWidth(14),
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ smartSpeakerView.AddChidren(btnSmartSpeakerRight);
+
+ var btnSmartSpeakerViewLine = new Button()
+ {
+ X = Application.GetRealWidth(48),
+ Y = Application.GetRealWidth(43),
+ Height = Application.GetRealHeight(1),
+ Width = Application.GetRealWidth(279),
+ BackgroundColor = CSS_Color.DividingLineColor
+ };
+ smartSpeakerView.AddChidren(btnSmartSpeakerViewLine);
+ }
+
+ #endregion
+
+ #region 鑾峰彇鏀寔
+ FrameLayout supView = new FrameLayout()
+ {
+ Height = Application.GetRealWidth(44),
+ };
+ supportView.AddChidren(supView);
Button btnSupportIcon = new Button()
{
X = Application.GetRealWidth(12),
- Y = Application.GetRealHeight(10),
+ Y = Application.GetRealWidth(10),
Width = Application.GetMinRealAverage(24),
Height = Application.GetMinRealAverage(24),
UnSelectedImagePath = "PersonalCenter/SupportIcon.png",
};
- supportView.AddChidren(btnSupportIcon);
+ supView.AddChidren(btnSupportIcon);
btnSupportText = new Button()
{
@@ -758,7 +833,8 @@
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.TextFontSize
};
- supportView.AddChidren(btnSupportText);
+ supView.AddChidren(btnSupportText);
+
Button btnSupportRight = new Button()
{
X = Application.GetRealWidth(315),
@@ -767,33 +843,39 @@
Height = Application.GetMinRealAverage(16),
UnSelectedImagePath = "Public/Right.png",
};
- supportView.AddChidren(btnSupportRight);
-
-
+ supView.AddChidren(btnSupportRight);
var btnSupportViewLine = new Button()
{
X = Application.GetRealWidth(48),
- Y = btnSupportText.Bottom,
+ Y = Application.GetRealWidth(43),
Height = Application.GetRealHeight(1),
+ Width = Application.GetRealWidth(279),
BackgroundColor = CSS_Color.DividingLineColor
};
- supportView.AddChidren(btnSupportViewLine);
+ supView.AddChidren(btnSupportViewLine);
+ #endregion
+
+ #region 鍏充簬ON+
+ FrameLayout aboutView = new FrameLayout()
+ {
+ Height = Application.GetRealWidth(44),
+ };
+ supportView.AddChidren(aboutView);
Button btnAboutOnIcon = new Button()
{
X = Application.GetRealWidth(12),
- Y = Application.GetRealWidth(54),
+ Y = Application.GetRealWidth(10),
Width = Application.GetMinRealAverage(24),
Height = Application.GetMinRealAverage(24),
UnSelectedImagePath = "PersonalCenter/InfoOnIcon.png",
};
- supportView.AddChidren(btnAboutOnIcon);
+ aboutView.AddChidren(btnAboutOnIcon);
btnAboutOnText = new Button()
{
X = Application.GetRealWidth(48),
- Y = btnSupportViewLine.Bottom,
Width = Application.GetRealWidth(370),
Height = Application.GetRealWidth(44),
TextID = StringId.AboutOn,
@@ -801,18 +883,18 @@
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.TextFontSize
};
- supportView.AddChidren(btnAboutOnText);
+ aboutView.AddChidren(btnAboutOnText);
Button btnAboutOnRight = new Button()
{
X = Application.GetRealWidth(315),
- Y = Application.GetRealWidth(58),
+ Y = Application.GetRealWidth(14),
Width = Application.GetMinRealAverage(16),
Height = Application.GetMinRealAverage(16),
UnSelectedImagePath = "Public/Right.png",
};
- supportView.AddChidren(btnAboutOnRight);
-
+ aboutView.AddChidren(btnAboutOnRight);
+ #endregion
#endregion
--
Gitblit v1.8.0