先上传个版本吧

黄学彪

2020-02-21 bd46c57c77c276014db3192a4e2cc96e23c93202

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs

@@ -98,6 +98,7 @@


            HdlThreadLogic.Current.RunMainInThread(() =>

            {

                bool canAddTitle = true;

                int fVersion1 = upDatezbGateway.getGwInfo.LinuxFWVersion;

                string imageType1 = upDatezbGateway.getGwInfo.LinuxImageType.ToString();

                foreach (var data in listData1)

@@ -107,9 +108,15 @@
                        //同一个东西，不显示出来

                        continue;

                    }

                    if (canAddTitle == true)

                    {

                        this.AddTitleRowlayout("Linux模块");

                        canAddTitle = false;

                    }

                    this.AddRowlayout(data, FirmwareLevelType.Linux);

                }



                canAddTitle = true;

                int fVersion2 = upDatezbGateway.getGwInfo.ZbFWVersion;

                string imageType2 = upDatezbGateway.getGwInfo.ZbImageType.ToString();

                foreach (var data in listData2)

@@ -119,9 +126,15 @@
                        //同一个东西，不显示出来

                        continue;

                    }

                    if (canAddTitle == true)

                    {

                        this.AddTitleRowlayout("协调器模块");

                        canAddTitle = false;

                    }

                    this.AddRowlayout(data, FirmwareLevelType.Coordinator);

                }



                canAddTitle = true;

                string imageType3 = this.listVode[0].DriveImageType.ToString();

                foreach (var data in listData3)

                {

@@ -129,6 +142,11 @@
                    {

                        //同一个东西，不显示出来

                        continue;

                    }

                    if (canAddTitle == true)

                    {

                        this.AddTitleRowlayout("虚拟设备模块");

                        canAddTitle = false;

                    }

                    this.AddRowlayout(data, FirmwareLevelType.VirtualDevice);

                }

@@ -152,13 +170,12 @@
            rowlayout.AddChidren(btnIcon);



            //指定的网关

            var btnGateway = rowlayout.AddLeftCaption(info.ShowName, Application.GetRealWidth(800), rowlayout.Height / 2, false);

            rowlayout.AddChidren(btnGateway);

            rowlayout.AddTopView(info.ShowName, 800);



            //固件信息

            var btnVersion = rowlayout.AddLeftCaption(Common.LocalDevice.Current.AppendVersion(info.FirmwareVersion), Application.GetRealWidth(800), rowlayout.Height / 2, false);

            btnVersion.Y = btnGateway.Bottom;

            rowlayout.AddChidren(btnVersion);

            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.AddRightArrow();

@@ -193,6 +210,19 @@
        }



        /// <summary>

        /// 添加标题行

        /// </summary>

        /// <param name="title"></param>

        private void AddTitleRowlayout(string title)

        {

            var rowlayout = new FrameRowControl();

            rowlayout.UseClickStatu = false;

            this.listView.AddChidren(rowlayout);



            rowlayout.AddLeftCaption(title, 800);

        }



        /// <summary>

        /// 界面关闭

        /// </summary>

        public override void CloseFormBefore()