From eed381ca472abb06e386281e604569ebf80bbfe3 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 26 三月 2020 17:51:41 +0800
Subject: [PATCH] 2020-03-26
---
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 06fc920..8bb854a 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -358,10 +358,10 @@
refresview.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
}
}
-
+ int i = 1;//灞�閮ㄥ彉閲忥紝榛樿鏄涓�鏉￠�昏緫;
foreach (var logic in Common.Logic.LogicList)
{
-
+
var fLayout = new FrameLayout
{
Height = Application.GetRealHeight(190 + 30),
@@ -369,7 +369,7 @@
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
};
refresview.AddChidren(fLayout);
-
+
var logicRowlayout = new RowLayout
{
Height = Application.GetRealHeight(190 + 30),
@@ -380,7 +380,14 @@
};
fLayout.AddChidren(logicRowlayout);
-
+ if (i == 1)
+ {
+ //瀹炵幇android鏄剧ず閫昏緫鍒楄〃鐨勫渾瑙�;
+ fLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
+ logicRowlayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
+ i = 2;
+ }
+
var logicnameBtn = new Button
{
Height = Application.GetRealHeight(58),
@@ -396,8 +403,8 @@
var logicswitchBtn = 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 = logicRowlayout.Width - Application.GetRealWidth(104 + 58),
@@ -421,7 +428,7 @@
logic.IsEnable = 0;
StatusColor(logic, logicRowlayout, 0);
}
- Device.Logic.Send.LogicControlSwitch(logic);
+ Send.LogicControlSwitch(logic);
//Logic.Send.AddModifyLogic(logic);
};
if (logic.IsEnable == 1)
@@ -507,7 +514,7 @@
logicRowlayout.AddChidren(logictimeBtn);
///鏄剧ず鎵ц鍛ㄦ湡
- Device.Logic.Method.UpdateWeek(logictimeBtn, logic);
+ Method.UpdateWeek(logictimeBtn, logic);
List<string> indexlist = new List<string>();
@@ -546,7 +553,7 @@
Height = Application.GetMinRealAverage(82),
X = Application.GetRealWidth(58) + Application.GetRealWidth(12 + (12 + 82 + 45 + 12) * i),
Y = Application.GetRealHeight(58 + 30 + 30),
- Radius = (uint)Application.GetRealHeight(41),
+ Radius = (uint)Application.GetMinRealAverage(41),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
logicRowlayout.AddChidren(typebjBtn);
--
Gitblit v1.8.0