原来的 IOS 工程舍弃（注：没有合并其他组员的代码）

黄学彪

2019-11-25 160785587667cc0d927f85e44c139ec9dde13a9e

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

@@ -68,25 +68,25 @@
        /// <summary>

        /// 画面显示(底层会固定调用此方法，借以完成画面创建)

        /// </summary>

        /// <param name="i_formId">画面ID,标记它由哪个界面调用并打开的</param>
        public void ShowForm(string i_formId)
        {
            this.targetFormId = i_formId;

            //设置标题信息
            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));

            this.gatewayId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);
            HdlGatewayLogic.Current.GetRealGateway(ref this.realGateway, this.gatewayId);

            //初始化中部控件
            this.InitMiddleFrame();
        }

        /// <summary>
        /// 初始化中部控件
        /// </summary>
        private void InitMiddleFrame()
        /// <param name="i_formId">画面ID,标记它由哪个界面调用并打开的</param>

        public void ShowForm(string i_formId)

        {

            this.targetFormId = i_formId;



            //设置标题信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));



            this.gatewayId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);

            HdlGatewayLogic.Current.GetRealGateway(ref this.realGateway, this.gatewayId);



            //初始化中部控件

            this.InitMiddleFrame();

        }



        /// <summary>

        /// 初始化中部控件

        /// </summary>

        private void InitMiddleFrame()

        {

            //清空bodyFrame

            this.ClearBodyFrame();

@@ -107,17 +107,17 @@
            bodyFrameLayout.AddChidren(btnSearch);



            //进度条

            var btnProRow = new FrameLayout();
            btnProRow.Gravity = Gravity.CenterHorizontal;
            btnProRow.Y = Application.GetRealHeight(861);
            btnProRow.Width = Application.GetRealWidth(559);
            btnProRow.Height = Application.GetRealHeight(29);
            var btnProRow = new FrameLayout();

            btnProRow.Gravity = Gravity.CenterHorizontal;

            btnProRow.Y = Application.GetRealHeight(861);

            btnProRow.Width = Application.GetRealWidth(559);

            btnProRow.Height = Application.GetRealHeight(29);

            btnProRow.BackgroundColor = 0xffe6e6e6;

            btnProRow.Radius = (uint)Application.GetRealHeight(29) / 2;

            bodyFrameLayout.AddChidren(btnProRow);
            this.btnProgressBar = new FrameLayout();
            btnProgressBar.Width = 0;
            btnProgressBar.Height = btnProRow.Height;
            bodyFrameLayout.AddChidren(btnProRow);

            this.btnProgressBar = new FrameLayout();

            btnProgressBar.Width = 0;

            btnProgressBar.Height = btnProRow.Height;

            btnProgressBar.Radius = btnProRow.Radius;

            btnProgressBar.BackgroundColor = 0xfffb744a;

            btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2;

@@ -149,13 +149,15 @@
                        return;

                    }

                    //让网关允许入网

                    this.realGateway.AddNewDeviceToGateway(255);

                    this.realGateway.AddNewDeviceToGateway(180);

                    System.Threading.Thread.Sleep(1000);

                }

            });



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

            this.realGateway.GwResDataAction += this.AdjustGatewayResultData;
            this.realGateway.GwResDataAction += this.AdjustGatewayResultData;

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

            this.StartConcetionAnimeteThread();

        }



        #endregion

@@ -339,9 +341,17 @@
            HdlThreadLogic.Current.RunThread(() =>

            {

                int index = 1;

                int timeCount = 0;

                while (this.Parent != null)

                {

                    System.Threading.Thread.Sleep(500);

                    timeCount++;

                    if (timeCount >= 240)

                    {

                        //120秒后,再次发送网关设备入网命令

                        this.realGateway.AddNewDeviceToGateway(180);

                        timeCount = 0;

                    }

                    Application.RunOnMainThread(() =>

                    {

                        if (btnRound != null)

@@ -516,10 +526,9 @@


        /// <summary>

        /// 画面关闭

        /// </summary>
        public override void CloseForm()
        {
            base.CloseForm();

        /// </summary>

        public override void CloseFormBefore()

        {

            //停止接收

            this.realGateway.GwResDataAction -= this.AdjustGatewayResultData;



@@ -529,6 +538,7 @@
                //关闭入网模式

                this.realGateway.AddNewDeviceToGateway(0);

            });

            base.CloseFormBefore();

        }



        #endregion