From 77e7b5223dd04a6e036dc952efb38f2b770a6828 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 六月 2020 13:50:43 +0800
Subject: [PATCH] 2020--6-9
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 90 ++++++++++++++++++++++++++++----------------
1 files changed, 57 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 688c27e..f4268e7 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -107,8 +107,8 @@
Y = Application.GetRealHeight(32),
Width = Application.GetRealWidth(200),
Height = Application.GetRealHeight(33),
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.EmphasisFontSize_FirstLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
Text = DB_ResidenceData.residenceData.residecenInfo.Name,
IsBold = true
@@ -122,7 +122,6 @@
async () => { await DAL.Net.MqttCommon.StartMqtt();
});
};
-
#endif
@@ -148,8 +147,8 @@
X = btnTempIcon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(30),
Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
Text = MainPage.cityInfo.temperature,
TextAlignment = TextAlignment.CenterLeft,
};
@@ -170,8 +169,8 @@
X = btnHumidityIcon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(30),
Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
Text = MainPage.cityInfo.humidity,
TextAlignment = TextAlignment.CenterLeft,
};
@@ -192,8 +191,8 @@
X = btnPm25Icon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(30),
Gravity = Gravity.CenterVertical,
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
Text = MainPage.cityInfo.pm25,
TextAlignment = TextAlignment.CenterLeft,
};
@@ -213,7 +212,7 @@
var btngb = new Button()
{
- BackgroundColor = CSS.CSS_Color.MainColor,//0x3F4484F4,//
+ BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,//
Alpha = 0.4f,
};
msgView.AddChidren(btngb);
@@ -236,8 +235,8 @@
X = Application.GetRealWidth(10) + btnMsgIcon.Right,
Width = Application.GetRealWidth(240),
Text = "鏃�",
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
};
msgView.AddChidren(btnMsg);
@@ -248,7 +247,7 @@
X = Application.GetRealWidth(299),
Width = Application.GetRealWidth(44),
Text = "00:00",
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
};
msgView.AddChidren(btnMsgTime);
@@ -271,9 +270,9 @@
{
Width = Application.GetRealWidth(114),
TextID = StringId.Functions,
- SelectedTextColor = CSS.CSS_Color.MainColor,
- TextColor = CSS.CSS_Color.PromptingColor1,
- TextSize = CSS.CSS_FontSize.HeadlineFontSize,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.HeadlineFontSize,
TextAlignment = TextAlignment.Center,
IsSelected = true,
IsBold = true
@@ -286,7 +285,7 @@
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth(1),
Height = Application.GetRealHeight(14),
- BackgroundColor = CSS.CSS_Color.PromptingColor1,
+ BackgroundColor = CSS_Color.PromptingColor1,
};
changeView.AddChidren(btnLine);
@@ -295,16 +294,13 @@
X = btnLine.Right,
Width = Application.GetRealWidth(114),
TextID = StringId.Scenes,
- SelectedTextColor = CSS.CSS_Color.MainColor,
- TextColor = CSS.CSS_Color.PromptingColor1,
- TextSize = CSS.CSS_FontSize.TextFontSize,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.TextFontSize,
TextAlignment = TextAlignment.Center,
};
changeView.AddChidren(btnChangeScene);
#endregion
-
- //bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(10), BackgroundColor = 0xAAF2F3F7 });
-
#region ContextView
contentView = new PageLayout()
@@ -389,6 +385,33 @@
LoadDeviceFunctionDiv(functionView, function);
index++;
}
+
+ if (index == 0)
+ {
+ var view = new FrameLayout();
+ deviceFunctionView.AddChidren(view);
+
+ var btnNoCollectionBg = new Button()
+ {
+ Y = Application.GetRealHeight(20),
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(180),
+ Height = Application.GetRealWidth(180),
+ UnSelectedImagePath = "Collection/NoCollectionBg.png",
+ };
+ view.AddChidren(btnNoCollectionBg);
+
+ var btnNoCollectionTip = new Button()
+ {
+ Height = Application.GetRealHeight(42),
+ Y = btnNoCollectionBg.Bottom,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextID = StringId.TipNoCollcetion,
+ };
+ view.AddChidren(btnNoCollectionTip);
+ }
}
catch (Exception ex)
{
@@ -442,6 +465,7 @@
LoadSceneFunctionDiv( functionView, function);
index++;
}
+
}
catch (Exception ex)
{
@@ -475,8 +499,8 @@
Y = Application.GetRealWidth(10) + btnIcon.Bottom,
Text = function.name,
IsBold = true,
- TextColor = CSS.CSS_Color.FirstLevelTitleColor,
- TextSize = CSS.CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
Height = Application.GetRealWidth(24),
Width = Application.GetRealWidth(140),
TextAlignment = TextAlignment.CenterLeft,
@@ -490,10 +514,10 @@
Y = btnName.Bottom,
Height = Application.GetRealWidth(18),
Width = Application.GetRealWidth(113),
- TextColor = CSS.CSS_Color.PromptingColor1,
- TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextAlignment = TextAlignment.CenterLeft,
- SelectedTextColor = CSS.CSS_Color.MainBackgroundColor,
+ SelectedTextColor = CSS_Color.MainBackgroundColor,
Text = function.GetRoomListName()
};
view.AddChidren(btnZone);
@@ -505,9 +529,9 @@
Y = btnZone.Bottom,
Height = Application.GetRealWidth(18),
Width = Application.GetRealWidth(113),
- SelectedTextColor = CSS.CSS_Color.MainBackgroundColor,
+ SelectedTextColor = CSS_Color.MainBackgroundColor,
TextColor = 0x00000000,
- TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextAlignment = TextAlignment.CenterLeft,
Tag = "state",
Text = function.lastState
@@ -678,10 +702,10 @@
Y = btnName.Bottom,
Height = Application.GetRealWidth(18),
Width = Application.GetRealWidth(113),
- TextColor = CSS.CSS_Color.MainBackgroundColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextAlignment = TextAlignment.CenterLeft,
- SelectedTextColor = CSS.CSS_Color.MainBackgroundColor,
+ SelectedTextColor = CSS_Color.MainBackgroundColor,
Text = function.GetRoomListName(),
};
view.AddChidren(btnZone);
--
Gitblit v1.8.0