From ade5917841b0fdcb1df7353ef7c56b1a1bdc9282 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 22 九月 2020 10:03:32 +0800
Subject: [PATCH] 删除 Gateway.Ios文件
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
index a976b54..3883568 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
@@ -10,9 +10,9 @@
/// </summary>
public class DeviceHistoryFirmwareVersionForm : EditorCommonForm
{
- /// <summary>
- /// 鍗囩骇鐨勮澶�
- /// </summary>
+ /// <summary>
+ /// 鍗囩骇鐨勮澶�
+ /// </summary>
private List<CommonDevice> listUpdateDevice = null;
/// <summary>
/// 鍒楄〃鎺т欢
@@ -26,22 +26,22 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- /// <param name="deviceMac">璁惧Mac鍦板潃</param>
- public void ShowForm(string deviceMac)
- {
- this.listUpdateDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
-
- //璁剧疆鏍囬淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uHistoryVersion));
-
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄦ帶浠�
- /// </summary>
- private void InitMiddleFrame()
+ /// <param name="deviceMac">璁惧Mac鍦板潃</param>
+ public void ShowForm(string deviceMac)
+ {
+ this.listUpdateDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
+
+ //璁剧疆鏍囬淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uHistoryVersion));
+
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�
+ /// </summary>
+ private void InitMiddleFrame()
{
//娓呯┖bodyFrame
this.ClearBodyFrame();
@@ -51,8 +51,8 @@
listView.BackgroundColor = UserCenterColor.Current.White;
bodyFrameLayout.AddChidren(listView);
- //鎷ユ湁200绔彛杩欎釜涓滆タ鐨勬椂鍊欙紝鎵嶄細鏄剧ず
- var oTADevice = Common.LocalDevice.Current.GetOTADevice(listUpdateDevice[0].DeviceAddr);
+ //鎷ユ湁200绔彛杩欎釜涓滆タ鐨勬椂鍊欙紝鎵嶄細鏄剧ず
+ var oTADevice = Common.LocalDevice.Current.GetOTADevice(listUpdateDevice[0].DeviceAddr);
if (oTADevice == null || oTADevice.ImgVersion == -1)
{
return;
@@ -65,9 +65,9 @@
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);
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
string ImagType = oTADevice.ImgTypeId.ToString();
Application.RunOnMainThread(() =>
@@ -82,8 +82,7 @@
this.AddRowlayout(data, unSelectPic, selectPic);
}
});
- })
- { IsBackground = true }.Start();
+ });
}
/// <summary>
@@ -100,18 +99,20 @@
var btnIcon = rowlayout.AddLeftIcon();
btnIcon.UnSelectedImagePath = unSelPath;
//鎸囧畾鐨勮澶�
- rowlayout.AddLeftCaption(info.ShowName, 800);
+ rowlayout.AddTopView(info.ShowName, 800);
//鍚戝彸鐨勫浘鏍�
- rowlayout.AddRightIconControl();
+ 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