From b186c02eb9e44268727b769be477d1956e97fbb0 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 09:08:05 +0800
Subject: [PATCH] 2019.1.2

---
 ZigbeeApp/Shared/Phone/UserView/SafetyShortcutControl.cs |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserView/SafetyShortcutControl.cs b/ZigbeeApp/Shared/Phone/UserView/SafetyShortcutControl.cs
index b34e77b..78e6aa2 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,9 +110,9 @@
                 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;
@@ -146,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;
@@ -179,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;
@@ -206,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;
@@ -233,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