From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板:绑定温湿度传感器目标,和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
index 7e77e24..335fd9b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs
@@ -59,7 +59,7 @@
             }
 
             //鑾峰彇鍘嗗彶鐗堟湰
-            var listData = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.ZigbeeDevice,
+            var listData = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.A璁惧,
                 oTADevice.HwVersion.ToString(),
                 oTADevice.ImgTypeId.ToString());
 
@@ -70,7 +70,7 @@
             HdlThreadLogic.Current.RunThread(() =>
             {
                 string ImagType = oTADevice.ImgTypeId.ToString();
-                Application.RunOnMainThread(() =>
+                HdlThreadLogic.Current.RunMain(() =>
                 {
                     foreach (var data in listData)
                     {
@@ -99,11 +99,13 @@
             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();
 

--
Gitblit v1.8.0