From a2927467ebfa938a420f392deb6882b35570fd33 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 十二月 2020 16:48:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index a9eb697..e29a96a 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -34,15 +34,15 @@
/// <summary>
/// 褰撳墠娓╁害淇℃伅
/// </summary>
- Button btnTempValues;
+ TextButton btnTempValues;
/// <summary>
/// 褰撳墠婀垮害淇℃伅
/// </summary>
- Button btnHumidityValues;
+ TextButton btnHumidityValues;
/// <summary>
/// 褰撳墠pm2.5鐘舵��
/// </summary>
- Button btnPm25Values;
+ TextButton btnPm25Values;
/// <summary>
/// 鍒囨崲鏄剧ず鍔熻兘绫诲瀷鍖哄煙
/// </summary>
@@ -78,6 +78,13 @@
/// 褰撳墠鏄剧ず瀵规帶鍒剁被鍨嬫槸鍚︽槸璁惧鍔熻兘鎺у埗
/// </summary>
bool CurShowTypeIsFunction = true;
+ #endregion
+
+ #region 鎶ヨ淇℃伅
+ Button btnMsgBg;
+ Button btnMsgTime;
+ Button btnMsg;
+ Button btnMsgIcon;
#endregion
public HomePage()
@@ -158,7 +165,7 @@
};
environmentalView.AddChidren(btnTempIcon);
- btnTempValues = new Button()
+ btnTempValues = new TextButton()
{
X = btnTempIcon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(30),
@@ -180,7 +187,7 @@
};
environmentalView.AddChidren(btnHumidityIcon);
- btnHumidityValues = new Button()
+ btnHumidityValues = new TextButton()
{
X = btnHumidityIcon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(30),
@@ -202,7 +209,7 @@
};
environmentalView.AddChidren(btnPm25Icon);
- btnPm25Values = new Button()
+ btnPm25Values = new TextButton()
{
X = btnPm25Icon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(130),
@@ -226,14 +233,14 @@
};
topView.AddChidren(msgView);
- var btngb = new Button()
+ btnMsgBg = new Button()
{
BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,
Alpha = 0.4f,
};
- msgView.AddChidren(btngb);
+ msgView.AddChidren(btnMsgBg);
- Button btnMsgIcon;
+
btnMsgIcon = new Button()
{
X = Application.GetRealWidth(12),
@@ -245,7 +252,7 @@
};
msgView.AddChidren(btnMsgIcon);
- Button btnMsg;
+
btnMsg = new Button()
{
X = Application.GetRealWidth(10) + btnMsgIcon.Right,
@@ -257,7 +264,7 @@
};
msgView.AddChidren(btnMsg);
- Button btnMsgTime;
+
btnMsgTime = new Button()
{
X = Application.GetRealWidth(299),
@@ -267,6 +274,9 @@
TextAlignment = TextAlignment.CenterLeft,
};
msgView.AddChidren(btnMsgTime);
+
+ LoadEvent_GotoMessageCenterPage();
+
#endregion
#endregion
--
Gitblit v1.8.0