From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs | 74 +++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
index db2a05a..49ce8a9 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
@@ -58,12 +58,17 @@
}
}
+ /// <summary>
+ /// SceneMainView
+ /// </summary>
+ /// <param name="x"></param>
+ /// <param name="y"></param>
public SceneMainView(int x, int y)
{
X = Application.GetRealWidth(x);
Y = Application.GetRealHeight(y);
- Width = Application.GetMinRealAverage(487);
- Height = Application.GetMinRealAverage(348);
+ Width = Application.GetRealWidth(487);
+ Height = Application.GetRealHeight(358);
}
/// <summary>
@@ -83,39 +88,41 @@
/// </summary>
private void InitFrame()
{
- CardBG = new Button
- {
- Width = Application.GetMinRealAverage(487),
- Height = Application.GetMinRealAverage(348),
- UnSelectedImagePath = "Item/FunctionCardView.png",
- Gravity = Gravity.CenterHorizontal
- };
- AddChidren(CardBG);
-
- SceneIcon = new ImageView
- {
- Width = Application.GetMinRealAverage(458),
- Height = Application.GetMinRealAverage(305),
- Gravity = Gravity.CenterHorizontal,
- };
- AddChidren(SceneIcon);
- SceneIcon.SetViewShadow(true);
- SceneIcon.SetCornerWithSameRadius(Application.GetRealHeight(100), HDLUtils.RectCornerBottomRight);
-
- //sceneBG = new Button
+ //CardBG = new Button
//{
// Width = Application.GetMinRealAverage(487),
// Height = Application.GetMinRealAverage(348),
- // UnSelectedImagePath = "Item/SceneCard.png",
+ // UnSelectedImagePath = "Item/FunctionCardView.png",
// Gravity = Gravity.CenterHorizontal
//};
- //AddChidren(sceneBG);
+ //AddChidren(CardBG);
+
+ SceneIcon = new ImageView
+ {
+ X=Application.GetRealWidth(14),
+ Width = Application.GetMinRealAverage(458),
+ Height = Application.GetMinRealAverage(305),
+ Gravity = Gravity.CenterHorizontal,
+ Radius= (uint)Application.GetRealHeight(17)
+ };
+ AddChidren(SceneIcon);
+ //SceneIcon.SetViewShadow(true);
+ //SceneIcon.SetCornerWithSameRadius(Application.GetRealHeight(100), HDLUtils.RectCornerBottomRight);
+
+ sceneBG = new Button
+ {
+ Width = Application.GetMinRealAverage(487),
+ Height = Application.GetMinRealAverage(348),
+ UnSelectedImagePath = "Scene/Background.png",
+ Gravity = Gravity.CenterHorizontal
+ };
+ AddChidren(sceneBG);
TimeButton = new Button()
{
- X = Application.GetMinRealAverage(40),
- Y = Application.GetMinRealAverage(17),
- Width = Application.GetMinRealAverage(320),
+ X = Application.GetMinRealAverage(30),
+ Y = Application.GetMinRealAverage(20),
+ Width = Application.GetMinRealAverage(63),
Height = Application.GetMinRealAverage(63),
TextColor = ZigbeeColor.Current.GXCTextSelectedColor3,
TextAlignment = TextAlignment.CenterLeft,
@@ -124,8 +131,8 @@
CollectButton = new Button
{
- X = Application.GetMinRealAverage(366),
- Y = Application.GetMinRealAverage(14),
+ X = Application.GetMinRealAverage(350),
+ Y = Application.GetMinRealAverage(1),
Width = Application.GetMinRealAverage(107),
Height = Application.GetMinRealAverage(107),
UnSelectedImagePath = "Item/Collection1.png",
@@ -142,6 +149,8 @@
TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 14,
+ IsBold = true
};
AddChidren(SceneNameButton);
}
@@ -160,6 +169,7 @@
CollectButton.MouseUpEventHandler += CollectionEvent;
SceneIcon.MouseUpEventHandler += SceneUpHandler;
SceneNameButton.MouseUpEventHandler += SceneUpHandler;
+ sceneBG.MouseUpEventHandler += SceneUpHandler;
}
/// <summary>
@@ -168,10 +178,12 @@
/// <param name="name"></param>
public void SetTimeText(string name)
{
- TimeButton.Width = Application.GetMinRealAverage(320);
+ TimeButton.Width = Application.GetMinRealAverage(280);
TimeButton.Height = Application.GetMinRealAverage(63);
TimeButton.UnSelectedImagePath = string.Empty;
TimeButton.Text = name;
+ TimeButton.TextSize = 14;
+ TimeButton.IsBold = true;
}
/// <summary>
@@ -324,7 +336,7 @@
}
var timeSelect = new SelectTime();
CommonPage.Instance.AddChidren(timeSelect);
- timeSelect.TempTime = scene.DelayTime;
+ timeSelect.TempTime = scene.SceneDelayTime;
timeSelect.Init();
timeSelect.TimeAction = (t) =>
{
--
Gitblit v1.8.0