From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
index 379690d..f023899 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFirmwareUpdateForm.cs
@@ -81,6 +81,10 @@
/// </summary>
private void InitTopRightMenu()
{
+ if (UserCenterResourse.HideOption.DeviceHistory != 1)
+ {
+ return;
+ }
var btnIcon = new MostRightIconControl(69, 69);
btnIcon.UnSelectedImagePath = "Item/More.png";
topFrameLayout.AddChidren(btnIcon);
@@ -97,7 +101,7 @@
/// </summary>
private void ShowTopRightMenu()
{
- var frame = new TopRightMenuControl(1);
+ var frame = new TopRightMenuControl(1, 2);
//鍘嗗彶鐗堟湰
var deviceMenu = Language.StringByID(R.MyInternationalizationString.uHistoryVersion);
frame.AddRowMenu(deviceMenu, "", "", () =>
@@ -351,12 +355,12 @@
ProgressFormBar.Current.CloseEvent += () =>
{
//鍗囩骇瀵硅薄
- if (FirmwareUpdateResourse.dicDeviceUpdateList.ContainsKey(deviceMac) == true
- && FirmwareUpdateResourse.dicDeviceUpdateList[deviceMac].IsFinishUpdate == true)
+ if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(deviceMac) == true
+ && FirmwareUpdateResourse.dicUpdateList[deviceMac].IsFinishUpdate == true)
{
//濡傛灉璁惧宸茬粡鍗囩骇瀹屾垚锛岀晫闈㈠叧闂椂锛屽垯绉婚櫎鍐呭瓨
- FirmwareUpdateResourse.dicDeviceUpdateList[deviceMac].Dispose();
- FirmwareUpdateResourse.dicDeviceUpdateList.Remove(deviceMac);
+ FirmwareUpdateResourse.dicUpdateList[deviceMac].Dispose();
+ FirmwareUpdateResourse.dicUpdateList.Remove(deviceMac);
}
};
}
--
Gitblit v1.8.0