From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoRow.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoRow.cs
index ff40bd5..397eb92 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoRow.cs
@@ -48,18 +48,20 @@
Height = Application.GetRealHeight(80),
Gravity = Gravity.CenterVertical,
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
- TextAlignment = TextAlignment.CenterLeft
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize=CommonFormResouce.TextSize
};
AddChidren(TipBtn);
NameText = new Button
{
- X = Application.GetRealWidth(350),
- Width = Application.GetRealWidth(600),
+ X = Application.GetRealWidth(300),
+ Width = Application.GetRealWidth(650),
Height = Application.GetRealHeight(80),
Gravity = Gravity.CenterVertical,
TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
- TextAlignment = TextAlignment.CenterLeft
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CommonFormResouce.TextSize
};
AddChidren(NameText);
@@ -69,17 +71,17 @@
Width = Application.GetMinRealAverage(100),
Height = Application.GetMinRealAverage(100),
Gravity = Gravity.CenterVertical,
- SelectedImagePath="Item/Next.png",
- UnSelectedImagePath= "Item/NextSelected.png"
+ SelectedImagePath= "Item/NextSelected.png",
+ UnSelectedImagePath= "Item/Next.png"
};
AddChidren(NextBtn);
line = new Button()
{
X = Application.GetRealWidth(CommonFormResouce.X_Left),
- Y = Height - 2,
+ Y = Height - 1,
Width = Application.GetRealWidth(965),
- Height = 2,
+ Height = 1,
BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2,
};
AddChidren(line);
--
Gitblit v1.8.0