Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 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>

@@ -111,7 +110,7 @@
            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;