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/FunView.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/FunView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/FunView.cs
index efced4a..3fd241a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/FunView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/FunView.cs
@@ -16,7 +16,7 @@
public Button iconBtn = new Button
{
Width = Application.GetRealWidth(81),
- Height = Application.GetRealHeight(81),
+ Height = Application.GetRealWidth(81),
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(55),
//UnSelectedImagePath = $"ZigeeLogic/{iocn}.png",
@@ -35,16 +35,15 @@
public Button funnextBtn = new Button
{
Width = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(58),
+ Height = Application.GetRealWidth(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