黄学彪
2020-09-01 dee21bf452a8979d0515d13e534fbb69ed9715dd
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;