diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 3f4e74c..2d09623 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 3f4e74c..2d09623 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 30ead23..33ce65f 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 3f4e74c..2d09623 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 30ead23..33ce65f 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 3fb3f43..6a64d27 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 3f4e74c..2d09623 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 30ead23..33ce65f 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 3fb3f43..6a64d27 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index 155a65f..3f4fb2f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 3f4e74c..2d09623 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 30ead23..33ce65f 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 3fb3f43..6a64d27 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index 155a65f..3f4fb2f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 6cbd50c..c26cf41 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -201,7 +201,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "普通采集错误 ：" + e); } } - + //断开相机 public void CloseCamera() { diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 3f4e74c..2d09623 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 30ead23..33ce65f 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 3fb3f43..6a64d27 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index 155a65f..3f4fb2f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 6cbd50c..c26cf41 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -201,7 +201,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "普通采集错误 ：" + e); } } - + //断开相机 public void CloseCamera() { diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 5aecb43..bf87779 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -122,7 +122,7 @@ { isWait = true; } - + if (ProMemory.isSyning) return; ProMemory.isSyning = true; ProMemory.IoControllService.setYellowFlash(false); Thread.Sleep(500); @@ -140,6 +140,7 @@ public void dealScoketMsg(Socket myClientSocket,String msg) { + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令open..."); diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 3f4e74c..2d09623 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 30ead23..33ce65f 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 3fb3f43..6a64d27 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index 155a65f..3f4fb2f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 6cbd50c..c26cf41 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -201,7 +201,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "普通采集错误 ：" + e); } } - + //断开相机 public void CloseCamera() { diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 5aecb43..bf87779 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -122,7 +122,7 @@ { isWait = true; } - + if (ProMemory.isSyning) return; ProMemory.isSyning = true; ProMemory.IoControllService.setYellowFlash(false); Thread.Sleep(500); @@ -140,6 +140,7 @@ public void dealScoketMsg(Socket myClientSocket,String msg) { + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令open..."); diff --git a/irisRefactor/IrisThread/ImageQualityAssessTh.cs b/irisRefactor/IrisThread/ImageQualityAssessTh.cs index 5ff155e..b21ca9d 100644 --- a/irisRefactor/IrisThread/ImageQualityAssessTh.cs +++ b/irisRefactor/IrisThread/ImageQualityAssessTh.cs @@ -120,13 +120,13 @@ { if (ProMemory.irisConfig.Q4.Count >= 30) { - ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 + ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 } } }//end while - /*if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 + if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 { if (ProMemory.irisConfig.IdentifyAccess == false) { @@ -150,7 +150,7 @@ } } - ProMemory.timer2.Dispose();*/ + ProMemory.timer2.Dispose(); } catch (Exception ex) { diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 3f4e74c..2d09623 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 30ead23..33ce65f 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 3fb3f43..6a64d27 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index 155a65f..3f4fb2f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 6cbd50c..c26cf41 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -201,7 +201,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "普通采集错误 ：" + e); } } - + //断开相机 public void CloseCamera() { diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 5aecb43..bf87779 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -122,7 +122,7 @@ { isWait = true; } - + if (ProMemory.isSyning) return; ProMemory.isSyning = true; ProMemory.IoControllService.setYellowFlash(false); Thread.Sleep(500); @@ -140,6 +140,7 @@ public void dealScoketMsg(Socket myClientSocket,String msg) { + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令open..."); diff --git a/irisRefactor/IrisThread/ImageQualityAssessTh.cs b/irisRefactor/IrisThread/ImageQualityAssessTh.cs index 5ff155e..b21ca9d 100644 --- a/irisRefactor/IrisThread/ImageQualityAssessTh.cs +++ b/irisRefactor/IrisThread/ImageQualityAssessTh.cs @@ -120,13 +120,13 @@ { if (ProMemory.irisConfig.Q4.Count >= 30) { - ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 + ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 } } }//end while - /*if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 + if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 { if (ProMemory.irisConfig.IdentifyAccess == false) { @@ -150,7 +150,7 @@ } } - ProMemory.timer2.Dispose();*/ + ProMemory.timer2.Dispose(); } catch (Exception ex) { diff --git a/irisRefactor/IrisThread/SaveImageTh.cs b/irisRefactor/IrisThread/SaveImageTh.cs index ae63687..373e40e 100644 --- a/irisRefactor/IrisThread/SaveImageTh.cs +++ b/irisRefactor/IrisThread/SaveImageTh.cs @@ -37,7 +37,7 @@ Image image = Raw8BitByteArrayToImage(imgBytes, pFrameInfo.nWidth, pFrameInfo.nHeight); //2.对图像进行人眼搜索处理 - if (image != null && ProMemory.isWait == false&&ProMemory.findingEyes && !ProMemory.isSyning) + if (image != null && ProMemory.isWait == false && ProMemory.findingEyes && !ProMemory.isSyning) { try { diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 3f4e74c..2d09623 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 30ead23..33ce65f 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 3fb3f43..6a64d27 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index 155a65f..3f4fb2f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 6cbd50c..c26cf41 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -201,7 +201,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "普通采集错误 ：" + e); } } - + //断开相机 public void CloseCamera() { diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 5aecb43..bf87779 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -122,7 +122,7 @@ { isWait = true; } - + if (ProMemory.isSyning) return; ProMemory.isSyning = true; ProMemory.IoControllService.setYellowFlash(false); Thread.Sleep(500); @@ -140,6 +140,7 @@ public void dealScoketMsg(Socket myClientSocket,String msg) { + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令open..."); diff --git a/irisRefactor/IrisThread/ImageQualityAssessTh.cs b/irisRefactor/IrisThread/ImageQualityAssessTh.cs index 5ff155e..b21ca9d 100644 --- a/irisRefactor/IrisThread/ImageQualityAssessTh.cs +++ b/irisRefactor/IrisThread/ImageQualityAssessTh.cs @@ -120,13 +120,13 @@ { if (ProMemory.irisConfig.Q4.Count >= 30) { - ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 + ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 } } }//end while - /*if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 + if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 { if (ProMemory.irisConfig.IdentifyAccess == false) { @@ -150,7 +150,7 @@ } } - ProMemory.timer2.Dispose();*/ + ProMemory.timer2.Dispose(); } catch (Exception ex) { diff --git a/irisRefactor/IrisThread/SaveImageTh.cs b/irisRefactor/IrisThread/SaveImageTh.cs index ae63687..373e40e 100644 --- a/irisRefactor/IrisThread/SaveImageTh.cs +++ b/irisRefactor/IrisThread/SaveImageTh.cs @@ -37,7 +37,7 @@ Image image = Raw8BitByteArrayToImage(imgBytes, pFrameInfo.nWidth, pFrameInfo.nHeight); //2.对图像进行人眼搜索处理 - if (image != null && ProMemory.isWait == false&&ProMemory.findingEyes && !ProMemory.isSyning) + if (image != null && ProMemory.isWait == false && ProMemory.findingEyes && !ProMemory.isSyning) { try { diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 3f4e74c..2d09623 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 30ead23..33ce65f 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 3fb3f43..6a64d27 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index 155a65f..3f4fb2f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 6cbd50c..c26cf41 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -201,7 +201,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "普通采集错误 ：" + e); } } - + //断开相机 public void CloseCamera() { diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 5aecb43..bf87779 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -122,7 +122,7 @@ { isWait = true; } - + if (ProMemory.isSyning) return; ProMemory.isSyning = true; ProMemory.IoControllService.setYellowFlash(false); Thread.Sleep(500); @@ -140,6 +140,7 @@ public void dealScoketMsg(Socket myClientSocket,String msg) { + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令open..."); diff --git a/irisRefactor/IrisThread/ImageQualityAssessTh.cs b/irisRefactor/IrisThread/ImageQualityAssessTh.cs index 5ff155e..b21ca9d 100644 --- a/irisRefactor/IrisThread/ImageQualityAssessTh.cs +++ b/irisRefactor/IrisThread/ImageQualityAssessTh.cs @@ -120,13 +120,13 @@ { if (ProMemory.irisConfig.Q4.Count >= 30) { - ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 + ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 } } }//end while - /*if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 + if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 { if (ProMemory.irisConfig.IdentifyAccess == false) { @@ -150,7 +150,7 @@ } } - ProMemory.timer2.Dispose();*/ + ProMemory.timer2.Dispose(); } catch (Exception ex) { diff --git a/irisRefactor/IrisThread/SaveImageTh.cs b/irisRefactor/IrisThread/SaveImageTh.cs index ae63687..373e40e 100644 --- a/irisRefactor/IrisThread/SaveImageTh.cs +++ b/irisRefactor/IrisThread/SaveImageTh.cs @@ -37,7 +37,7 @@ Image image = Raw8BitByteArrayToImage(imgBytes, pFrameInfo.nWidth, pFrameInfo.nHeight); //2.对图像进行人眼搜索处理 - if (image != null && ProMemory.isWait == false&&ProMemory.findingEyes && !ProMemory.isSyning) + if (image != null && ProMemory.isWait == false && ProMemory.findingEyes && !ProMemory.isSyning) { try { diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index acbc1b3..e1c026c 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 3f4e74c..2d09623 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 30ead23..33ce65f 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 3fb3f43..6a64d27 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index 155a65f..3f4fb2f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 6cbd50c..c26cf41 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -201,7 +201,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "普通采集错误 ：" + e); } } - + //断开相机 public void CloseCamera() { diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 5aecb43..bf87779 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -122,7 +122,7 @@ { isWait = true; } - + if (ProMemory.isSyning) return; ProMemory.isSyning = true; ProMemory.IoControllService.setYellowFlash(false); Thread.Sleep(500); @@ -140,6 +140,7 @@ public void dealScoketMsg(Socket myClientSocket,String msg) { + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令open..."); diff --git a/irisRefactor/IrisThread/ImageQualityAssessTh.cs b/irisRefactor/IrisThread/ImageQualityAssessTh.cs index 5ff155e..b21ca9d 100644 --- a/irisRefactor/IrisThread/ImageQualityAssessTh.cs +++ b/irisRefactor/IrisThread/ImageQualityAssessTh.cs @@ -120,13 +120,13 @@ { if (ProMemory.irisConfig.Q4.Count >= 30) { - ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 + ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 } } }//end while - /*if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 + if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 { if (ProMemory.irisConfig.IdentifyAccess == false) { @@ -150,7 +150,7 @@ } } - ProMemory.timer2.Dispose();*/ + ProMemory.timer2.Dispose(); } catch (Exception ex) { diff --git a/irisRefactor/IrisThread/SaveImageTh.cs b/irisRefactor/IrisThread/SaveImageTh.cs index ae63687..373e40e 100644 --- a/irisRefactor/IrisThread/SaveImageTh.cs +++ b/irisRefactor/IrisThread/SaveImageTh.cs @@ -37,7 +37,7 @@ Image image = Raw8BitByteArrayToImage(imgBytes, pFrameInfo.nWidth, pFrameInfo.nHeight); //2.对图像进行人眼搜索处理 - if (image != null && ProMemory.isWait == false&&ProMemory.findingEyes && !ProMemory.isSyning) + if (image != null && ProMemory.isWait == false && ProMemory.findingEyes && !ProMemory.isSyning) { try { diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index acbc1b3..e1c026c 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 3f4e74c..2d09623 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 30ead23..33ce65f 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 3fb3f43..6a64d27 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index 155a65f..3f4fb2f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 6cbd50c..c26cf41 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -201,7 +201,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "普通采集错误 ：" + e); } } - + //断开相机 public void CloseCamera() { diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 5aecb43..bf87779 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -122,7 +122,7 @@ { isWait = true; } - + if (ProMemory.isSyning) return; ProMemory.isSyning = true; ProMemory.IoControllService.setYellowFlash(false); Thread.Sleep(500); @@ -140,6 +140,7 @@ public void dealScoketMsg(Socket myClientSocket,String msg) { + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令open..."); diff --git a/irisRefactor/IrisThread/ImageQualityAssessTh.cs b/irisRefactor/IrisThread/ImageQualityAssessTh.cs index 5ff155e..b21ca9d 100644 --- a/irisRefactor/IrisThread/ImageQualityAssessTh.cs +++ b/irisRefactor/IrisThread/ImageQualityAssessTh.cs @@ -120,13 +120,13 @@ { if (ProMemory.irisConfig.Q4.Count >= 30) { - ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 + ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 } } }//end while - /*if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 + if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 { if (ProMemory.irisConfig.IdentifyAccess == false) { @@ -150,7 +150,7 @@ } } - ProMemory.timer2.Dispose();*/ + ProMemory.timer2.Dispose(); } catch (Exception ex) { diff --git a/irisRefactor/IrisThread/SaveImageTh.cs b/irisRefactor/IrisThread/SaveImageTh.cs index ae63687..373e40e 100644 --- a/irisRefactor/IrisThread/SaveImageTh.cs +++ b/irisRefactor/IrisThread/SaveImageTh.cs @@ -37,7 +37,7 @@ Image image = Raw8BitByteArrayToImage(imgBytes, pFrameInfo.nWidth, pFrameInfo.nHeight); //2.对图像进行人眼搜索处理 - if (image != null && ProMemory.isWait == false&&ProMemory.findingEyes && !ProMemory.isSyning) + if (image != null && ProMemory.isWait == false && ProMemory.findingEyes && !ProMemory.isSyning) { try { diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index acbc1b3..e1c026c 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache index ec52530..edec707 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 3f4e74c..2d09623 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 30ead23..33ce65f 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 3fb3f43..6a64d27 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index 155a65f..3f4fb2f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 6cbd50c..c26cf41 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -201,7 +201,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "普通采集错误 ：" + e); } } - + //断开相机 public void CloseCamera() { diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 5aecb43..bf87779 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -122,7 +122,7 @@ { isWait = true; } - + if (ProMemory.isSyning) return; ProMemory.isSyning = true; ProMemory.IoControllService.setYellowFlash(false); Thread.Sleep(500); @@ -140,6 +140,7 @@ public void dealScoketMsg(Socket myClientSocket,String msg) { + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令open..."); diff --git a/irisRefactor/IrisThread/ImageQualityAssessTh.cs b/irisRefactor/IrisThread/ImageQualityAssessTh.cs index 5ff155e..b21ca9d 100644 --- a/irisRefactor/IrisThread/ImageQualityAssessTh.cs +++ b/irisRefactor/IrisThread/ImageQualityAssessTh.cs @@ -120,13 +120,13 @@ { if (ProMemory.irisConfig.Q4.Count >= 30) { - ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 + ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 } } }//end while - /*if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 + if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 { if (ProMemory.irisConfig.IdentifyAccess == false) { @@ -150,7 +150,7 @@ } } - ProMemory.timer2.Dispose();*/ + ProMemory.timer2.Dispose(); } catch (Exception ex) { diff --git a/irisRefactor/IrisThread/SaveImageTh.cs b/irisRefactor/IrisThread/SaveImageTh.cs index ae63687..373e40e 100644 --- a/irisRefactor/IrisThread/SaveImageTh.cs +++ b/irisRefactor/IrisThread/SaveImageTh.cs @@ -37,7 +37,7 @@ Image image = Raw8BitByteArrayToImage(imgBytes, pFrameInfo.nWidth, pFrameInfo.nHeight); //2.对图像进行人眼搜索处理 - if (image != null && ProMemory.isWait == false&&ProMemory.findingEyes && !ProMemory.isSyning) + if (image != null && ProMemory.isWait == false && ProMemory.findingEyes && !ProMemory.isSyning) { try { diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index acbc1b3..e1c026c 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache index ec52530..edec707 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.exe b/irisRefactor/obj/x86/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.exe +++ b/irisRefactor/obj/x86/Debug/irisRefactor.exe Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 588044c..6771c01 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index 0ceee0b..a6e6b8c 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal index 9a687d3..2ab53ca 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache index c1d1d2f..40ceb60 100644 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache Binary files differ diff --git a/bin/Debug/AxInterop.MC_DISPLib.dll b/bin/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/bin/Debug/AxInterop.MC_DISPLib.dll +++ b/bin/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/Interop.MC_DISPLib.dll b/bin/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/bin/Debug/irisRefactor.exe +++ b/bin/Debug/irisRefactor.exe Binary files differ diff --git a/bin/Debug/irisRefactor.pdb b/bin/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 3f4e74c..2d09623 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 30ead23..33ce65f 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 3fb3f43..6a64d27 100644 --- a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache +++ b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache Binary files differ diff --git a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache index 155a65f..3f4fb2f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 6cbd50c..c26cf41 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -201,7 +201,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "普通采集错误 ：" + e); } } - + //断开相机 public void CloseCamera() { diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 5aecb43..bf87779 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -122,7 +122,7 @@ { isWait = true; } - + if (ProMemory.isSyning) return; ProMemory.isSyning = true; ProMemory.IoControllService.setYellowFlash(false); Thread.Sleep(500); @@ -140,6 +140,7 @@ public void dealScoketMsg(Socket myClientSocket,String msg) { + if (msg == "open") { LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的开门指令open..."); diff --git a/irisRefactor/IrisThread/ImageQualityAssessTh.cs b/irisRefactor/IrisThread/ImageQualityAssessTh.cs index 5ff155e..b21ca9d 100644 --- a/irisRefactor/IrisThread/ImageQualityAssessTh.cs +++ b/irisRefactor/IrisThread/ImageQualityAssessTh.cs @@ -120,13 +120,13 @@ { if (ProMemory.irisConfig.Q4.Count >= 30) { - ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 + ProMemory.irisConfig.Q4.Clear(); //手动控制堆栈容量 } } }//end while - /*if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 + if (ProMemory.Tag_IdentifyTimer == 1) //拒识时间到,同时会停止匹配线程 { if (ProMemory.irisConfig.IdentifyAccess == false) { @@ -150,7 +150,7 @@ } } - ProMemory.timer2.Dispose();*/ + ProMemory.timer2.Dispose(); } catch (Exception ex) { diff --git a/irisRefactor/IrisThread/SaveImageTh.cs b/irisRefactor/IrisThread/SaveImageTh.cs index ae63687..373e40e 100644 --- a/irisRefactor/IrisThread/SaveImageTh.cs +++ b/irisRefactor/IrisThread/SaveImageTh.cs @@ -37,7 +37,7 @@ Image image = Raw8BitByteArrayToImage(imgBytes, pFrameInfo.nWidth, pFrameInfo.nHeight); //2.对图像进行人眼搜索处理 - if (image != null && ProMemory.isWait == false&&ProMemory.findingEyes && !ProMemory.isSyning) + if (image != null && ProMemory.isWait == false && ProMemory.findingEyes && !ProMemory.isSyning) { try { diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 6a2c3b2..ae090f5 100644 --- a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index acbc1b3..e1c026c 100644 --- a/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index c34e489..d56f3f8 100644 --- a/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll +++ b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache index ec52530..edec707 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.exe b/irisRefactor/obj/x86/Debug/irisRefactor.exe index 6b06cde..2a731c6 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.exe +++ b/irisRefactor/obj/x86/Debug/irisRefactor.exe Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.pdb b/irisRefactor/obj/x86/Debug/irisRefactor.pdb index 82248b1..a663e50 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.pdb +++ b/irisRefactor/obj/x86/Debug/irisRefactor.pdb Binary files differ