From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/SceneTargetFunctionRow.cs | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneTargetFunctionRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneTargetFunctionRow.cs
index 8b99cb5..6e36bc2 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneTargetFunctionRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneTargetFunctionRow.cs
@@ -33,7 +33,7 @@
X = Application.GetRealWidth(0);
Y = Application.GetRealHeight(y);
Width = Application.GetRealWidth(1080);
- Height = Application.GetRealHeight(127);
+ Height = Application.GetRealHeight(127 - 2);
}
/// <summary>
@@ -54,11 +54,12 @@
{
X = Application.GetRealWidth(219),
Y = Application.GetRealHeight(14),
- Width = Application.GetRealWidth(500),
+ Width = Application.GetRealWidth(400),
Height = Application.GetRealHeight(58),
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
- TextID = R.MyInternationalizationString.Delay
+ TextID = R.MyInternationalizationString.Delay,
+ TextSize = 14
};
AddChidren(NameBtn);
@@ -66,30 +67,32 @@
{
X = Application.GetRealWidth(219),
Y = Application.GetRealHeight(72),
- Width = Application.GetRealWidth(200),
+ Width = Application.GetRealWidth(400),
Height = Application.GetRealHeight(49),
TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2
+ TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
+ TextSize = 12
};
AddChidren(ZoneBtn);
StatuBtn = new Button
{
- X = Application.GetRealWidth(510),
- Width = Application.GetRealWidth(500),
+ X = Application.GetRealWidth(650),
+ Width = Application.GetRealWidth(350),
Height = Application.GetRealHeight(100),
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterRight,
- TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2
+ TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
+ TextSize = 14
};
AddChidren(StatuBtn);
line = new Button()
{
X = Application.GetRealWidth(222),
- Y = Height - 2,
+ Y = Height - 1,
Width = Application.GetRealWidth(800),
- Height = 2,
+ Height = 1,
BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2,
};
AddChidren(line);
@@ -137,7 +140,7 @@
/// <param name="hiden"></param>
public void HideLine(bool hiden)
{
- line.Visible = hiden;
+ line.Visible = !hiden;
}
}
}
--
Gitblit v1.8.0