From 3db5c3218f405795dc9a2d0f6afdde8ab8ac9e73 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 23 十一月 2021 09:11:30 +0800
Subject: [PATCH] Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 133 +++++++++++++++++++++++++++++--------------
1 files changed, 89 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 8ad95c4..fcc0b5e 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
{
@@ -138,10 +139,10 @@
/// 鑾峰彇鏀寔灏忓尯鍩�
/// </summary>
VerticalScrolViewLayout supportView;
- /// <summary>
- /// 鑾峰彇鏀寔鏂囨湰
- /// </summary>
- Button btnSupportText;
+ ///// <summary>
+ ///// 鑾峰彇鏀寔鏂囨湰
+ ///// </summary>
+ //Button btnSupportText;
/// <summary>
/// 鍏充簬On鏂囨湰
@@ -250,11 +251,11 @@
};
if(Language.CurrentLanguage =="Chinese")
{
- btnExit.Text = "閫�鍑轰綋楠屾ā寮�";
+ btnExit.Text = "閫�鍑�";
}
else
{
- btnExit.Text = "Exit dome";
+ btnExit.Text = "Exit";
}
btnExit.MouseUpEventHandler = (sender, e) =>
{
@@ -795,7 +796,7 @@
if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
//supportView 鍔犻珮 鏄剧ず3琛� 3*44
- supportView.Height = Application.GetRealWidth(3*44);
+ supportView.Height = Application.GetRealWidth(2*44);
FrameLayout smartSpeakerView = new FrameLayout()
{
@@ -853,50 +854,94 @@
FrameLayout supView = new FrameLayout()
{
Height = Application.GetRealWidth(44),
+ BackgroundColor = 0xFFFF0000,
};
supportView.AddChidren(supView);
+ supView.MouseUpEventHandler = (sender, e) => {
+ Dialog dialog = new Dialog();
- Button btnSupportIcon = new Button()
- {
- X = Application.GetRealWidth(12),
- Y = Application.GetRealWidth(10),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
- UnSelectedImagePath = "PersonalCenter/SupportIcon.png",
- };
- supView.AddChidren(btnSupportIcon);
+ var bodyView = new FrameLayout();
+ dialog.AddChidren(bodyView);
- btnSupportText = new Button()
- {
- X = Application.GetRealWidth(48),
- Width = Application.GetRealWidth(270),
- Height = Application.GetRealWidth(44),
- TextID = StringId.GetSupport,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = CSS_FontSize.TextFontSize
- };
- supView.AddChidren(btnSupportText);
+ var contentView = new VerticalScrolViewLayout()
+ {
+ Height = Application.GetRealHeight(600),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ bodyView.AddChidren(contentView);
- Button btnSupportRight = new Button()
- {
- X = Application.GetRealWidth(315),
- Y = Application.GetRealWidth(14),
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
- supView.AddChidren(btnSupportRight);
+ 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 = (sender1, e1) => {
+ dialog.Close();
+ };
+ bodyView.AddChidren(btnClose);
- var btnSupportViewLine = new Button()
- {
- X = Application.GetRealWidth(48),
- Y = Application.GetRealWidth(43),
- Height = Application.GetRealHeight(1),
- Width = Application.GetRealWidth(279),
- BackgroundColor = CSS_Color.DividingLineColor
+ 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();
};
- supView.AddChidren(btnSupportViewLine);
+
+ //Button btnSupportIcon = new Button()
+ //{
+ // X = Application.GetRealWidth(12),
+ // Y = Application.GetRealWidth(10),
+ // Width = Application.GetMinRealAverage(24),
+ // Height = Application.GetMinRealAverage(24),
+ // UnSelectedImagePath = "PersonalCenter/SupportIcon.png",
+ //};
+ //supView.AddChidren(btnSupportIcon);
+
+ //btnSupportText = new Button()
+ //{
+ // X = Application.GetRealWidth(48),
+ // Width = Application.GetRealWidth(270),
+ // Height = Application.GetRealWidth(44),
+ // TextID = StringId.GetSupport,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextSize = CSS_FontSize.TextFontSize
+ //};
+ //supView.AddChidren(btnSupportText);
+
+ //Button btnSupportRight = new Button()
+ //{
+ // X = Application.GetRealWidth(315),
+ // Y = Application.GetRealWidth(14),
+ // Width = Application.GetMinRealAverage(16),
+ // Height = Application.GetMinRealAverage(16),
+ // UnSelectedImagePath = "Public/Right.png",
+ //};
+ //supView.AddChidren(btnSupportRight);
+
+ //var btnSupportViewLine = new Button()
+ //{
+ // X = Application.GetRealWidth(48),
+ // Y = Application.GetRealWidth(43),
+ // Height = Application.GetRealHeight(1),
+ // Width = Application.GetRealWidth(279),
+ // BackgroundColor = CSS_Color.DividingLineColor
+ //};
+ //supView.AddChidren(btnSupportViewLine);
#endregion
#region 鍏充簬ON+
--
Gitblit v1.8.0