黄学彪
2019-11-25 5727cf0b9b54da0a191dd1e23cb5abf21320fbff
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -31,7 +31,11 @@
        /// <summary>
        /// 主题间的超时时间 -100:中断线程(单位:秒)
        /// </summary>
        private int topTimeOut = 60;
        private int topTimeOut = 120;
        /// <summary>
        /// 超时最大时间
        /// </summary>
        private int topMaxTime = 120;
        /// <summary>
        /// 画面ID,标记它由哪个界面调用并打开的
        /// </summary>
@@ -147,9 +151,6 @@
            //添加监视设备新上报的事件
            GatewayResourse.NowSelectGateway.GwResDataAction += this.AdjustGatewayResultData;
            //开启连接的假想动画效果线程
            this.StartConcetionAnimeteThread();
        }
        #endregion
@@ -366,7 +367,7 @@
        {
            if (topic == gatewayId + "/Device/DeviceAnnounce_Respon")
            {
                this.topTimeOut = 60;
                this.topTimeOut = topMaxTime;
                //网关告知客户端有设备声明
                this.SetDeviceProgressValue(1);
                return 2;
@@ -383,7 +384,7 @@
                    HdlLogLogic.Current.WriteLog(-1, resultData);
                    return 2;
                }
                this.topTimeOut = 60;
                this.topTimeOut = topMaxTime;
                //设置进度值
                this.SetDeviceProgressValue(2);
                return 2;
@@ -400,7 +401,7 @@
                    HdlLogLogic.Current.WriteLog(-1, resultData);
                    return 2;
                }
                this.topTimeOut = 60;
                this.topTimeOut = topMaxTime;
                //设置进度值
                this.SetDeviceProgressValue(3);
                return 2;
@@ -417,7 +418,7 @@
                    //HdlLogLogic.Current.WriteLog(-1, resultData);
                    return 2;
                }
                this.topTimeOut = 60;
                this.topTimeOut = topMaxTime;
                //设置进度值
                this.SetDeviceProgressValue(4);
                return 2;
@@ -434,7 +435,7 @@
                    HdlLogLogic.Current.WriteLog(-1, resultData);
                    return 2;
                }
                this.topTimeOut = 60;
                this.topTimeOut = topMaxTime;
                //设置进度值
                this.SetDeviceProgressValue(5);
                return 2;