From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs | 59 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs
index d6d901c..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>();
@@ -98,8 +98,9 @@
HdlThreadLogic.Current.RunMainInThread(() =>
{
- int fVersion1 = upDatezbGateway.getGwInfo.LinuxFWVersion;
- string imageType1 = upDatezbGateway.getGwInfo.LinuxImageType.ToString();
+ bool canAddTitle = true;
+ int fVersion1 = upDatezbGateway.LinuxFirmwareVersion;
+ string imageType1 = upDatezbGateway.LinuxImageType.ToString();
foreach (var data in listData1)
{
if (data.ImagType == imageType1 && fVersion1 == data.FirmwareVersion)
@@ -107,11 +108,17 @@
//鍚屼竴涓笢瑗匡紝涓嶆樉绀哄嚭鏉�
continue;
}
+ if (canAddTitle == true)
+ {
+ this.AddTitleRowlayout("Linux妯″潡");
+ canAddTitle = false;
+ }
this.AddRowlayout(data, FirmwareLevelType.Linux);
}
- int fVersion2 = upDatezbGateway.getGwInfo.ZbFWVersion;
- string imageType2 = upDatezbGateway.getGwInfo.ZbImageType.ToString();
+ canAddTitle = true;
+ int fVersion2 = upDatezbGateway.CoordinatorFirmwareVersion;
+ string imageType2 = upDatezbGateway.CoordinatorImageId.ToString();
foreach (var data in listData2)
{
if (data.ImagType == imageType2 && fVersion2 == data.FirmwareVersion)
@@ -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();
@@ -166,8 +183,7 @@
rowlayout.ButtonClickEvent += (sender, e) =>
{
- string gwID = HdlGatewayLogic.Current.GetGatewayId(upDatezbGateway);
- if (FirmwareUpdateResourse.dicGatewayUpdateList.ContainsKey(gwID) == true)
+ if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(upDatezbGateway.GwId) == true)
{
this.CloseForm();
return;
@@ -193,6 +209,19 @@
}
/// <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 CloseFormBefore()
--
Gitblit v1.8.0