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 | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs
index 521e49e..ebce56e 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs
@@ -42,7 +42,7 @@
v_Selected = value;
try
{
- SetOnLineStatu(v_Selected);
+ SetStatu(v_Selected);
}
catch
{
@@ -110,6 +110,7 @@
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
TextAlignment = TextAlignment.CenterLeft,
+ TextSize=14,
Tag = Tag
};
AddChidren(NameBtn);
@@ -121,7 +122,8 @@
Width = Application.GetRealWidth(400),
Height = Application.GetRealHeight(49),
TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2
+ TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
+ TextSize=10
};
AddChidren(StatuBtn);
@@ -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
};
@@ -187,6 +189,8 @@
public void SetStatu(bool statu)
{
SwitchBtn.IsSelected = statu;
+ NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = statu;
+ NameBtn.IsBold = statu;
}
/// <summary>
@@ -207,4 +211,4 @@
SwitchBtn.Visible = !statu;
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0