From 45e4e387f3ef259b9e225fdd543e20be285a5112 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 29 十月 2019 13:42:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
index c8e52c2..cf755c0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
@@ -182,6 +182,8 @@
/// </summary>
public override void CloseForm()
{
+ //瀹夊崜鍙互鐐瑰嚮绯荤粺鐨勮繑鍥為敭
+ Shared.Common.CommonPage.BackKeyCanClick = true;
//鍗囩骇瀵硅薄
if (FirmwareUpdateResourse.dicDeviceUpdateList.ContainsKey(deviceMac) == true
&& FirmwareUpdateResourse.dicDeviceUpdateList[deviceMac].IsFinishUpdate == true)
--
Gitblit v1.8.0