From ad94907bfe5389114dcb841b339886c6a8ef6851 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 17:09:23 +0800
Subject: [PATCH] 2020-04-2-02-3
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
index c55d2ae..1730e43 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
@@ -98,6 +98,7 @@
HdlThreadLogic.Current.RunMainInThread(() =>
{
+ bool canAddTitle = true;
int fVersion1 = upDatezbGateway.getGwInfo.LinuxFWVersion;
string imageType1 = upDatezbGateway.getGwInfo.LinuxImageType.ToString();
foreach (var data in listData1)
@@ -107,9 +108,15 @@
//鍚屼竴涓笢瑗匡紝涓嶆樉绀哄嚭鏉�
continue;
}
+ if (canAddTitle == true)
+ {
+ this.AddTitleRowlayout("Linux妯″潡");
+ canAddTitle = false;
+ }
this.AddRowlayout(data, FirmwareLevelType.Linux);
}
+ canAddTitle = true;
int fVersion2 = upDatezbGateway.getGwInfo.ZbFWVersion;
string imageType2 = upDatezbGateway.getGwInfo.ZbImageType.ToString();
foreach (var data in listData2)
@@ -119,9 +126,15 @@
//鍚屼竴涓笢瑗匡紝涓嶆樉绀哄嚭鏉�
continue;
}
+ if (canAddTitle == true)
+ {
+ this.AddTitleRowlayout("鍗忚皟鍣ㄦā鍧�");
+ canAddTitle = false;
+ }
this.AddRowlayout(data, FirmwareLevelType.Coordinator);
}
+ canAddTitle = true;
string imageType3 = this.listVode[0].DriveImageType.ToString();
foreach (var data in listData3)
{
@@ -129,6 +142,11 @@
{
//鍚屼竴涓笢瑗匡紝涓嶆樉绀哄嚭鏉�
continue;
+ }
+ if (canAddTitle == true)
+ {
+ this.AddTitleRowlayout("铏氭嫙璁惧妯″潡");
+ canAddTitle = false;
}
this.AddRowlayout(data, FirmwareLevelType.VirtualDevice);
}
@@ -152,13 +170,12 @@
rowlayout.AddChidren(btnIcon);
//鎸囧畾鐨勭綉鍏�
- var btnGateway = rowlayout.AddLeftCaption(info.ShowName, Application.GetRealWidth(800), rowlayout.Height / 2, false);
- rowlayout.AddChidren(btnGateway);
+ rowlayout.AddTopView(info.ShowName, 800);
//鍥轰欢淇℃伅
- var btnVersion = rowlayout.AddLeftCaption(Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion), Application.GetRealWidth(800), rowlayout.Height / 2, false);
- btnVersion.Y = btnGateway.Bottom;
- rowlayout.AddChidren(btnVersion);
+ string firmwareText = Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion);
+ firmwareText += " " + UserCenterLogic.ConvertUtcTimeToLocalTime(info.CreatedOnUtc).ToString("yyyy/MM/dd HH:mm:ss");
+ rowlayout.AddBottomView(firmwareText, 800);
//鍚戝彸鐨勫浘鏍�
rowlayout.AddRightArrow();
@@ -167,7 +184,7 @@
rowlayout.ButtonClickEvent += (sender, e) =>
{
string gwID = HdlGatewayLogic.Current.GetGatewayId(upDatezbGateway);
- if (FirmwareUpdateResourse.dicGatewayUpdateList.ContainsKey(gwID) == true)
+ if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(gwID) == true)
{
this.CloseForm();
return;
@@ -193,13 +210,26 @@
}
/// <summary>
+ /// 娣诲姞鏍囬琛�
+ /// </summary>
+ /// <param name="title"></param>
+ private void AddTitleRowlayout(string title)
+ {
+ var rowlayout = new FrameRowControl();
+ rowlayout.UseClickStatu = false;
+ this.listView.AddChidren(rowlayout);
+
+ rowlayout.AddLeftCaption(title, 800);
+ }
+
+ /// <summary>
/// 鐣岄潰鍏抽棴
/// </summary>
- public override void CloseForm()
+ public override void CloseFormBefore()
{
SelectFirmwareInfoEvent = null;
- base.CloseForm();
+ base.CloseFormBefore();
}
}
}
--
Gitblit v1.8.0