Explorar el Código

根据地感拍号牌提示调整

yct hace 6 años
padre
commit
124d848955
Se han modificado 22 ficheros con 16 adiciones y 10 borrados
  1. BIN
      PLCLinker/PLCLinker/bin/Release/PLCLinker.exe
  2. BIN
      PLCLinker/PLCLinker/bin/Release/PLCLinker.pdb
  3. 1 1
      PLCLinker/PLCLinker/obj/Release/PLCLinker.csproj.CoreCompileInputs.cache
  4. 3 0
      PLCLinker/PLCLinker/obj/Release/PLCLinker.csproj.FileListAbsolute.txt
  5. BIN
      PLCLinker/PLCLinker/obj/Release/PLCLinker.exe
  6. BIN
      PLCLinker/PLCLinker/obj/Release/PLCLinker.pdb
  7. BIN
      PLCLinker/PLCS7/bin/Release/PLCS7.dll
  8. BIN
      PLCLinker/PLCS7/bin/Release/PLCS7.pdb
  9. 1 1
      PLCLinker/PLCS7/obj/Release/PLCS7.csproj.CoreCompileInputs.cache
  10. 2 0
      PLCLinker/PLCS7/obj/Release/PLCS7.csproj.FileListAbsolute.txt
  11. BIN
      PLCLinker/PLCS7/obj/Release/PLCS7.dll
  12. BIN
      PLCLinker/PLCS7/obj/Release/PLCS7.pdb
  13. 6 6
      PLCLinker/centralController/Terminal/Terminal.cs
  14. BIN
      PLCLinker/centralController/obj/Release/centralController.Properties.Resources.resources
  15. 0 1
      PLCLinker/centralController/obj/Release/centralController.csproj.FileListAbsolute.txt
  16. BIN
      PLCLinker/socketTest/bin/Release/socketTest.exe
  17. BIN
      PLCLinker/socketTest/bin/Release/socketTest.pdb
  18. 1 1
      PLCLinker/socketTest/obj/Release/socketTest.csproj.CoreCompileInputs.cache
  19. 2 0
      PLCLinker/socketTest/obj/Release/socketTest.csproj.FileListAbsolute.txt
  20. BIN
      PLCLinker/socketTest/obj/Release/socketTest.csproj.GenerateResource.Cache
  21. BIN
      PLCLinker/socketTest/obj/Release/socketTest.exe
  22. BIN
      PLCLinker/socketTest/obj/Release/socketTest.pdb

BIN
PLCLinker/PLCLinker/bin/Release/PLCLinker.exe


BIN
PLCLinker/PLCLinker/bin/Release/PLCLinker.pdb


+ 1 - 1
PLCLinker/PLCLinker/obj/Release/PLCLinker.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-1571e41c2debcd4bc70827c987a0b669ab9e335b
+8b0c29bd7e29dd6f716140370526519f352b45b8

+ 3 - 0
PLCLinker/PLCLinker/obj/Release/PLCLinker.csproj.FileListAbsolute.txt

@@ -16,3 +16,6 @@ C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\bin\Release\S7.Net.dll
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\bin\Release\PLCS7.xml
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\bin\Release\PLCS7.xml
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\obj\Release\PLCLinker.exe
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\obj\Release\PLCLinker.exe
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\obj\Release\PLCLinker.pdb
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\obj\Release\PLCLinker.pdb
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\obj\Release\PLCLinker.csprojAssemblyReference.cache
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\obj\Release\PLCLinker.csproj.CoreCompileInputs.cache
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCLinker\obj\Release\PLCLinker.csproj.CopyComplete

BIN
PLCLinker/PLCLinker/obj/Release/PLCLinker.exe


BIN
PLCLinker/PLCLinker/obj/Release/PLCLinker.pdb


BIN
PLCLinker/PLCS7/bin/Release/PLCS7.dll


BIN
PLCLinker/PLCS7/bin/Release/PLCS7.pdb


+ 1 - 1
PLCLinker/PLCS7/obj/Release/PLCS7.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-cc05f1a35fab18bffcd16693ec42e7effb9ede7d
+3ac464feb92987cc1fe90ecd0628cc0cc20e45e6

