diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 6c601f4..588044c 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 6c601f4..588044c 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 f78f811..0ceee0b 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache deleted file mode 100644 index 0422bb8..0000000 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache deleted file mode 100644 index 0422bb8..0000000 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache deleted file mode 100644 index 0422bb8..0000000 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache deleted file mode 100644 index 0422bb8..0000000 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index aaba2e2..3fb3f43 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache deleted file mode 100644 index 0422bb8..0000000 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index aaba2e2..3fb3f43 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 0667c84..155a65f 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache deleted file mode 100644 index 0422bb8..0000000 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index aaba2e2..3fb3f43 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 0667c84..155a65f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 2aab2fa..33289da 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -39,4 +39,3 @@ D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache deleted file mode 100644 index 0422bb8..0000000 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index aaba2e2..3fb3f43 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 0667c84..155a65f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 2aab2fa..33289da 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -39,4 +39,3 @@ D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache deleted file mode 100644 index 10e26bd..0000000 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache deleted file mode 100644 index 0422bb8..0000000 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index aaba2e2..3fb3f43 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 0667c84..155a65f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 2aab2fa..33289da 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -39,4 +39,3 @@ D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache deleted file mode 100644 index 10e26bd..0000000 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index fa58471..6cbd50c 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -143,8 +143,9 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Exception callback：" + nMsgType); try { - //ConnectCamera(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "camera save success!"); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "restart"); + ShutdownHelper.Restart(); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "camera save success!"); } catch (Exception ex) { @@ -169,8 +170,8 @@ //外触发到来，开始采集 LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "外触发到来"); ProMemory.IoControllService.YellowOn(); - Grabbing(); ProMemory.isWait = false; + Grabbing(); } } } diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache deleted file mode 100644 index 0422bb8..0000000 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index aaba2e2..3fb3f43 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 0667c84..155a65f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 2aab2fa..33289da 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -39,4 +39,3 @@ D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache deleted file mode 100644 index 10e26bd..0000000 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index fa58471..6cbd50c 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -143,8 +143,9 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Exception callback：" + nMsgType); try { - //ConnectCamera(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "camera save success!"); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "restart"); + ShutdownHelper.Restart(); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "camera save success!"); } catch (Exception ex) { @@ -169,8 +170,8 @@ //外触发到来，开始采集 LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "外触发到来"); ProMemory.IoControllService.YellowOn(); - Grabbing(); ProMemory.isWait = false; + Grabbing(); } } } diff --git a/irisRefactor/IrisThread/ImageQualityAssessTh.cs b/irisRefactor/IrisThread/ImageQualityAssessTh.cs index 3e889d1..5ff155e 100644 --- a/irisRefactor/IrisThread/ImageQualityAssessTh.cs +++ b/irisRefactor/IrisThread/ImageQualityAssessTh.cs @@ -126,7 +126,7 @@ }//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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache deleted file mode 100644 index 0422bb8..0000000 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index aaba2e2..3fb3f43 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 0667c84..155a65f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 2aab2fa..33289da 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -39,4 +39,3 @@ D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache deleted file mode 100644 index 10e26bd..0000000 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index fa58471..6cbd50c 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -143,8 +143,9 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Exception callback：" + nMsgType); try { - //ConnectCamera(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "camera save success!"); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "restart"); + ShutdownHelper.Restart(); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "camera save success!"); } catch (Exception ex) { @@ -169,8 +170,8 @@ //外触发到来，开始采集 LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "外触发到来"); ProMemory.IoControllService.YellowOn(); - Grabbing(); ProMemory.isWait = false; + Grabbing(); } } } diff --git a/irisRefactor/IrisThread/ImageQualityAssessTh.cs b/irisRefactor/IrisThread/ImageQualityAssessTh.cs index 3e889d1..5ff155e 100644 --- a/irisRefactor/IrisThread/ImageQualityAssessTh.cs +++ b/irisRefactor/IrisThread/ImageQualityAssessTh.cs @@ -126,7 +126,7 @@ }//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/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index e7dd6b1..6a2c3b2 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache deleted file mode 100644 index 0422bb8..0000000 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index aaba2e2..3fb3f43 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 0667c84..155a65f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 2aab2fa..33289da 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -39,4 +39,3 @@ D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache deleted file mode 100644 index 10e26bd..0000000 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index fa58471..6cbd50c 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -143,8 +143,9 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Exception callback：" + nMsgType); try { - //ConnectCamera(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "camera save success!"); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "restart"); + ShutdownHelper.Restart(); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "camera save success!"); } catch (Exception ex) { @@ -169,8 +170,8 @@ //外触发到来，开始采集 LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "外触发到来"); ProMemory.IoControllService.YellowOn(); - Grabbing(); ProMemory.isWait = false; + Grabbing(); } } } diff --git a/irisRefactor/IrisThread/ImageQualityAssessTh.cs b/irisRefactor/IrisThread/ImageQualityAssessTh.cs index 3e889d1..5ff155e 100644 --- a/irisRefactor/IrisThread/ImageQualityAssessTh.cs +++ b/irisRefactor/IrisThread/ImageQualityAssessTh.cs @@ -126,7 +126,7 @@ }//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/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index e7dd6b1..6a2c3b2 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/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index 873930f..c34e489 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache deleted file mode 100644 index 0422bb8..0000000 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index aaba2e2..3fb3f43 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 0667c84..155a65f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 2aab2fa..33289da 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -39,4 +39,3 @@ D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache deleted file mode 100644 index 10e26bd..0000000 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index fa58471..6cbd50c 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -143,8 +143,9 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Exception callback：" + nMsgType); try { - //ConnectCamera(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "camera save success!"); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "restart"); + ShutdownHelper.Restart(); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "camera save success!"); } catch (Exception ex) { @@ -169,8 +170,8 @@ //外触发到来，开始采集 LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "外触发到来"); ProMemory.IoControllService.YellowOn(); - Grabbing(); ProMemory.isWait = false; + Grabbing(); } } } diff --git a/irisRefactor/IrisThread/ImageQualityAssessTh.cs b/irisRefactor/IrisThread/ImageQualityAssessTh.cs index 3e889d1..5ff155e 100644 --- a/irisRefactor/IrisThread/ImageQualityAssessTh.cs +++ b/irisRefactor/IrisThread/ImageQualityAssessTh.cs @@ -126,7 +126,7 @@ }//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/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index e7dd6b1..6a2c3b2 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/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index 873930f..c34e489 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 88f665b..ec52530 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache deleted file mode 100644 index 0422bb8..0000000 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index aaba2e2..3fb3f43 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 0667c84..155a65f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 2aab2fa..33289da 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -39,4 +39,3 @@ D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache deleted file mode 100644 index 10e26bd..0000000 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index fa58471..6cbd50c 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -143,8 +143,9 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Exception callback：" + nMsgType); try { - //ConnectCamera(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "camera save success!"); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "restart"); + ShutdownHelper.Restart(); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "camera save success!"); } catch (Exception ex) { @@ -169,8 +170,8 @@ //外触发到来，开始采集 LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "外触发到来"); ProMemory.IoControllService.YellowOn(); - Grabbing(); ProMemory.isWait = false; + Grabbing(); } } } diff --git a/irisRefactor/IrisThread/ImageQualityAssessTh.cs b/irisRefactor/IrisThread/ImageQualityAssessTh.cs index 3e889d1..5ff155e 100644 --- a/irisRefactor/IrisThread/ImageQualityAssessTh.cs +++ b/irisRefactor/IrisThread/ImageQualityAssessTh.cs @@ -126,7 +126,7 @@ }//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/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index e7dd6b1..6a2c3b2 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/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index 873930f..c34e489 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 88f665b..ec52530 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 814a622..6b06cde 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 6c601f4..588044c 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 f78f811..0ceee0b 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 b01051d..9a687d3 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 0dbb932..c1d1d2f 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 e7dd6b1..6a2c3b2 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 873930f..c34e489 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisHelper.dll b/bin/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/bin/Debug/irisHelper.dll +++ b/bin/Debug/irisHelper.dll Binary files differ diff --git a/bin/Debug/irisHelper.pdb b/bin/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/bin/Debug/irisHelper.pdb +++ b/bin/Debug/irisHelper.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index 814a622..6b06cde 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 a456c9b..82248b1 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 692a3ce..3f4e74c 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 e490c55..30ead23 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/ShutdownHelper.cs b/irisHelper/ShutdownHelper.cs new file mode 100644 index 0000000..858bf9d --- /dev/null +++ b/irisHelper/ShutdownHelper.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; + +namespace irisHelper +{ + public class ShutdownHelper + { + /// + /// 到期时间 + /// + public DateTime End { get; set; } + + public ShutdownHelper() + { + DateTime now = DateTime.Now; + DateTime end = now.Date.AddDays(1).AddSeconds(-1); + + End = end; + } + + public ShutdownHelper(DateTime time) + { + End = time; + } + + //执行命令 + public static void Exec(string str) + { + try + { + using (Process process = new Process()) + { + process.StartInfo.FileName = "cmd.exe";//调用cmd.exe程序 + process.StartInfo.UseShellExecute = false; + process.StartInfo.RedirectStandardInput = true;//重定向标准输入 + process.StartInfo.RedirectStandardOutput = true;//重定向标准输出 + process.StartInfo.RedirectStandardError = true;//重定向标准出错 + process.StartInfo.CreateNoWindow = true;//不显示黑窗口 + process.Start();//开始调用执行 + process.StandardInput.WriteLine(str + "&exit");//标准输入str + "&exit"，相等于在cmd黑窗口输入str + "&exit" + process.StandardInput.AutoFlush = true;//刷新缓冲流，执行缓冲区的命令，相当于输入命令之后回车执行 + process.WaitForExit();//等待退出 + process.Close();//关闭进程 + } + } + catch + { + } + } + //执行关机操作 + public static void Shutdown() + { + Exec("shutdown -s -f -t 0"); + } + //执行重启操作 + public static void Restart() + { + Exec("shutdown -r -f -t 0"); + } + + } +} diff --git a/irisHelper/irisHelper.csproj b/irisHelper/irisHelper.csproj index 21d42dc..53043c0 100644 --- a/irisHelper/irisHelper.csproj +++ b/irisHelper/irisHelper.csproj @@ -50,6 +50,7 @@ + \ No newline at end of file diff --git a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache index 69d3084..6bcd7bc 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache +++ b/irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7e286118c873a3c4bb3b9ff01d06c4d17a0e3a77 +7ebc9ef2176960141a836a9a1e004c6bab7362ad diff --git a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt index b61c520..9844bbe 100644 --- a/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt +++ b/irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt @@ -46,4 +46,3 @@ D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csproj.CopyComplete D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.dll D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.pdb -D:\git\IRIS_REFACTOR\irisHelper\obj\Debug\irisHelper.csprojAssemblyReference.cache diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache deleted file mode 100644 index 0422bb8..0000000 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.dll b/irisHelper/obj/Debug/irisHelper.dll index ed0de2b..7448104 100644 --- a/irisHelper/obj/Debug/irisHelper.dll +++ b/irisHelper/obj/Debug/irisHelper.dll Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.pdb b/irisHelper/obj/Debug/irisHelper.pdb index b8cd102..41558b7 100644 --- a/irisHelper/obj/Debug/irisHelper.pdb +++ b/irisHelper/obj/Debug/irisHelper.pdb Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index aaba2e2..3fb3f43 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 0667c84..155a65f 100644 --- a/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache +++ b/irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt index 2aab2fa..33289da 100644 --- a/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt +++ b/irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt @@ -39,4 +39,3 @@ D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csproj.CoreCompileInputs.cache D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.dll D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.pdb -D:\git\IRIS_REFACTOR\irisPrint\obj\Debug\irisPrint.csprojAssemblyReference.cache diff --git a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache deleted file mode 100644 index 10e26bd..0000000 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index fa58471..6cbd50c 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -143,8 +143,9 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Exception callback：" + nMsgType); try { - //ConnectCamera(); - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "camera save success!"); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "restart"); + ShutdownHelper.Restart(); + //LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "camera save success!"); } catch (Exception ex) { @@ -169,8 +170,8 @@ //外触发到来，开始采集 LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "外触发到来"); ProMemory.IoControllService.YellowOn(); - Grabbing(); ProMemory.isWait = false; + Grabbing(); } } } diff --git a/irisRefactor/IrisThread/ImageQualityAssessTh.cs b/irisRefactor/IrisThread/ImageQualityAssessTh.cs index 3e889d1..5ff155e 100644 --- a/irisRefactor/IrisThread/ImageQualityAssessTh.cs +++ b/irisRefactor/IrisThread/ImageQualityAssessTh.cs @@ -126,7 +126,7 @@ }//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/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index e7dd6b1..6a2c3b2 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/Interop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll index 873930f..c34e489 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 88f665b..ec52530 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 814a622..6b06cde 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 a456c9b..82248b1 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.pdb +++ b/irisRefactor/obj/x86/Debug/irisRefactor.pdb Binary files differ