Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs

@@ -147,6 +147,7 @@


            //添加监视设备新上报的事件

            GatewayResourse.NowSelectGateway.GwResDataAction += this.AdjustGatewayResultData;

            //开启连接的假想动画效果线程
            this.StartConcetionAnimeteThread();
        }

@@ -459,7 +460,7 @@
                //文本显示

                btnProgressView.Text = ((int)(result * 100)) + "%";

                //文本显示的那个图片框移动

                frameProgress.X = ControlCommonResourse.XXLeft + btnProgressBar.Right - frameProgress.Width / 2;

                frameProgress.X = Application.GetRealWidth(262) + btnProgressBar.Right - frameProgress.Width / 2;

            });

        }