+ 2 - 0
PLCLinker/PLCS7/obj/Release/PLCS7.csproj.FileListAbsolute.txt

@@ -12,3 +12,5 @@ C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\bin\Release\PLCS7.pdb
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\bin\Release\S7.Net.dll
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\bin\Release\S7.Net.dll
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\obj\Release\PLCS7.dll
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\obj\Release\PLCS7.dll
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\obj\Release\PLCS7.pdb
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\obj\Release\PLCS7.pdb
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\obj\Release\PLCS7.csproj.CoreCompileInputs.cache
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\PLCS7\obj\Release\PLCS7.csproj.CopyComplete

BIN
PLCLinker/PLCS7/obj/Release/PLCS7.dll


BIN
PLCLinker/PLCS7/obj/Release/PLCS7.pdb


+ 6 - 6
PLCLinker/centralController/Terminal/Terminal.cs

@@ -640,7 +640,7 @@ namespace Terminal
                         Log.WriteLog(LogType.process, LogFile.ERROR, "停车流程中断");
                         Log.WriteLog(LogType.process, LogFile.ERROR, "停车流程中断");
                         Monitor.Monitor.SetNotification("停车流程中断", parkMonitor.model.TextColor.Warning);
                         Monitor.Monitor.SetNotification("停车流程中断", parkMonitor.model.TextColor.Warning);
                         Thread.Sleep(2000);
                         Thread.Sleep(2000);
-                        ClearTerminal(term.terminalID,false);
+                        ClearTerminal(term.terminalID, false);
                         ResetCompleteSignal();
                         ResetCompleteSignal();
                         //流程终端清除记录的号牌
                         //流程终端清除记录的号牌
                         try { idLicMap.Remove(currentTerm); }
                         try { idLicMap.Remove(currentTerm); }
@@ -678,7 +678,7 @@ namespace Terminal
                         try
                         try
                         {
                         {
                             idLicMap.Remove(currentTerm);
                             idLicMap.Remove(currentTerm);
-                            ClearTerminal(term.terminalID,false);
+                            ClearTerminal(term.terminalID, false);
                         }
                         }
                         catch { }
                         catch { }
                         Monitor.Monitor.SetNotification("无车位或凭证号,车位:" + parkingSpaceID + ",凭证号:" + receipt, parkMonitor.model.TextColor.Warning);
                         Monitor.Monitor.SetNotification("无车位或凭证号,车位:" + parkingSpaceID + ",凭证号:" + receipt, parkMonitor.model.TextColor.Warning);
@@ -729,7 +729,7 @@ namespace Terminal
                     //    Thread.Sleep(1000);
                     //    Thread.Sleep(1000);
                     //}
                     //}
                     //中控清除车牌、凭证号、号牌验证等信息
                     //中控清除车牌、凭证号、号牌验证等信息
-                    ClearTerminal(term.terminalID,false);
+                    ClearTerminal(term.terminalID, false);
                     //停车流程确保已清除中控块完成信号
                     //停车流程确保已清除中控块完成信号
                     Thread.Sleep(2000);
                     Thread.Sleep(2000);
                     ResetCompleteSignal();
                     ResetCompleteSignal();
@@ -776,9 +776,9 @@ namespace Terminal
                 {
                 {
                     license = Monitor.Monitor.numMachineLinker.GetLicensePlate(terminalInfo[index].terminalID);
                     license = Monitor.Monitor.numMachineLinker.GetLicensePlate(terminalInfo[index].terminalID);
                 }
                 }
