From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserView/SafetyShortcutControl.cs | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserView/SafetyShortcutControl.cs b/ZigbeeApp/Shared/Phone/UserView/SafetyShortcutControl.cs
index 48b85d8..a065ede 100644
--- a/ZigbeeApp/Shared/Phone/UserView/SafetyShortcutControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/SafetyShortcutControl.cs
@@ -43,7 +43,7 @@
var bg = new Button
{
- X = Application.GetRealWidth(485),
+ X = Application.GetRealWidth(495),
Y = Application.GetRealHeight(161),
Width = Application.GetRealWidth(449),
Height = Application.GetRealHeight(495),
@@ -53,7 +53,7 @@
var bg1 = new FrameLayout
{
- X = Application.GetRealWidth(485),
+ X = Application.GetRealWidth(495),
Y = Application.GetRealHeight(161),
Width = Application.GetRealWidth(449),
Height = Application.GetRealHeight(495),
@@ -110,20 +110,27 @@
atHome.IsSelected = true;
tempRow = atHome;
}
- atHome.ClickBtn.MouseUpEventHandler += (sender, e) =>
+ atHome.ButtonClickEvent += (sender, e) =>
{
- if((sender as Button).IsSelected)
+ if(sender.IsSelected)
{
dialog.Close();
return;
}
- new System.Threading.Thread(() =>
+ CommonPage.Loading.Start();
+ new System.Threading.Thread(async () =>
{
- var result= HdlSafeguardLogic.Current.SetSafetyGarrisonByModel(GarrisonMode.AtHome);
+ var result=await HdlSafeguardLogic.Current.SetSafetyGarrisonByModel(GarrisonMode.AtHome);
Application.RunOnMainThread(() =>
{
+ CommonPage.Loading.Hide();
dialog.Close();
+ if(result == GarrisonMode.AtHome)
+ {
+
+ }
});
+
})
{ IsBackground = true }.Start();
};
@@ -139,9 +146,9 @@
withdrawGarriso.IsSelected = true;
tempRow = withdrawGarriso;
}
- withdrawGarriso.ClickBtn.MouseUpEventHandler += (sender, e) =>
+ withdrawGarriso.ButtonClickEvent += (sender, e) =>
{
- if ((sender as Button).IsSelected)
+ if (sender.IsSelected)
{
dialog.Close();
return;
@@ -172,9 +179,9 @@
{
atHome.IsSelected = true;
}
- atHome.ClickBtn.MouseUpEventHandler += (sender, e) =>
+ atHome.ButtonClickEvent += (sender, e) =>
{
- if ((sender as Button).IsSelected)
+ if (sender.IsSelected)
{
dialog.Close();
return;
@@ -199,9 +206,9 @@
{
removeHome.IsSelected = true;
}
- removeHome.ClickBtn.MouseUpEventHandler += (sender, e) =>
+ removeHome.ButtonClickEvent += (sender, e) =>
{
- if ((sender as Button).IsSelected)
+ if (sender.IsSelected)
{
dialog.Close();
return;
@@ -226,9 +233,9 @@
{
withdrawGarriso.IsSelected = true;
}
- withdrawGarriso.ClickBtn.MouseUpEventHandler += (sender, e) =>
+ withdrawGarriso.ButtonClickEvent += (sender, e) =>
{
- if ((sender as Button).IsSelected)
+ if (sender.IsSelected)
{
dialog.Close();
return;
--
Gitblit v1.8.0