From 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 13:56:39 +0800
Subject: [PATCH] 2020-04-02-2
---
ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs | 53 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs
index efb483a..27a7468 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs
@@ -23,7 +23,7 @@
/// <summary>
/// ZoneBtn
/// </summary>
- private Button ZoneBtn;
+ private Button StatuBtn;
/// <summary>
/// ClickBtn
/// </summary>
@@ -65,8 +65,8 @@
X = Application.GetRealWidth(x);
Y = Application.GetRealHeight(y);
Width = Application.GetRealWidth(1022);
- Height = Application.GetRealHeight(127);
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+ Height = Application.GetRealHeight(127-2);
+ //BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
}
/// <summary>
@@ -105,25 +105,27 @@
{
X = Application.GetRealWidth(181),
Y = Application.GetRealHeight(14),
- Width = Application.GetRealWidth(400),
+ Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(58),
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
TextAlignment = TextAlignment.CenterLeft,
+ TextSize=14,
Tag = Tag
};
AddChidren(NameBtn);
- ZoneBtn = new Button
+ StatuBtn = new Button
{
X = Application.GetRealWidth(181),
Y = Application.GetRealHeight(72),
Width = Application.GetRealWidth(400),
Height = Application.GetRealHeight(49),
TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2
+ TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
+ TextSize=10
};
- AddChidren(ZoneBtn);
+ AddChidren(StatuBtn);
SwitchBtn = new Button()
{
@@ -139,10 +141,10 @@
var line = new Button()
{
- X = Application.GetRealWidth(200),
- Y = Height - 2,
+ X = Application.GetRealWidth(181),
+ Y = Height - 1,
Width = Application.GetRealWidth(821),
- Height = 2,
+ Height = 1,
BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor,
Tag = Tag
};
@@ -176,18 +178,28 @@
/// SetZoneText
/// </summary>
/// <param name="title"></param>
- public void SetZoneText(string title)
+ public void SetStatuText(string title)
{
- ZoneBtn.Text = title;
+ StatuBtn.Text = title;
}
-
/// <summary>
/// SetStatu
/// </summary>
/// <param name="statu"></param>
public void SetStatu(bool statu)
{
- NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = SwitchBtn.IsSelected = statu;
+ SwitchBtn.IsSelected = statu;
+ NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = statu;
+ NameBtn.IsBold = statu;
+ }
+
+ /// <summary>
+ /// SetStatu
+ /// </summary>
+ /// <param name="statu"></param>
+ public void SetOnLineStatu(bool statu)
+ {
+ NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = statu;
}
/// <summary>
@@ -196,7 +208,18 @@
/// <param name="statu"></param>
public void HideSwitchBtn(bool statu)
{
- SwitchBtn.Visible = statu;
+ SwitchBtn.Visible = !statu;
+ }
+
+ /// <summary>
+ /// SetDeviceIcon
+ /// </summary>
+ /// <param name="imagePath"></param>
+ /// <param name="selectedImagePath"></param>
+ public void SetDeviceIcon(string imagePath, string selectedImagePath)
+ {
+ ImageBtn.UnSelectedImagePath = imagePath;
+ ImageBtn.SelectedImagePath = selectedImagePath;
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0