Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-10-29 8245dd3bba861d60556cd4804b39bca74c19c329

 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)