合并了代码

黄学彪

2020-12-31 fe3b2466c68b5db70d38e78039703add3b8b1dfe

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs

@@ -146,6 +146,18 @@
            //发送数据
            myGateway.Send(sendTopic, sendData);

            //超时时间
            int TimeOut = 0;
            waitTime = 20 * waitTime;
            while (listCheckTopic.Count != listReceiptTopic.Count && TimeOut < waitTime)
            {
                //全部接收才退出
                System.Threading.Thread.Sleep(50);
                TimeOut++;
            }
            myGateway.Actions -= receiptAction;
            receiptAction = null;

            int receveCount = listCheckTopic.Count;
            if (receveCount > 1)
            {
@@ -161,17 +173,6 @@
                receveCount = listTemp.Count;
            }

            //超时时间
            int TimeOut = 0;
            waitTime = 20 * waitTime;
            while (receveCount != listReceiptTopic.Count && TimeOut < waitTime)
            {
                //全部接收才退出
                System.Threading.Thread.Sleep(50);
                TimeOut++;
            }
            myGateway.Actions -= receiptAction;
            receiptAction = null;
            if (receveCount != listReceiptTopic.Count)
            {
                reResult.ErrorMsgDiv = 0;