Merge remote-tracking branch 'jinwang/dev' into dev

parkMonitor/server/CoreThread/AbstractCmd.cs

@@ -78,7 +78,7 @@ namespace parkMonitor.server.CoreThread
                     Thread.Sleep(200);
                 }
             });
-            parkingSpace.Wait();
+            //parkingSpace.Wait();
             int parkingSpaceID = ppp.parkingSpaceID;
             int parkingSpaceX = ppp.parkingSpaceX;
             int parkingSpaceY = ppp.parkingSpaceY;
@@ -143,8 +143,8 @@ namespace parkMonitor.server.CoreThread
                     Thread.Sleep(500);
                 }
             });
-            //Task.WaitAll(dataFromLaser);
-            dataFromLaser.Wait();
+            Task.WaitAll(dataFromLaser,parkingSpace);
+            //dataFromLaser.Wait();
 
             Console.WriteLine("停车，抓车:" + queueCmd.LicenseNum);
             Log.WriteLog("停车，抓车:" + queueCmd.LicenseNum);