From 7a23bcdf0fe5f7442aa95ec2203cd5b6670a910d Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 19 十二月 2019 17:59:33 +0800
Subject: [PATCH] 2019-12-19-1
---
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 43 +++++++++++++++----------------------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 48ba5d5..b44fd18 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -36,6 +36,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.selection,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -383,23 +384,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(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
{
@@ -726,24 +721,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(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var typeRow = new RowLayout
@@ -937,8 +925,13 @@
{
LocationConditionsInfo.Remove("IsValid");
}
+ if (LocationConditionsInfo.ContainsKey("WhoSiteUId"))
+ {
+ LocationConditionsInfo.Remove("WhoSiteUId");
+ }
LocationConditionsInfo.Add("Type", "7");
LocationConditionsInfo.Add("IsValid", "1");
+ LocationConditionsInfo.Add("WhoSiteUId", Config.Instance.Guid);
if (leavehomeSelected.Visible)
{
if (LocationConditionsInfo.ContainsKey("AtHome"))
@@ -1013,14 +1006,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 +1014,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(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
--
Gitblit v1.8.0