合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

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

@@ -21,9 +21,9 @@
        /// </summary>

        private bool isDeviceThreadStart = false;

        /// <summary>

        /// 等待设备的回馈的超时时间(单位：秒)

        /// 等待设备的回馈的超时时间(单位：百毫秒)

        /// </summary>

        private int waitDeviceTimeOut = 3;

        private int waitDeviceTimeOut = 20;

        /// <summary>

        /// 主题超时的线程是否开启

        /// </summary>

@@ -226,7 +226,7 @@
                }



                //刷新超时时间

                this.waitDeviceTimeOut = 3;

                this.waitDeviceTimeOut = 20;



                //获取设备的固定属性

                HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);

@@ -263,12 +263,12 @@
                while (this.waitDeviceTimeOut >= 0)

                {

                    //等待下一个回路

                    System.Threading.Thread.Sleep(1000);

                    System.Threading.Thread.Sleep(100);

                    this.waitDeviceTimeOut--;

                }

                //停止接收

                this.realGateway.GwResDataAction -= this.AdjustGatewayResultData;

                System.Threading.Thread.Sleep(500);

                System.Threading.Thread.Sleep(200);



                //目前就弄一个

                Application.RunOnMainThread(() =>

@@ -428,8 +428,8 @@
                if (info.Result != 0)

                {

                    //出现未知错误,请重新入网

                    this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndReAccessNetwork));

                    //HdlLogLogic.Current.WriteLog(-1, resultData);

                    //this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndReAccessNetwork));

                    HdlLogLogic.Current.WriteLog(-1, resultData);

                    return 2;

                }

                this.topTimeOut = topMaxTime;