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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/UserCenter/DeviceShard/ShardDeviceMacInfoEditorForm.cs

@@ -52,7 +52,8 @@
        /// </summary>
        private void InitMiddleFrame()
        {
            this.bodyFrameLayout.RemoveAll();

            //清空bodyFrame

            this.ClearBodyFrame();


            //设备图片
            var btnpictrue = new PicViewControl(510, 320);

@@ -182,7 +183,7 @@
            new System.Threading.Thread(async () =>

            {

                //设置设备全部的镜像信息

                Common.LocalDevice.Current.SetAllImageInfoToOtaDevice(oTADevice, this.OtaImageInfoActionBack);

                HdlDeviceImageInfoLogic.Current.SetAllImageInfoToOtaDevice(oTADevice, this.OtaImageInfoActionBack);

                int count = 5;

                while (this.receiveImageInfo == false && count > 0)

                {

@@ -192,6 +193,8 @@
                }

                //变量还原 

                this.receiveImageInfo = false;

                //移除事件

                HdlDeviceImageInfoLogic.Current.RemoveDeviceFirmwareVersionThread(oTADevice);



                //关闭进度条

                this.CloseProgressBar();

@@ -229,11 +232,21 @@

            Application.RunOnMainThread(() =>
            {

                if (ActionFormClose != null)

                {

                    this.ActionFormClose(deviceName);

                }

            });
                this.ActionFormClose?.Invoke(deviceName);

            });

        }



        #endregion



        #region ■ 关闭界面___________________________



        /// <summary>

        /// 画面关闭

        /// </summary>

        public override void CloseForm()

        {

            this.ActionFormClose = null;

            base.CloseForm();
        }



        #endregion