界面微调

parkMonitor/App.xaml

@@ -2,8 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:parkMonitor"
-             StartupUri="/view/mainWin/MainWindow.xaml"
-             ShutdownModel="OnMainWindowClose">
+             StartupUri="/view/mainWin/MainWindow.xaml">
     <Application.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>

parkMonitor/Properties/Resources.Designer.cs

@@ -120,6 +120,16 @@ namespace parkMonitor.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap circulate {
+            get {
+                object obj = ResourceManager.GetObject("circulate", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

parkMonitor/Properties/Resources.resx

@@ -136,6 +136,9 @@
   <data name="check" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resource\image\menu\check.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="circulate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resource\image\map\circulate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="close" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resource\image\menu\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

parkMonitor/parkMonitor.csproj

@@ -582,6 +582,7 @@
     <Resource Include="resource\image\treeList.png" />
     <Resource Include="resource\image\map\plc.png" />
     <Resource Include="resource\image\map\sensor.png" />
+    <Resource Include="resource\image\map\circulate.png" />
     <Content Include="sdk\mysql\MySql.Data.dll" />
     <Content Include="sdk\VZ_Sdk\iDecoders.dll" />
     <Content Include="sdk\VZ_Sdk\VzDrawsLib.dll" />

parkMonitor/server/CoreThread/AbstractCmd.cs

@@ -466,9 +466,9 @@ namespace parkMonitor.server.CoreThread
                 dataReal = WaitForLaserResource(queueCmd, disappeared);
             });
             Task.WaitAll(parkingSpace, dataFromLaser);
-            if (ppp == null && dataReal == null)
+            if (ppp == null)
             {
-                //系统回滚
+                return;
             }
             //车位
             int parkingSpaceID = ppp.parkingSpaceID;
@@ -493,6 +493,10 @@ namespace parkMonitor.server.CoreThread
                 freeSpaceCount = freeSpaceCount - 1;
                 locationOper.UpdateGarageFreeSpace(freeSpaceCount, garageID);         
             }
+            if(dataReal == null)
+            {
+                //系统回滚
+            }
             //激光数据
             int centerX = dataReal.centerX;
             int centerY = dataReal.centerY;