From e28d283bd27db2c40ff435c517db54e2010e8ae6 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 24 十二月 2019 14:31:56 +0800
Subject: [PATCH] 2019.12.24
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs
index dd3e8ed..f18db7e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs
@@ -97,7 +97,7 @@
/// </summary>
private void ShowTopRightMenu()
{
- var frame = new TopRightMenuControl(this, 1);
+ var frame = new TopRightMenuControl(1);
//鍘嗗彶鐗堟湰
var deviceMenu = Language.StringByID(R.MyInternationalizationString.uHistoryVersion);
frame.AddRowMenu(deviceMenu, "", "", () =>
@@ -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