2020.06.12

lss

2020-06-12 9c16d3614d9b88c637f967518a329f239fcd3aaf

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceHistoryFirmwareVersionForm.cs

@@ -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.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;