From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期三, 25 十二月 2019 11:21:06 +0800 Subject: [PATCH] 2019.12.25 --- ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs | 19 ++----------------- 1 files changed, 2 insertions(+), 17 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs index ff48dfc..f18db7e 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs @@ -135,16 +135,16 @@ { //鐣岄潰鍙冲垝涓嶅彲 UserView.HomePage.Instance.ScrollEnabled = false; + Shared.Common.CommonPage.BackKeyCanClick = false; var form = new DeviceFirmwareUpdateForm(); + form.CloseFormByClickBack = false; form.AddForm(oTADevice, deviceFirmware); //瀹屾垚鍗囩骇浜嬩欢 form.FinishUpdateEvent += (() => { //鍒濆鍖栦腑閮ㄦ帶浠� this.InitMiddleFrame(); - //鐣岄潰鍙冲垝鍙� - UserView.HomePage.Instance.ScrollEnabled = true; }); }; @@ -292,21 +292,6 @@ frameSpace3.Height = Application.GetRealHeight(63); listView?.AddChidren(frameSpace3); listFrame?.AddChidren(frameSpace3); - } - - #endregion - - #region 鈻� 鐣岄潰鍏抽棴___________________________ - - /// <summary> - /// 鐣岄潰鍏抽棴 - /// </summary> - public override void CloseForm() - { - //鐣岄潰鍙冲垝鍙� - UserView.HomePage.Instance.ScrollEnabled = true; - - base.CloseForm(); } #endregion -- Gitblit v1.8.0