From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
index 7e77e24..a2aec74 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
@@ -29,7 +29,7 @@
/// <param name="deviceMac">璁惧Mac鍦板潃</param>
public void ShowForm(string deviceMac)
{
- this.listUpdateDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
+ this.listUpdateDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceMac);
//璁剧疆鏍囬淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uHistoryVersion));
@@ -52,25 +52,25 @@
bodyFrameLayout.AddChidren(listView);
//鎷ユ湁200绔彛杩欎釜涓滆タ鐨勬椂鍊欙紝鎵嶄細鏄剧ず
- var oTADevice = Common.LocalDevice.Current.GetOTADevice(listUpdateDevice[0].DeviceAddr);
+ var oTADevice = HdlDeviceCommonLogic.Current.GetOTADevice(listUpdateDevice[0].DeviceAddr);
if (oTADevice == null || oTADevice.ImgVersion == -1)
{
return;
}
//鑾峰彇鍘嗗彶鐗堟湰
- var listData = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.ZigbeeDevice,
+ var listData = HdlFirmwareUpdateLogic.Current.GetFirmwareVersionListInfo(FirmwareLevelType.A璁惧,
oTADevice.HwVersion.ToString(),
oTADevice.ImgTypeId.ToString());
string unSelectPic = string.Empty;
string selectPic = string.Empty;
- Common.LocalDevice.Current.GetDeviceObjectIcon(listUpdateDevice, ref unSelectPic, ref selectPic);
+ HdlDeviceCommonLogic.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 = HdlDeviceCommonLogic.Current.AppendVersion(info.FirmwareVersion);
+ firmwareText += " " + HdlCommonLogic.Current.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.dicUpdateList.ContainsKey(mainKeys) == true)
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(this.listUpdateDevice[0]);
+ if (HdlFirmwareUpdateResourse.dicUpdateList.ContainsKey(mainKeys) == true)
{
this.CloseForm();
return;
--
Gitblit v1.8.0