From d5b9ff8bf8cc36f5b13c46b66682f5988d3a6f36 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 15 五月 2020 11:36:11 +0800
Subject: [PATCH] 2020-05-15-1
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs
old mode 100644
new mode 100755
index 9b8d4d4..48970d2
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs
@@ -12,9 +12,9 @@
};
public Button lineBtn = new Button
{
- Y = Application.GetRealHeight(155),
+ //Y = Application.GetRealHeight(155),
Width = Application.GetRealWidth(1080-58-58),
- Height = Application.GetRealHeight(5),
+ Height =1,
X = Application.GetRealWidth(58),
BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
@@ -44,8 +44,8 @@
public Button switchBtn = new Button
{
- Width = Application.GetRealWidth(104),
- Height = Application.GetRealHeight(63),
+ Width = Application.GetMinRealAverage(104),
+ Height = Application.GetMinRealAverage(63),
UnSelectedImagePath = "ZigeeLogic/logicclose.png",
SelectedImagePath = "ZigeeLogic/logicopen.png",
X = Application.GetRealWidth(1080 - 58 - 104),
@@ -60,11 +60,12 @@
Width = Application.GetRealWidth(58 +58+40),
Height = Application.GetRealHeight(160),
- X = Application.GetRealWidth(1080 - 58 - 58),
+ X = Application.GetRealWidth(1080 - 58 - 58-40),
};
public FrameLayout AddDeviceView()
{
+ lineBtn.Y = frameLayout.Height - 1;
frameLayout.AddChidren(lineBtn);
frameLayout.AddChidren(titleBtn);
frameLayout.AddChidren(iconBtn);
--
Gitblit v1.8.0