From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs | 19 +------------------
1 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareInfoForm.cs
index ff48dfc..bdb3832 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(1);
+ var frame = new TopRightMenuControl(this, 1);
//鍘嗗彶鐗堟湰
var deviceMenu = Language.StringByID(R.MyInternationalizationString.uHistoryVersion);
frame.AddRowMenu(deviceMenu, "", "", () =>
@@ -143,8 +143,6 @@
{
//鍒濆鍖栦腑閮ㄦ帶浠�
this.InitMiddleFrame();
- //鐣岄潰鍙冲垝鍙�
- UserView.HomePage.Instance.ScrollEnabled = true;
});
};
@@ -292,21 +290,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