From eb424d24e39bab4a245725f35deab3f234ea0f13 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 13 十二月 2019 10:48:50 +0800
Subject: [PATCH] 2019.12.13
---
ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs | 77 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
index f47744d..62e5abc 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
@@ -16,7 +16,7 @@
/// <summary>
/// SceneIcon
/// </summary>
- public Button SceneIcon;
+ public ImageView SceneIcon;
/// <summary>
/// statu
/// </summary>
@@ -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,40 +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 Button
- {
- X = Application.GetMinRealAverage(14),
- Width = Application.GetMinRealAverage(458),
- Height = Application.GetRealHeight(305),
- Gravity = Gravity.CenterHorizontal
- };
- AddChidren(SceneIcon);
- SceneIcon.SetViewShadow(true);
-
-
- //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,
@@ -125,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",
@@ -140,7 +146,7 @@
Y = Application.GetMinRealAverage(239),
Width = Application.GetMinRealAverage(279),
Height = Application.GetMinRealAverage(60),
- TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
TextAlignment = TextAlignment.CenterLeft,
};
@@ -161,6 +167,7 @@
CollectButton.MouseUpEventHandler += CollectionEvent;
SceneIcon.MouseUpEventHandler += SceneUpHandler;
SceneNameButton.MouseUpEventHandler += SceneUpHandler;
+ sceneBG.MouseUpEventHandler += SceneUpHandler;
}
/// <summary>
@@ -169,7 +176,7 @@
/// <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;
@@ -219,11 +226,11 @@
{
if (scene.IconPathType == 0)
{
- SceneIcon.UnSelectedImagePath = iconPath;
+ SceneIcon.ImagePath = iconPath;
}
else
{
- SceneIcon.UnSelectedImagePath = System.IO.Path.Combine(Config.Instance.FullPath, iconPath);
+ SceneIcon.ImagePath = System.IO.Path.Combine(Config.Instance.FullPath, iconPath);
}
}
--
Gitblit v1.8.0