From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25
---
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 37 +++++++++----------------------------
1 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 48ba5d5..8f89c08 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -383,23 +383,17 @@
flMain.RemoveFromParent();
};
- var securityfra1 = new FrameLayout
- {
- Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(100),
- Y = Application.GetRealHeight(1920 - 100),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- flMain.AddChidren(securityfra1);
+
var securityfra = new FrameLayout
{
Width = Application.GetRealWidth(1080),
Height = Application.GetRealHeight(690),
Y = Application.GetRealHeight(1920 - 690),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- Radius = (uint)Application.GetRealHeight(60),
+ //Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(securityfra);
+ securityfra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
{
@@ -726,24 +720,17 @@
flMain.RemoveFromParent();
};
- var Locationfra1 = new FrameLayout
- {
- Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(100),
- Y = Application.GetRealHeight(1920 - 100),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- flMain.AddChidren(Locationfra1);
+
var Locationfra = new FrameLayout
{
Width = Application.GetRealWidth(1080),
Height = Application.GetRealHeight(530),
Y = Application.GetRealHeight(1920 - 530),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- Radius = (uint)Application.GetRealHeight(60),
+ //Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(Locationfra);
-
+ Locationfra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var typeRow = new RowLayout
@@ -1013,14 +1000,7 @@
flMain.RemoveFromParent();
};
- var timetypeframelayout1 = new FrameLayout
- {
- Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(100),
- Y = Application.GetRealHeight(1920 - 100),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- flMain.AddChidren(timetypeframelayout1);
+
var timetypeframelayout = new FrameLayout
{
@@ -1028,9 +1008,10 @@
Height = Application.GetRealHeight(530),
Y = Application.GetRealHeight(1920 - 530),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- Radius = (uint)Application.GetRealHeight(60),
+ // Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(timetypeframelayout);
+ timetypeframelayout.SetCornerWithSameRadius(20,HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
--
Gitblit v1.8.0