From 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 13:56:39 +0800
Subject: [PATCH] 2020-04-02-2
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/FunView.cs | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/FunView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/FunView.cs
old mode 100755
new mode 100644
index efced4a..0ac3aeb
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/FunView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/FunView.cs
@@ -15,8 +15,8 @@
};
public Button iconBtn = new Button
{
- Width = Application.GetRealWidth(81),
- Height = Application.GetRealHeight(81),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(55),
//UnSelectedImagePath = $"ZigeeLogic/{iocn}.png",
@@ -34,17 +34,16 @@
};
public Button funnextBtn = new Button
{
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(58),
+ Width = Application.GetMinRealAverage(58),
+ Height = Application.GetMinRealAverage(58),
UnSelectedImagePath = "ZigeeLogic/next.png",
X = Application.GetRealWidth(789 + 176),
Y = Application.GetRealHeight(30 + 36),
};
public Button lineBtn = new Button
{
- Y = Application.GetRealHeight(155),
Width = Application.GetRealWidth(850),
- Height = Application.GetRealHeight(5),
+ Height =1,
X = Application.GetRealWidth(176),
BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
@@ -55,10 +54,10 @@
public FrameLayout FunFrameView()
{
-
funFrameLayout.AddChidren(iconBtn);
funFrameLayout.AddChidren(funnameBtn);
funFrameLayout.AddChidren(funnextBtn);
+ lineBtn.Y = funFrameLayout.Height - 1;
funFrameLayout.AddChidren(lineBtn);
funFrameLayout.AddChidren(clickviewBtn);
return funFrameLayout;
--
Gitblit v1.8.0