-                Monitor.Monitor.SetNotification(terminalInfo[index].terminalID + "号车位收到地感,拍到" + license, parkMonitor.model.TextColor.Log);
                 if (license != "")
                 if (license != "")
                 {
                 {
+                    Monitor.Monitor.SetNotification(terminalInfo[index].terminalID + "号车位收到地感,拍到" + license, parkMonitor.model.TextColor.Log);
                     //map中加入或更新号牌,供完成时写入数据库用
                     //map中加入或更新号牌,供完成时写入数据库用
                     if (idLicMap.ContainsKey(terminalInfo[index].terminalID))
                     if (idLicMap.ContainsKey(terminalInfo[index].terminalID))
                     {
                     {
@@ -1286,7 +1286,7 @@ namespace Terminal
                                 {
                                 {
                                     Log.WriteLog(LogType.process, LogFile.INFO, "取车流程中断");
                                     Log.WriteLog(LogType.process, LogFile.INFO, "取车流程中断");
                                     Monitor.Monitor.SetNotification("取车流程中断", parkMonitor.model.TextColor.Warning);
                                     Monitor.Monitor.SetNotification("取车流程中断", parkMonitor.model.TextColor.Warning);
-                                    ClearTerminal(terminalInfo[termIndex].terminalID,false);
+                                    ClearTerminal(terminalInfo[termIndex].terminalID, false);
                                     //停车流程确保已清除中控块完成信号
                                     //停车流程确保已清除中控块完成信号
                                     Thread.Sleep(2000);
                                     Thread.Sleep(2000);
                                     ResetCompleteSignal();
                                     ResetCompleteSignal();
@@ -1316,7 +1316,7 @@ namespace Terminal
                                     //Log.WriteLog(LogType.process, LogFile.INFO, "检测到凭证号已被清除");
                                     //Log.WriteLog(LogType.process, LogFile.INFO, "检测到凭证号已被清除");
                                     FetchInfo fi = null;
                                     FetchInfo fi = null;
                                     UpdateAllParkingSpace(false);
                                     UpdateAllParkingSpace(false);
-                                    ClearTerminal(terminalInfo[termIndex].terminalID,false);
+                                    ClearTerminal(terminalInfo[termIndex].terminalID, false);
                                     //停车流程确保已清除中控块完成信号
                                     //停车流程确保已清除中控块完成信号
                                     Thread.Sleep(2000);
                                     Thread.Sleep(2000);
                                     ResetCompleteSignal();
                                     ResetCompleteSignal();

BIN
PLCLinker/centralController/obj/Release/centralController.Properties.Resources.resources


+ 0 - 1
PLCLinker/centralController/obj/Release/centralController.csproj.FileListAbsolute.txt

@@ -171,7 +171,6 @@ C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevCom
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar.SuperGrid.xml
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar.SuperGrid.xml
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar2.xml
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.DotNetBar2.xml
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.Instrumentation.xml
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\bin\Release\DevComponents.Instrumentation.xml
-C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csprojAssemblyReference.cache
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.exe.config
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.exe.config
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csproj.CoreCompileInputs.cache
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csproj.CoreCompileInputs.cache
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csproj.CopyComplete
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\centralController\obj\Release\centralController.csproj.CopyComplete

BIN
PLCLinker/socketTest/bin/Release/socketTest.exe


BIN
PLCLinker/socketTest/bin/Release/socketTest.pdb


+ 1 - 1
PLCLinker/socketTest/obj/Release/socketTest.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-c8572191f8f174a775110d61cd252232a9f23098
+ea1aee1977a5c9e18ef88790a1d00e0db45b7496

+ 2 - 0
PLCLinker/socketTest/obj/Release/socketTest.csproj.FileListAbsolute.txt

@@ -16,3 +16,5 @@ C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.cs
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.exe
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.exe
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.pdb
 C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.pdb
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\socketTest\obj\Release\socketTest.csprojResolveAssemblyReference.cache
 E:\superScene\智能停车项目\智能停车项目v2.0\PLCLinker\socketTest\obj\Release\socketTest.csprojResolveAssemblyReference.cache
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.csprojAssemblyReference.cache
+C:\parkMonitorV2\parkMonitor_V2.0\PLCLinker\socketTest\obj\Release\socketTest.csproj.CoreCompileInputs.cache

BIN
PLCLinker/socketTest/obj/Release/socketTest.csproj.GenerateResource.Cache


BIN
PLCLinker/socketTest/obj/Release/socketTest.exe


BIN
PLCLinker/socketTest/obj/Release/socketTest.pdb