From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
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 5311b7f..ae0c5ab 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
@@ -77,12 +77,12 @@
bodyFrameLayout.AddChidren(listView);
//缃戝叧
- var listData1 = HdlFirmwareUpdateLogic.Current.GetFirmwareVersionListInfo(FirmwareLevelType.Linux,
+ var listData1 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Linux,
upDatezbGateway.LinuxHardVersion.ToString(),
upDatezbGateway.LinuxImageType.ToString());
//鍗忚皟鍣�
- var listData2 = HdlFirmwareUpdateLogic.Current.GetFirmwareVersionListInfo(FirmwareLevelType.A鍗忚皟鍣�,
+ 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.Current.GetFirmwareVersionListInfo(FirmwareLevelType.A铏氭嫙椹卞姩,
+ listData3 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.A铏氭嫙椹卞姩,
this.listVode[0].DriveHwVersion.ToString(),
this.listVode[0].DriveImageType.ToString());
}
@@ -173,8 +173,8 @@
rowlayout.AddTopView(info.ShowName, 800);
//鍥轰欢淇℃伅
- string firmwareText = HdlDeviceCommonLogic.Current.AppendVersion(info.FirmwareVersion);
- firmwareText += " " + HdlCommonLogic.Current.ConvertUtcTimeToLocalTime(info.CreatedOnUtc).ToString("yyyy/MM/dd HH:mm:ss");
+ string firmwareText = Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion);
+ firmwareText += " " + UserCenterLogic.ConvertUtcTimeToLocalTime(info.CreatedOnUtc).ToString("yyyy/MM/dd HH:mm:ss");
rowlayout.AddBottomView(firmwareText, 800);
//鍚戝彸鐨勫浘鏍�
@@ -183,7 +183,7 @@
rowlayout.ButtonClickEvent += (sender, e) =>
{
- if (HdlFirmwareUpdateResourse.dicUpdateList.ContainsKey(upDatezbGateway.GwId) == true)
+ if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(upDatezbGateway.GwId) == true)
{
this.CloseForm();
return;
--
Gitblit v1.8.0