From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' 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