From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
index ce5d9ed..2742a12 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
@@ -277,7 +277,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, "", "", () =>
@@ -402,12 +402,12 @@
{
//鍗囩骇瀵硅薄
string gwId = HdlGatewayLogic.Current.GetGatewayId(realway);
- if (FirmwareUpdateResourse.dicGatewayUpdateList.ContainsKey(gwId) == true
- && FirmwareUpdateResourse.dicGatewayUpdateList[gwId].IsFinishUpdate == true)
+ if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(gwId) == true
+ && FirmwareUpdateResourse.dicUpdateList[gwId].IsFinishUpdate == true)
{
//濡傛灉缃戝叧宸茬粡鍗囩骇瀹屾垚锛岀晫闈㈠叧闂椂锛屽垯绉婚櫎鍐呭瓨
- FirmwareUpdateResourse.dicGatewayUpdateList[gwId].Dispose();
- FirmwareUpdateResourse.dicGatewayUpdateList.Remove(gwId);
+ FirmwareUpdateResourse.dicUpdateList[gwId].Dispose();
+ FirmwareUpdateResourse.dicUpdateList.Remove(gwId);
}
};
}
--
Gitblit v1.8.0