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/Device/DeviceHistoryFirmwareVersionForm.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
index bb34580..335fd9b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
@@ -59,18 +59,18 @@
}
//鑾峰彇鍘嗗彶鐗堟湰
- var listData = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.ZigbeeDevice,
+ var listData = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.A璁惧,
oTADevice.HwVersion.ToString(),
oTADevice.ImgTypeId.ToString());
string unSelectPic = string.Empty;
string selectPic = string.Empty;
- Common.LocalDevice.Current.GetDeviceBeloneIcon(listUpdateDevice, ref unSelectPic, ref selectPic);
+ Common.LocalDevice.Current.GetDeviceObjectIcon(listUpdateDevice, ref unSelectPic, ref selectPic);
HdlThreadLogic.Current.RunThread(() =>
{
string ImagType = oTADevice.ImgTypeId.ToString();
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
foreach (var data in listData)
{
@@ -99,18 +99,20 @@
var btnIcon = rowlayout.AddLeftIcon();
btnIcon.UnSelectedImagePath = unSelPath;
//鎸囧畾鐨勮澶�
- rowlayout.AddLeftCaption(info.ShowName, 800);
+ rowlayout.AddTopView(info.ShowName, 800);
//鍚戝彸鐨勫浘鏍�
rowlayout.AddRightArrow();
//鍥轰欢淇℃伅
- rowlayout.AddMostRightView(Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion), 300);
+ 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.AddBottomLine();
rowlayout.ButtonClickEvent += (sender, e) =>
{
string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(this.listUpdateDevice[0]);
- if (FirmwareUpdateResourse.dicDeviceUpdateList.ContainsKey(mainKeys) == true)
+ if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(mainKeys) == true)
{
this.CloseForm();
return;
--
Gitblit v1.8.0