From ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:15:59 +0800
Subject: [PATCH] Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC

---
 ZigbeeApp/GateWay.Droid/Application.cs |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Application.cs b/ZigbeeApp/GateWay.Droid/Application.cs
index fc32ae7..856ef99 100755
--- a/ZigbeeApp/GateWay.Droid/Application.cs
+++ b/ZigbeeApp/GateWay.Droid/Application.cs
@@ -36,11 +36,6 @@
             BaseActivity.BackKeyAction = () => {
                 try
                 {
-                    if (Shared.Common.CommonPage.BackKeyCanClick == false)
-                    {
-                        //涓嶅厑璁告寜杩斿洖閿�
-                        return;
-                    }
                     if (Shared.Common.CommonPage.Loading != null)
                     {
                         Console.WriteLine(Shared.Common.CommonPage.Loading.CurStatus);

--
Gitblit v1.8.0