Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

@@ -96,11 +96,13 @@
            this.ClearBodyFrame();



            //图片

            var btnPic = new PicViewControl(878, 478);

            btnPic.Y = Application.GetRealHeight(251);

            btnPic.Gravity = Gravity.CenterHorizontal;

            btnPic.UnSelectedImagePath = "Instruct/DeviceSearch.png";

            bodyFrameLayout.AddChidren(btnPic);

            var framePic = new FrameLayout();

            framePic.Width = this.GetPictrueRealSize(878);

            framePic.Height = this.GetPictrueRealSize(478);

            framePic.Y = Application.GetRealHeight(251);

            framePic.Gravity = Gravity.CenterHorizontal;

            framePic.BackgroundImagePath = "Instruct/DeviceSearch.png";

            bodyFrameLayout.AddChidren(framePic);



            //正在搜索设备，请稍候…

            var btnSearch = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(58), false);

@@ -150,7 +152,7 @@
                this.realGateway.GwResDataAction += this.AdjustGatewayResultData;

            }

            //开启连接的假想动画效果线程

            this.StartConcetionAnimeteThread();

            this.StartConcetionAnimeteThread(framePic);

        }



        #endregion

@@ -211,7 +213,7 @@
                //添加设备的缓存

                device.IsOnline = 1;

                Common.LocalDevice.Current.AddDeviceToMemory(ref device);

 


                if (this.dicNewDevice.ContainsKey(device.DeviceAddr) == false)

                {

                    this.dicNewDevice[device.DeviceAddr] = new List<CommonDevice>();

@@ -312,7 +314,7 @@
        /// <summary>

        /// 开启连接的假想动画效果线程

        /// </summary>

        private void StartConcetionAnimeteThread()

        private void StartConcetionAnimeteThread(FrameLayout framePic)

        {

            int iconSize = this.GetPictrueRealSize(23);



@@ -320,15 +322,15 @@
            for (int i = 0; i < 9; i++)

            {

                //X轴+Index*(图标大小+间距)

                listPoint.Add(this.GetPictrueRealSize(394) + i * (iconSize + this.GetPictrueRealSize(10)));

                listPoint.Add(this.GetPictrueRealSize(300) + i * (iconSize + this.GetPictrueRealSize(10)));

            }



            var btnRound = new PicViewControl(iconSize, iconSize, false);

            btnRound.Radius = (uint)iconSize / 2;

            btnRound.BackgroundColor = UserCenterColor.Current.ConcetionRoundColor;

            btnRound.X = listPoint[0];

            btnRound.Y = this.GetPictrueRealSize(475);

            bodyFrameLayout.AddChidren(btnRound);

            btnRound.Y = this.GetPictrueRealSize(225);

            framePic.AddChidren(btnRound);



            HdlThreadLogic.Current.RunThread(() =>

            {