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

WJC

2019-10-29 8245dd3bba861d60556cd4804b39bca74c19c329

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/GatewayFirmwareUpdateControl.cs

@@ -112,14 +112,14 @@


            //指定的设备

            var btnDevice = frameLayout.frameTable.AddLeftCaption("", 830);

            btnDevice.Y = UserCenterLogic.GetControlChidrenYaxis(ControlCommonResourse.ListViewRowHeight, ControlCommonResourse.ListViewRowHalfHeight, UViewAlignment.Top);

            //btnDevice.Y = UserCenterLogic.GetControlChidrenYaxis(ControlCommonResourse.ListViewRowHeight, ControlCommonResourse.ListViewRowHalfHeight, UViewAlignment.Top);

            btnDevice.X = Application.GetRealWidth(200);

            btnDevice.BackgroundColor = UserCenterColor.Current.Transparent;

            btnDevice.Text = HdlGatewayLogic.Current.GetGatewayName(upDatezbGateway);



            //固件信息

            this.btnProgress = frameLayout.frameTable.AddLeftCaption("", 830);

            btnDevice.Y = UserCenterLogic.GetControlChidrenYaxis(ControlCommonResourse.ListViewRowHeight, ControlCommonResourse.ListViewRowHalfHeight, UViewAlignment.Bottom);

            //btnDevice.Y = UserCenterLogic.GetControlChidrenYaxis(ControlCommonResourse.ListViewRowHeight, ControlCommonResourse.ListViewRowHalfHeight, UViewAlignment.Bottom);

            btnDevice.X = Application.GetRealWidth(200);

            btnProgress.BackgroundColor = UserCenterColor.Current.Transparent;

            if (this.gatewayFirmware != null)

@@ -858,7 +858,7 @@
        /// </summary>

        private void ShowFinishMsg()

        {

            new System.Threading.Thread(() =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //状态变更

                this.IsFinishUpdate = true;

@@ -888,8 +888,7 @@
                    this.btnUpdateButton.SetNotClickStatu();



                });

            })

            { IsBackground = true }.Start();

            });

        }



        #endregion

@@ -1022,7 +1021,7 @@
        private void StartDownLoadTimeOutThread()

        {

            this.downLoadTimeOutCount = 30;

            new System.Threading.Thread(() =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                while (true)

                {

@@ -1051,8 +1050,7 @@
                        break;

                    }

                }

            })

            { IsBackground = true }.Start();

            });

        }



        /// <summary>

@@ -1086,7 +1084,7 @@
            //超时时间设置

            this.updateTimeOutCount = 60;



            new System.Threading.Thread(() =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                while (this.IsFinishUpdate == false)

                {

@@ -1124,8 +1122,7 @@
                    //设置错误信息

                    this.ShowErrorMsg(this.errorMsg);

                }

            })

            { IsBackground = true }.Start();

            });

        }



        /// <summary>

@@ -1173,7 +1170,7 @@
        /// <returns></returns>

        private void StartGetGatewayVersionThread()

        {

            new System.Threading.Thread(async () =>

            HdlThreadLogic.Current.RunThread(async () =>

            {

                //当前网关的版本

                var oldVersion = HdlGatewayLogic.Current.GetGwInfoAttribute(this.upDatezbGateway, "LinuxFWVersion");

@@ -1208,8 +1205,7 @@
                }

                //已经能够获取数据

                this.ShowFinishMsg();

            })

            { IsBackground = true }.Start();

            });

        }



        #endregion