From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs
old mode 100755
new mode 100644
index a6fc541..448da2e
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionMainView.cs
@@ -99,9 +99,10 @@
Y = Application.GetMinRealAverage(17),
Width = Application.GetMinRealAverage(320),
Height = Application.GetMinRealAverage(63),
- TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
+ TextColor = ZigbeeColor.Current.GXCTextGrayColor,
SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
- TextAlignment=TextAlignment.CenterLeft
+ TextAlignment=TextAlignment.CenterLeft,
+ TextSize=15
};
AddChidren(NameButton);
@@ -156,7 +157,9 @@
Height = Application.GetMinRealAverage(60),
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
- TextAlignment=TextAlignment.CenterLeft
+ TextAlignment=TextAlignment.CenterLeft,
+ TextSize=14,
+ IsBold=true
};
AddChidren(StatuButton);
@@ -177,9 +180,10 @@
/// SetStatu
/// </summary>
/// <param name="statu"></param>
- public void SetStatu(bool statu)
+ private void SetStatu(bool statu)
{
NameButton.IsSelected = IconButton.IsSelected = SwitchButton.IsSelected = StatuButton.IsSelected = CardBG.IsSelected = statu;
+ NameButton.IsBold = statu;
}
/// <summary>
--
Gitblit v1.8.0