From 8245dd3bba861d60556cd4804b39bca74c19c329 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 29 十月 2019 14:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/GateWay.Droid/Application.cs | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Application.cs b/ZigbeeApp/GateWay.Droid/Application.cs
index 856ef99..fc32ae7 100755
--- a/ZigbeeApp/GateWay.Droid/Application.cs
+++ b/ZigbeeApp/GateWay.Droid/Application.cs
@@ -36,6 +36,11 @@
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