From dce6c3481a37216292724013ff9d2b75ceb82f86 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 10 六月 2020 15:47:28 +0800
Subject: [PATCH] 添加小度的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
index 1730e43..ae56315 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
@@ -78,13 +78,13 @@
//缃戝叧
var listData1 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Linux,
- upDatezbGateway.getGwInfo.LinuxHWVersion.ToString(),
- upDatezbGateway.getGwInfo.LinuxImageType.ToString());
+ upDatezbGateway.LinuxHardVersion.ToString(),
+ upDatezbGateway.LinuxImageType.ToString());
//鍗忚皟鍣�
var listData2 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Coordinator,
- upDatezbGateway.getGwInfo.ZbHWVersion.ToString(),
- upDatezbGateway.getGwInfo.ZbImageType.ToString());
+ upDatezbGateway.CoordinatorHardVersion.ToString(),
+ upDatezbGateway.CoordinatorImageId.ToString());
//铏氭嫙椹卞姩
var listData3 = new List<FirmwareVersionInfo>();
@@ -99,8 +99,8 @@
HdlThreadLogic.Current.RunMainInThread(() =>
{
bool canAddTitle = true;
- int fVersion1 = upDatezbGateway.getGwInfo.LinuxFWVersion;
- string imageType1 = upDatezbGateway.getGwInfo.LinuxImageType.ToString();
+ int fVersion1 = upDatezbGateway.LinuxFirmwareVersion;
+ string imageType1 = upDatezbGateway.LinuxImageType.ToString();
foreach (var data in listData1)
{
if (data.ImagType == imageType1 && fVersion1 == data.FirmwareVersion)
@@ -117,8 +117,8 @@
}
canAddTitle = true;
- int fVersion2 = upDatezbGateway.getGwInfo.ZbFWVersion;
- string imageType2 = upDatezbGateway.getGwInfo.ZbImageType.ToString();
+ int fVersion2 = upDatezbGateway.CoordinatorFirmwareVersion;
+ string imageType2 = upDatezbGateway.CoordinatorImageId.ToString();
foreach (var data in listData2)
{
if (data.ImagType == imageType2 && fVersion2 == data.FirmwareVersion)
@@ -183,8 +183,7 @@
rowlayout.ButtonClickEvent += (sender, e) =>
{
- string gwID = HdlGatewayLogic.Current.GetGatewayId(upDatezbGateway);
- if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(gwID) == true)
+ if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(upDatezbGateway.GwId) == true)
{
this.CloseForm();
return;
--
Gitblit v1.8.0