From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs
index b283963..e5caf3e 100755
--- 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,
};
@@ -35,7 +35,7 @@
{
Width = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(58),
+ Height = Application.GetRealWidth(58),
UnSelectedImagePath = "ZigeeLogic/add.png",
X = Application.GetRealWidth(1080 - 58-58),
Y = Application.GetRealHeight(30 + 36),
@@ -44,8 +44,8 @@
public Button switchBtn = new Button
{
- Width = Application.GetMinRealAverage(104),
- Height = Application.GetMinRealAverage(63),
+ Width = Application.GetRealWidth(104),
+ Height = Application.GetRealWidth(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