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/SelectDeviceWithPickViewRow.cs | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithPickViewRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithPickViewRow.cs
index 609b606..8d5cf18 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithPickViewRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectDeviceWithPickViewRow.cs
@@ -89,6 +89,7 @@
Height = Application.GetRealHeight(80),
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
+ TextSize=14
};
AddChidren(NameBtn);
SelectBtn = new Button()
@@ -100,6 +101,17 @@
Visible = false
};
AddChidren(SelectBtn);
+
+ var line1 = new Button()
+ {
+ X = Application.GetRealWidth(81),
+ Y = Application.GetRealHeight(127),
+ Width = Application.GetRealWidth(919),
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor,
+ };
+ AddChidren(line1);
+
ClickButton = new Button
{
@@ -147,9 +159,9 @@
line = new Button()
{
X = Application.GetRealWidth(81),
- Y = this.Height - 2,
+ Y = this.Height - 1,
Width = Application.GetRealWidth(919),
- Height = 2,
+ Height = 1,
BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor,
};
AddChidren(line);
--
Gitblit v1.8.0