From 8adaa664b3f4a1f5e05434dc245cc5d168ad718c Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 14:15:56 +0800
Subject: [PATCH] 2020-03-23-1
---
ZigbeeApp/Shared/Phone/Device/Category/Category.cs | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
index e4a7c12..061f831 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/Category.cs
@@ -2334,9 +2334,16 @@
refresview.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
}
}
+
foreach (var logic in Common.Logic.LogicList)
{
-
+ var fLayout = new FrameLayout
+ {
+ Height = Application.GetRealHeight(190 + 30),
+ Width = Application.GetRealWidth(1080 - 58),
+ BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+ };
+ refresview.AddChidren(fLayout);
var logicRowlayout = new RowLayout
{
@@ -2347,9 +2354,7 @@
SubViewWidth = Application.GetRealWidth(184),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
};
- refresview.AddChidren(logicRowlayout);
-
-
+ fLayout.AddChidren(logicRowlayout);
var logicnameBtn = new Button
{
@@ -2364,7 +2369,6 @@
};
logicRowlayout.AddChidren(logicnameBtn);
-
var logicswitchBtn = new Button
{
Width = Application.GetRealWidth(104),
@@ -2376,8 +2380,6 @@
};
logicRowlayout.AddChidren(logicswitchBtn);
-
-
logicswitchBtn.MouseUpEventHandler += (sender1, e1) =>
{
@@ -2425,7 +2427,6 @@
};
-
///鍒犻櫎
var del = new Button
{
@@ -2452,13 +2453,13 @@
};
var line = new Button
{
- Y = Application.GetRealHeight(215),
- Height = Application.GetRealHeight(5),
+ Y = fLayout.Height-1,
+ Height =1,
+ X = Application.GetRealWidth(58),
Width = Application.GetRealWidth(1080 - 58),
BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- X = Application.GetRealWidth(58),
};
- logicRowlayout.AddChidren(line);
+ fLayout.AddChidren(line);
}
}
--
Gitblit v1.8.0