请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

@@ -65,7 +65,7 @@


            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(() =>

            {

@@ -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();