From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
index ae56315..ae0c5ab 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
@@ -82,7 +82,7 @@
upDatezbGateway.LinuxImageType.ToString());
//鍗忚皟鍣�
- var listData2 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Coordinator,
+ var listData2 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.A鍗忚皟鍣�,
upDatezbGateway.CoordinatorHardVersion.ToString(),
upDatezbGateway.CoordinatorImageId.ToString());
@@ -91,7 +91,7 @@
if (this.listVode != null && this.listVode.Count > 0)
{
//濡傛灉杩欎釜缃戝叧瑕佹湁铏氭嫙椹卞姩杩欎釜涓滆タ鐨勬椂鍊欐墠鑰冭檻
- listData3 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.VirtualDevice,
+ listData3 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.A铏氭嫙椹卞姩,
this.listVode[0].DriveHwVersion.ToString(),
this.listVode[0].DriveImageType.ToString());
}
@@ -131,7 +131,7 @@
this.AddTitleRowlayout("鍗忚皟鍣ㄦā鍧�");
canAddTitle = false;
}
- this.AddRowlayout(data, FirmwareLevelType.Coordinator);
+ this.AddRowlayout(data, FirmwareLevelType.A鍗忚皟鍣�);
}
canAddTitle = true;
@@ -148,7 +148,7 @@
this.AddTitleRowlayout("铏氭嫙璁惧妯″潡");
canAddTitle = false;
}
- this.AddRowlayout(data, FirmwareLevelType.VirtualDevice);
+ this.AddRowlayout(data, FirmwareLevelType.A铏氭嫙椹卞姩);
}
listView.AdjustRealHeight(Application.GetRealHeight(23));
});
@@ -192,11 +192,11 @@
{
this.gatewayFirmware = info;
}
- else if (levelType == FirmwareLevelType.Coordinator)
+ else if (levelType == FirmwareLevelType.A鍗忚皟鍣�)
{
this.coordinatorFirmware = info;
}
- else if (levelType == FirmwareLevelType.VirtualDevice)
+ else if (levelType == FirmwareLevelType.A铏氭嫙椹卞姩)
{
this.virtualFirmware = info;
this.virtualFirmware.VirtualCode = this.listVode[0].DriveCode;
--
Gitblit v1.8.0