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/CategoryFunctionRow.cs | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs
old mode 100755
new mode 100644
index efb483a..ebce56e
--- 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>
@@ -66,7 +66,7 @@
Y = Application.GetRealHeight(y);
Width = Application.GetRealWidth(1022);
Height = Application.GetRealHeight(127);
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+ //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,7 @@
/// <param name="statu"></param>
public void HideSwitchBtn(bool statu)
{
- SwitchBtn.Visible = statu;
+ SwitchBtn.Visible = !statu;
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0