2020.06.24.01

陈嘉乐

2020-06-24 adb12dcdbb2ddaeac687c3aa9e57bb7ed459ab7e

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

@@ -78,13 +78,13 @@


            //网关

            var listData1 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Linux,

                 upDatezbGateway.getGwInfo.LinuxHWVersion.ToString(),

                 upDatezbGateway.getGwInfo.LinuxImageType.ToString());

                 upDatezbGateway.LinuxHardVersion.ToString(),

                 upDatezbGateway.LinuxImageType.ToString());



            //协调器

            var listData2 = HdlFirmwareUpdateLogic.GetFirmwareVersionListInfo(FirmwareLevelType.Coordinator,

                 upDatezbGateway.getGwInfo.ZbHWVersion.ToString(),

                 upDatezbGateway.getGwInfo.ZbImageType.ToString());

                 upDatezbGateway.CoordinatorHardVersion.ToString(),

                 upDatezbGateway.CoordinatorImageId.ToString());



            //虚拟驱动

            var listData3 = new List<FirmwareVersionInfo>();

@@ -99,8 +99,8 @@
            HdlThreadLogic.Current.RunMainInThread(() =>

            {

                bool canAddTitle = true;

                int fVersion1 = upDatezbGateway.getGwInfo.LinuxFWVersion;

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

                int fVersion1 = upDatezbGateway.LinuxFirmwareVersion;

                string imageType1 = upDatezbGateway.LinuxImageType.ToString();

                foreach (var data in listData1)

                {

                    if (data.ImagType == imageType1 && fVersion1 == data.FirmwareVersion)

@@ -117,8 +117,8 @@
                }



                canAddTitle = true;

                int fVersion2 = upDatezbGateway.getGwInfo.ZbFWVersion;

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

                int fVersion2 = upDatezbGateway.CoordinatorFirmwareVersion;

                string imageType2 = upDatezbGateway.CoordinatorImageId.ToString();

                foreach (var data in listData2)

                {

                    if (data.ImagType == imageType2 && fVersion2 == data.FirmwareVersion)

@@ -183,8 +183,7 @@


            rowlayout.ButtonClickEvent += (sender, e) =>

            {

                string gwID = HdlGatewayLogic.Current.GetGatewayId(upDatezbGateway);

                if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(gwID) == true)

                if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(upDatezbGateway.GwId) == true)

                {

                    this.CloseForm();

                    return;