From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 233 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 163 insertions(+), 70 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 299fba0..7751fe6 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -28,7 +28,7 @@
this.AddChidren(topRowLayout);
var titleName = new Button {
- TextSize = 16,
+ TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(176),
@@ -36,6 +36,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.selection,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -108,6 +109,7 @@
Text = Language.StringByID(MyInternationalizationString.timecondition),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize=15,
};
timerow.AddChidren(btntime);
@@ -169,6 +171,7 @@
TextID = MyInternationalizationString.device,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
devicerow.AddChidren(btndevice);
@@ -232,6 +235,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextID = MyInternationalizationString.security,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
securityrow.AddChidren(btnsecurity);
@@ -292,6 +296,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextID = MyInternationalizationString.location,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
locationrow.AddChidren(btnlocation);
@@ -332,6 +337,7 @@
X = Application.GetRealWidth(60),
TextID = MyInternationalizationString.automation,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
existencerowlayout.AddChidren(btnexistence);
@@ -378,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),
+ Height = Application.GetRealHeight(690+160),
+ Y = Application.GetRealHeight(1920 - 690-160),
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
{
@@ -410,6 +410,7 @@
Width = Application.GetRealWidth(200),
X = Application.GetRealWidth(80),
TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 14,
};
timetype.AddChidren(Btncancel);
Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -437,13 +438,14 @@
Width = Application.GetRealWidth(200),
TextAlignment = TextAlignment.CenterRight,
X = Btntitle.Right + Application.GetRealWidth(100),
+ TextSize = 14,
};
timetype.AddChidren(Btncomplete);
#endregion
- #region ----鍦ㄥ甯冮槻 绂诲甯冮槻 鎾ら槻
+ #region ----鍦ㄥ甯冮槻 绂诲甯冮槻 鎾ら槻 鑳佽揩鎾ら槻
#region 鍦ㄥ甯冮槻
@@ -471,6 +473,7 @@
TextID = MyInternationalizationString.logicathomegarrison,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
athomedefenceRowLayout.AddChidren(btnathomedefence);
@@ -504,6 +507,7 @@
TextID = MyInternationalizationString.logicremovehomegarrison,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
var leavehomedefenceSelected = new SelectedButton();
@@ -524,7 +528,7 @@
Width = Application.GetRealWidth(920),
Height = Application.GetRealHeight(130),
X = Application.GetRealWidth(80),
- LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
withdrawalFrameLayout.AddChidren(withdrawalRowLayout);
@@ -535,22 +539,56 @@
TextID = MyInternationalizationString.withdrawal,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
withdrawalRowLayout.AddChidren(btnwithdrawal);
var withdrawalSelected = new SelectedButton();
withdrawalRowLayout.AddChidren(withdrawalSelected);
#endregion
+ #region 鑳佽揩鎾ら槻
+ var urgentwithdFrameLayout = new FrameLayout
+ {
+ Height = Application.GetRealHeight(160),
+ Y = withdrawalFrameLayout.Bottom,
+ };
+ securityfra.AddChidren(urgentwithdFrameLayout);
- #region ----鍦ㄥ甯冮槻 绂诲甯冮槻 鎾ら槻鐐瑰嚮浜嬩欢
+
+ var urgentwithdrawalRowLayout = new RowLayout
+ {
+ Y = Application.GetRealHeight(30),
+ Width = Application.GetRealWidth(920),
+ Height = Application.GetRealHeight(130),
+ X = Application.GetRealWidth(80),
+ LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ };
+ urgentwithdFrameLayout.AddChidren(urgentwithdrawalRowLayout);
+
+ var btnurgentwithdrawal = new Button
+ {
+ TextID = MyInternationalizationString.urgentwithdrawal,
+ Width = Application.GetRealWidth(600),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
+ };
+ urgentwithdrawalRowLayout.AddChidren(btnurgentwithdrawal);
+
+ var urgentwithdrawalSelected = new SelectedButton();
+ urgentwithdrawalRowLayout.AddChidren(urgentwithdrawalSelected);
+ #endregion
+ #region ----鍦ㄥ甯冮槻 绂诲甯冮槻 鎾ら槻 鑳佽揩鎾ら槻鐐瑰嚮浜嬩欢
///鍦ㄥ甯冮槻鐐瑰嚮浜嬩欢
EventHandler<MouseEventArgs> athomeclick = (sedner14, e14) =>
{
btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ btnurgentwithdrawal.TextColor= ZigbeeColor.Current.LogicBtnNotSelectedColor;
athomedefenceSelected.Visible = true;
leavehomedefenceSelected.Visible = false;
withdrawalSelected.Visible = false;
+ urgentwithdrawalSelected.Visible = false;
};
athomedefenceRowLayout.MouseUpEventHandler += athomeclick;
btnathomedefence.MouseUpEventHandler += athomeclick;
@@ -563,9 +601,11 @@
btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ btnurgentwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
athomedefenceSelected.Visible = false;
leavehomedefenceSelected.Visible = true;
withdrawalSelected.Visible = false;
+ urgentwithdrawalSelected.Visible = false;
};
leavehomedefenceRowLayout.MouseUpEventHandler += leavehomeclick;
leavehomebtndefence.MouseUpEventHandler += leavehomeclick;
@@ -577,14 +617,33 @@
btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ btnurgentwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
athomedefenceSelected.Visible = false;
leavehomedefenceSelected.Visible = false;
withdrawalSelected.Visible = true;
+ urgentwithdrawalSelected.Visible = false;
};
withdrawalRowLayout.MouseUpEventHandler += disableclick;
btnwithdrawal.MouseUpEventHandler += disableclick;
withdrawalSelected.MouseUpEventHandler += disableclick;
withdrawalFrameLayout.MouseUpEventHandler += disableclick;
+
+ ///鑳佽揩鎾ら槻鐐瑰嚮浜嬩欢
+ EventHandler<MouseEventArgs> urgentwithdrawalclick = (seder, e) =>
+ {
+ btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ btnurgentwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ athomedefenceSelected.Visible = false;
+ leavehomedefenceSelected.Visible = false;
+ withdrawalSelected.Visible = false;
+ urgentwithdrawalSelected.Visible = true;
+ };
+ urgentwithdrawalRowLayout.MouseUpEventHandler += urgentwithdrawalclick;
+ btnurgentwithdrawal.MouseUpEventHandler += urgentwithdrawalclick;
+ urgentwithdrawalSelected.MouseUpEventHandler += urgentwithdrawalclick;
+ urgentwithdFrameLayout.MouseUpEventHandler += urgentwithdrawalclick;
#endregion
#endregion
@@ -603,30 +662,47 @@
btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ btnurgentwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
athomedefenceSelected.Visible = true;
leavehomedefenceSelected.Visible = false;
withdrawalSelected.Visible = false;
+ urgentwithdrawalSelected.Visible = false;
}
else
{
btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ btnurgentwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
athomedefenceSelected.Visible = false;
leavehomedefenceSelected.Visible = true;
withdrawalSelected.Visible = false;
+ urgentwithdrawalSelected.Visible = false;
}
}
- else
+ else if (securityifon["EnOrWithdrawMode"] == "1")
{
btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ btnurgentwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
athomedefenceSelected.Visible = false;
leavehomedefenceSelected.Visible = false;
withdrawalSelected.Visible = true;
+ urgentwithdrawalSelected.Visible = false;
+ }
+ else if (securityifon["EnOrWithdrawMode"] == "2")
+ {
+ btnathomedefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ leavehomebtndefence.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ btnwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ btnurgentwithdrawal.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ athomedefenceSelected.Visible = false;
+ leavehomedefenceSelected.Visible = false;
+ withdrawalSelected.Visible = false;
+ urgentwithdrawalSelected.Visible = true;
}
break;
}
@@ -634,7 +710,7 @@
}
Btncomplete.MouseUpEventHandler += (sender, e) =>
{
- if (!athomedefenceSelected.Visible && !leavehomedefenceSelected.Visible && !withdrawalSelected.Visible)
+ if (!athomedefenceSelected.Visible && !leavehomedefenceSelected.Visible && !withdrawalSelected.Visible&&!urgentwithdrawalSelected.Visible)
{
return;
}
@@ -651,46 +727,43 @@
{
SecurityConditionsInfo.Remove("ModeId");
}
-
SecurityConditionsInfo.Add("Type", "6");
SecurityConditionsInfo.Add("IsValid", "1");
- SecurityConditionsInfo.Add("ModeId", "0");
+ if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
+ {
+ SecurityConditionsInfo.Remove("EnOrWithdrawMode");
+ }
+ if (SecurityConditionsInfo.ContainsKey("ModeId"))
+ {
+ SecurityConditionsInfo.Remove("ModeId");
+ }
//鍦ㄥ甯冮槻
if (athomedefenceSelected.Visible)
{
- if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
- {
- SecurityConditionsInfo.Remove("EnOrWithdrawMode");
- }
- if (SecurityConditionsInfo.ContainsKey("ModeId"))
- {
- SecurityConditionsInfo.Remove("ModeId");
- }
+
SecurityConditionsInfo.Add("EnOrWithdrawMode", "0");
SecurityConditionsInfo.Add("ModeId", "1");
}
//绂诲甯冮槻
if (leavehomedefenceSelected.Visible)
{
- if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
- {
- SecurityConditionsInfo.Remove("EnOrWithdrawMode");
- }
- if (SecurityConditionsInfo.ContainsKey("ModeId"))
- {
- SecurityConditionsInfo.Remove("ModeId");
- }
+
SecurityConditionsInfo.Add("EnOrWithdrawMode", "0");
SecurityConditionsInfo.Add("ModeId", "2");
}
//鎾ら槻
if (withdrawalSelected.Visible)
{
- if (SecurityConditionsInfo.ContainsKey("EnOrWithdrawMode"))
- {
- SecurityConditionsInfo.Remove("EnOrWithdrawMode");
- }
+
SecurityConditionsInfo.Add("EnOrWithdrawMode", "1");
+ SecurityConditionsInfo.Add("ModeId", "0");
+ }
+ //鑳佽揩鎾ら槻
+ if (urgentwithdrawalSelected.Visible)
+ {
+
+ SecurityConditionsInfo.Add("EnOrWithdrawMode", "2");
+ SecurityConditionsInfo.Add("ModeId", "0");
}
LogicIfon.AddSecurityconditions(SecurityConditionsInfo);
var logicCommunalPage = new LogicCommunalPage();
@@ -716,24 +789,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
@@ -750,6 +816,7 @@
Width = Application.GetRealWidth(200),
X = Application.GetRealWidth(80),
TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 14,
};
typeRow.AddChidren(Btncancel);
Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -777,13 +844,14 @@
Width = Application.GetRealWidth(200),
TextAlignment = TextAlignment.CenterRight,
X = Btntitle.Right + Application.GetRealWidth(100),
+ TextSize = 14,
};
typeRow.AddChidren(Btncomplete);
#endregion
- #region ------鍦ㄥ 绂诲
- #region ------鍦ㄥ
+ #region ------鍒拌揪鍦扮偣 绂诲紑鍦扮偣
+ #region ------鍒拌揪鍦扮偣
var athomeFrameLayout = new FrameLayout
{
@@ -808,6 +876,7 @@
TextID = MyInternationalizationString.athome,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
@@ -816,7 +885,7 @@
athomeRowLayout.AddChidren(athomeSelected);
#endregion
- #region -------绂诲
+ #region -------绂诲紑鍦扮偣
var leavehomeFrameLayout = new FrameLayout
{
Height = Application.GetRealHeight(160),
@@ -840,6 +909,7 @@
TextID = MyInternationalizationString.leavehome,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
leavehomeRowLayout.AddChidren(btnleavehome);
var leavehomeSelected = new SelectedButton();
@@ -848,7 +918,7 @@
#endregion
string strname = "";
- ///鍦ㄥ鐐瑰嚮浜嬩欢
+ ///鍒拌揪鍦扮偣鐐瑰嚮浜嬩欢
EventHandler<MouseEventArgs> athomeclick = (sedner15, e15) =>
{
strname = btnathome.Text;
@@ -864,7 +934,7 @@
athomeRowLayout.MouseUpEventHandler += athomeclick;
athomeFrameLayout.MouseUpEventHandler += athomeclick;
- ///绂诲鐐瑰嚮浜嬩欢
+ ///绂诲紑鍦扮偣鐐瑰嚮浜嬩欢
EventHandler<MouseEventArgs> leavehomeclick = (sedner14, e14) =>
{
strname = btnleavehome.Text;
@@ -877,14 +947,18 @@
leavehomeSelected.MouseUpEventHandler += leavehomeclick;
leavehomeRowLayout.MouseUpEventHandler += leavehomeclick;
leavehomeFrameLayout.MouseUpEventHandler += leavehomeclick;
-
+ double latitude = Config.Instance.Home.Latitude;//绾害
+ double longitude = Config.Instance.Home.Longitude;//缁忓害
+ int r = 500;//鍗婂緞
if (edit)
{
+ string guid = "";
foreach (var Locationifon in Common.Logic.CurrentLogic.Conditions)
{
if (Locationifon["Type"] == "7")
{
+ guid = Locationifon["WhoSiteUId"];
if (Locationifon["AtHome"] == "0")
{
strname = btnleavehome.Text;
@@ -901,6 +975,20 @@
btnleavehome.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
btnathome.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
}
+ break;
+ }
+ }
+
+ foreach (var accounts in Common.Logic.CurrentLogic.Accounts)
+ {
+
+ if (accounts["Type"] == "7" && accounts["Account"] == guid)
+ {
+
+ ///杞崲涓篸ouble绫诲瀷锛�
+ latitude = Convert.ToDouble(accounts["Latitude"])/1000000.0;
+ longitude = Convert.ToDouble(accounts["Longitude"]) / 1000000.0;
+ r = int.Parse(accounts["Radius"]);
break;
}
}
@@ -923,8 +1011,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"))
@@ -941,14 +1034,16 @@
}
LocationConditionsInfo.Add("AtHome", "1");
}
- double a1 = 23.134421, a2 = 113.267189;
+
//璋冪敤鏂规硶锛岃烦杞〉闈�
GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
{
+ //鎴彇瀛楃涓插悗绗�6浣嶏紱
+ //var len = name.Substring(name.Length - 6, 6);
//鐐瑰嚮淇濆瓨鎸夐挳锛屽洖璋冨綋鍓嶉�夋嫨鐨勭含搴︼紝缁忓害锛屽崐寰勮寖鍥�
- var latitud = (int)Math.Truncate(mLatitude * 1000000);
- var longitude = (int)Math.Truncate(mLongitude * 1000000);
+ var latitudW = (int)Math.Truncate(mLatitude * 1000000);
+ var longitudeH = (int)Math.Truncate(mLongitude * 1000000);
Dictionary<string, string> accounts = new Dictionary<string, string>();
if (accounts.ContainsKey("Account"))
{
@@ -972,8 +1067,8 @@
}
accounts.Add("Account", Config.Instance.Guid);
accounts.Add("Type", "7");
- accounts.Add("Latitude", latitud.ToString());
- accounts.Add("Longitude", longitude.ToString());
+ accounts.Add("Latitude", latitudW.ToString());
+ accounts.Add("Longitude", longitudeH.ToString());
accounts.Add("Radius", mRadius.ToString());
LogicIfon.Addaccounts(accounts);
LogicIfon.AddLocationconditions(LocationConditionsInfo);
@@ -981,7 +1076,7 @@
UserView.HomePage.Instance.AddChidren(logicCommunalPage);
UserView.HomePage.Instance.PageIndex += 1;
logicCommunalPage.Show(() => { });
- }, strname, true, a1, a2, 500);
+ }, strname, true, latitude, longitude, r);
};
}
@@ -999,14 +1094,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
{
@@ -1014,9 +1102,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
@@ -1033,6 +1122,7 @@
Width = Application.GetRealWidth(200),
X = Application.GetRealWidth(80),
TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 14,
};
timetype.AddChidren(Btncancel);
Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -1060,6 +1150,7 @@
Width = Application.GetRealWidth(200),
TextAlignment = TextAlignment.CenterRight,
X = Btntitle.Right + Application.GetRealWidth(100),
+ TextSize = 14,
};
timetype.AddChidren(Btncomplete);
@@ -1093,6 +1184,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
//Text="绔嬪嵆鎵ц",
+ TextSize = 14,
};
timerow.AddChidren(Btntimepoint);
@@ -1126,6 +1218,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
//Text = "鏃堕棿鑼冨洿",
+ TextSize = 14,
};
time1row.AddChidren(Btntime);
--
Gitblit v1.8.0