diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 7a4843a..9a35dec 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 7a4843a..9a35dec 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 75d6d0f..40952c2 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 7a4843a..9a35dec 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 75d6d0f..40952c2 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 9b223fa..b4c4d3e 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 7a4843a..9a35dec 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 75d6d0f..40952c2 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 9b223fa..b4c4d3e 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.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache index 352119a..10e26bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 7a4843a..9a35dec 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 75d6d0f..40952c2 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 9b223fa..b4c4d3e 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.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache index 352119a..10e26bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 7a4843a..9a35dec 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 75d6d0f..40952c2 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 9b223fa..b4c4d3e 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.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache index 352119a..10e26bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 7a4843a..9a35dec 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 75d6d0f..40952c2 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 9b223fa..b4c4d3e 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.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache index 352119a..10e26bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..9a66faf 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -277,6 +276,14 @@ } + private void stopGrabbing() + { + int nRet = m_pOperator.StopGrabbing(); + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 7a4843a..9a35dec 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 75d6d0f..40952c2 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 9b223fa..b4c4d3e 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.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache index 352119a..10e26bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..9a66faf 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -277,6 +276,14 @@ } + private void stopGrabbing() + { + int nRet = m_pOperator.StopGrabbing(); + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 8da7b02..ecfe858 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -94,6 +94,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的数据库更新指令..."); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -150,6 +151,7 @@ dataFromOffline = msg.Replace("data from offline", ""); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -180,6 +182,7 @@ dataFromServer = msg; ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -481,65 +484,73 @@ { if (re == 0) { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "数据库更新成功！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "数据库更新成功！"; - //} + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.LimeGreen; + Form1.GetInstance().label6.Text = "数据库更新成功！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.LimeGreen; + Form2.GetInstance().label6.Text = "数据库更新成功！"; + } + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新成功"); + if (ProMemory.isSyning == true) + { + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - - //})).Start(); + })).Start(); + } } else { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form1.GetInstance().label6.Text = "数据库更新失败！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form2.GetInstance().label6.Text = "数据库更新失败！"; - //} - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.OrangeRed; + Form1.GetInstance().label6.Text = "数据库更新失败！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.OrangeRed; + Form2.GetInstance().label6.Text = "数据库更新失败！"; + } + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - //})).Start(); + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); + })).Start(); + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新失败"); } updatePermissionResult = re; diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 7a4843a..9a35dec 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 75d6d0f..40952c2 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 9b223fa..b4c4d3e 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.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache index 352119a..10e26bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..9a66faf 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -277,6 +276,14 @@ } + private void stopGrabbing() + { + int nRet = m_pOperator.StopGrabbing(); + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 8da7b02..ecfe858 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -94,6 +94,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的数据库更新指令..."); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -150,6 +151,7 @@ dataFromOffline = msg.Replace("data from offline", ""); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -180,6 +182,7 @@ dataFromServer = msg; ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -481,65 +484,73 @@ { if (re == 0) { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "数据库更新成功！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "数据库更新成功！"; - //} + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.LimeGreen; + Form1.GetInstance().label6.Text = "数据库更新成功！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.LimeGreen; + Form2.GetInstance().label6.Text = "数据库更新成功！"; + } + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新成功"); + if (ProMemory.isSyning == true) + { + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - - //})).Start(); + })).Start(); + } } else { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form1.GetInstance().label6.Text = "数据库更新失败！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form2.GetInstance().label6.Text = "数据库更新失败！"; - //} - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.OrangeRed; + Form1.GetInstance().label6.Text = "数据库更新失败！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.OrangeRed; + Form2.GetInstance().label6.Text = "数据库更新失败！"; + } + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - //})).Start(); + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); + })).Start(); + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新失败"); } updatePermissionResult = re; diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 3f94007..ebeff1a 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 7a4843a..9a35dec 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 75d6d0f..40952c2 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 9b223fa..b4c4d3e 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.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache index 352119a..10e26bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..9a66faf 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -277,6 +276,14 @@ } + private void stopGrabbing() + { + int nRet = m_pOperator.StopGrabbing(); + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 8da7b02..ecfe858 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -94,6 +94,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的数据库更新指令..."); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -150,6 +151,7 @@ dataFromOffline = msg.Replace("data from offline", ""); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -180,6 +182,7 @@ dataFromServer = msg; ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -481,65 +484,73 @@ { if (re == 0) { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "数据库更新成功！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "数据库更新成功！"; - //} + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.LimeGreen; + Form1.GetInstance().label6.Text = "数据库更新成功！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.LimeGreen; + Form2.GetInstance().label6.Text = "数据库更新成功！"; + } + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新成功"); + if (ProMemory.isSyning == true) + { + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - - //})).Start(); + })).Start(); + } } else { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form1.GetInstance().label6.Text = "数据库更新失败！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form2.GetInstance().label6.Text = "数据库更新失败！"; - //} - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.OrangeRed; + Form1.GetInstance().label6.Text = "数据库更新失败！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.OrangeRed; + Form2.GetInstance().label6.Text = "数据库更新失败！"; + } + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - //})).Start(); + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); + })).Start(); + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新失败"); } updatePermissionResult = re; diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 3f94007..ebeff1a 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 97499b0..3986e68 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 7a4843a..9a35dec 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 75d6d0f..40952c2 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 9b223fa..b4c4d3e 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.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache index 352119a..10e26bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..9a66faf 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -277,6 +276,14 @@ } + private void stopGrabbing() + { + int nRet = m_pOperator.StopGrabbing(); + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 8da7b02..ecfe858 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -94,6 +94,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的数据库更新指令..."); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -150,6 +151,7 @@ dataFromOffline = msg.Replace("data from offline", ""); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -180,6 +182,7 @@ dataFromServer = msg; ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -481,65 +484,73 @@ { if (re == 0) { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "数据库更新成功！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "数据库更新成功！"; - //} + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.LimeGreen; + Form1.GetInstance().label6.Text = "数据库更新成功！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.LimeGreen; + Form2.GetInstance().label6.Text = "数据库更新成功！"; + } + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新成功"); + if (ProMemory.isSyning == true) + { + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - - //})).Start(); + })).Start(); + } } else { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form1.GetInstance().label6.Text = "数据库更新失败！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form2.GetInstance().label6.Text = "数据库更新失败！"; - //} - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.OrangeRed; + Form1.GetInstance().label6.Text = "数据库更新失败！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.OrangeRed; + Form2.GetInstance().label6.Text = "数据库更新失败！"; + } + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - //})).Start(); + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); + })).Start(); + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新失败"); } updatePermissionResult = re; diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 3f94007..ebeff1a 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 97499b0..3986e68 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.csproj.ResolveComReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache index ffa9824..76ee92e 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache Binary files differ diff --git a/.vs/irisRefactor/v15/.suo b/.vs/irisRefactor/v15/.suo index fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 7a4843a..9a35dec 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 75d6d0f..40952c2 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 9b223fa..b4c4d3e 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.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache index 352119a..10e26bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..9a66faf 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -277,6 +276,14 @@ } + private void stopGrabbing() + { + int nRet = m_pOperator.StopGrabbing(); + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 8da7b02..ecfe858 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -94,6 +94,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的数据库更新指令..."); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -150,6 +151,7 @@ dataFromOffline = msg.Replace("data from offline", ""); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -180,6 +182,7 @@ dataFromServer = msg; ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -481,65 +484,73 @@ { if (re == 0) { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "数据库更新成功！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "数据库更新成功！"; - //} + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.LimeGreen; + Form1.GetInstance().label6.Text = "数据库更新成功！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.LimeGreen; + Form2.GetInstance().label6.Text = "数据库更新成功！"; + } + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新成功"); + if (ProMemory.isSyning == true) + { + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - - //})).Start(); + })).Start(); + } } else { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form1.GetInstance().label6.Text = "数据库更新失败！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form2.GetInstance().label6.Text = "数据库更新失败！"; - //} - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.OrangeRed; + Form1.GetInstance().label6.Text = "数据库更新失败！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.OrangeRed; + Form2.GetInstance().label6.Text = "数据库更新失败！"; + } + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - //})).Start(); + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); + })).Start(); + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新失败"); } updatePermissionResult = re; diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 3f94007..ebeff1a 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 97499b0..3986e68 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.csproj.ResolveComReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache index ffa9824..76ee92e 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache index 5298c8b..0f66a7d 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 7a4843a..9a35dec 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 75d6d0f..40952c2 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 9b223fa..b4c4d3e 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.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache index 352119a..10e26bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..9a66faf 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -277,6 +276,14 @@ } + private void stopGrabbing() + { + int nRet = m_pOperator.StopGrabbing(); + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 8da7b02..ecfe858 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -94,6 +94,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的数据库更新指令..."); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -150,6 +151,7 @@ dataFromOffline = msg.Replace("data from offline", ""); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -180,6 +182,7 @@ dataFromServer = msg; ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -481,65 +484,73 @@ { if (re == 0) { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "数据库更新成功！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "数据库更新成功！"; - //} + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.LimeGreen; + Form1.GetInstance().label6.Text = "数据库更新成功！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.LimeGreen; + Form2.GetInstance().label6.Text = "数据库更新成功！"; + } + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新成功"); + if (ProMemory.isSyning == true) + { + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - - //})).Start(); + })).Start(); + } } else { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form1.GetInstance().label6.Text = "数据库更新失败！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form2.GetInstance().label6.Text = "数据库更新失败！"; - //} - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.OrangeRed; + Form1.GetInstance().label6.Text = "数据库更新失败！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.OrangeRed; + Form2.GetInstance().label6.Text = "数据库更新失败！"; + } + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - //})).Start(); + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); + })).Start(); + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新失败"); } updatePermissionResult = re; diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 3f94007..ebeff1a 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 97499b0..3986e68 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.csproj.ResolveComReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache index ffa9824..76ee92e 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache index 5298c8b..0f66a7d 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 c43ac11..92bb869 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 fc41122..0dff098 100644 --- a/.vs/irisRefactor/v15/.suo +++ b/.vs/irisRefactor/v15/.suo Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide index 06b1b92..366acec 100644 --- a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide +++ b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide Binary files differ diff --git a/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm b/.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm index cf7bc8d..4db3402 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 edf1421..ccd37e1 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 baf921c..7212112 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 3f94007..ebeff1a 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 97499b0..3986e68 100644 --- a/bin/Debug/Interop.MC_DISPLib.dll +++ b/bin/Debug/Interop.MC_DISPLib.dll Binary files differ diff --git a/bin/Debug/irisDataBase.dll b/bin/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/bin/Debug/irisDataBase.dll +++ b/bin/Debug/irisDataBase.dll Binary files differ diff --git a/bin/Debug/irisDataBase.pdb b/bin/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/bin/Debug/irisDataBase.pdb +++ b/bin/Debug/irisDataBase.pdb Binary files differ diff --git a/bin/Debug/irisPrint.dll b/bin/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/bin/Debug/irisPrint.dll +++ b/bin/Debug/irisPrint.dll Binary files differ diff --git a/bin/Debug/irisPrint.pdb b/bin/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/bin/Debug/irisPrint.pdb +++ b/bin/Debug/irisPrint.pdb Binary files differ diff --git a/bin/Debug/irisRefactor.exe b/bin/Debug/irisRefactor.exe index c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/bin/Debug/irisRefactor.pdb +++ b/bin/Debug/irisRefactor.pdb Binary files differ diff --git a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs index cb58c36..8aaef0b 100644 --- a/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs +++ b/irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs @@ -151,9 +151,7 @@ return re; } - - - + // 更新离线采集端发来的数据 public int updateTableFromOffline(string data) { diff --git a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache index 6b9ac6d..9e72dc2 100644 --- a/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache +++ b/irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.dll b/irisDataBase/obj/Debug/irisDataBase.dll index c282b6f..8c73388 100644 --- a/irisDataBase/obj/Debug/irisDataBase.dll +++ b/irisDataBase/obj/Debug/irisDataBase.dll Binary files differ diff --git a/irisDataBase/obj/Debug/irisDataBase.pdb b/irisDataBase/obj/Debug/irisDataBase.pdb index 8fa5ac6..80d90fd 100644 --- a/irisDataBase/obj/Debug/irisDataBase.pdb +++ b/irisDataBase/obj/Debug/irisDataBase.pdb Binary files differ diff --git a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache index 4f7876e..afca324 100644 --- a/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache +++ b/irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache Binary files differ diff --git a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache index 7a4843a..9a35dec 100644 --- a/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache +++ b/irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache Binary files differ diff --git a/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache b/irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache index 75d6d0f..40952c2 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 9b223fa..b4c4d3e 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.csprojAssemblyReference.cache b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache index 352119a..10e26bd 100644 --- a/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache +++ b/irisPrint/obj/Debug/irisPrint.csprojAssemblyReference.cache Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.dll b/irisPrint/obj/Debug/irisPrint.dll index 58c1ae6..0a2ca19 100644 --- a/irisPrint/obj/Debug/irisPrint.dll +++ b/irisPrint/obj/Debug/irisPrint.dll Binary files differ diff --git a/irisPrint/obj/Debug/irisPrint.pdb b/irisPrint/obj/Debug/irisPrint.pdb index 11fa44d..68da03f 100644 --- a/irisPrint/obj/Debug/irisPrint.pdb +++ b/irisPrint/obj/Debug/irisPrint.pdb Binary files differ diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 9df5ba5..9a66faf 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -159,8 +159,7 @@ { ProMemory.isWait = true; - int nRet = m_pOperator.StopGrabbing(); - ProMemory.m_bGrabbing = false; + stopGrabbing(); LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "触发待机线程：" + Thread.CurrentThread.Name); while (ProMemory.isWait) @@ -277,6 +276,14 @@ } + private void stopGrabbing() + { + int nRet = m_pOperator.StopGrabbing(); + if (ProMemory.formType == "1") Form1.GetInstance().picLive.Image=null; + else if (ProMemory.formType == "2") Form2.GetInstance().picLive=null; + + ProMemory.m_bGrabbing = false; + } } } \ No newline at end of file diff --git a/irisRefactor/IrisScoket/SocketHelper.cs b/irisRefactor/IrisScoket/SocketHelper.cs index 8da7b02..ecfe858 100644 --- a/irisRefactor/IrisScoket/SocketHelper.cs +++ b/irisRefactor/IrisScoket/SocketHelper.cs @@ -94,6 +94,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "接收到后台的数据库更新指令..."); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -150,6 +151,7 @@ dataFromOffline = msg.Replace("data from offline", ""); ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -180,6 +182,7 @@ dataFromServer = msg; ProMemory.isSyning = true; + ProMemory.IoControllService.setYellowFlash(false); if (ProMemory.formType == "1") { @@ -481,65 +484,73 @@ { if (re == 0) { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form1.GetInstance().label6.Text = "数据库更新成功！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.LimeGreen; - // Form2.GetInstance().label6.Text = "数据库更新成功！"; - //} + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.LimeGreen; + Form1.GetInstance().label6.Text = "数据库更新成功！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.LimeGreen; + Form2.GetInstance().label6.Text = "数据库更新成功！"; + } + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新成功"); + if (ProMemory.isSyning == true) + { + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - - //})).Start(); + })).Start(); + } } else { - //if (ProMemory.formType == "1") - //{ - // Form1.GetInstance().panel1.Visible = true; - // Form1.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form1.GetInstance().label6.Text = "数据库更新失败！"; - //} - //else if (ProMemory.formType == "2") - //{ - // Form2.GetInstance().panel1.Visible = true; - // Form2.GetInstance().label6.ForeColor = Color.OrangeRed; - // Form2.GetInstance().label6.Text = "数据库更新失败！"; - //} - //new Thread(new ThreadStart(() => - //{ - // Thread.Sleep(3000); - // if (ProMemory.formType == "1") - // Form1.GetInstance().panel1.Visible = false; - // else if (ProMemory.formType == "2") - // Form2.GetInstance().panel1.Visible = false; + if (ProMemory.isSyning == true) + { + if (ProMemory.formType == "1") + { + Form1.GetInstance().panel1.Visible = true; + Form1.GetInstance().label6.ForeColor = Color.OrangeRed; + Form1.GetInstance().label6.Text = "数据库更新失败！"; + } + else if (ProMemory.formType == "2") + { + Form2.GetInstance().panel1.Visible = true; + Form2.GetInstance().label6.ForeColor = Color.OrangeRed; + Form2.GetInstance().label6.Text = "数据库更新失败！"; + } + new Thread(new ThreadStart(() => + { + Thread.Sleep(3000); + if (ProMemory.formType == "1") + Form1.GetInstance().panel1.Visible = false; + else if (ProMemory.formType == "2") + Form2.GetInstance().panel1.Visible = false; - // ProMemory.isSyning = false; - // if (ProMemory.isWait) - // ProMemory.cameraController.ContinuousShot_TriggerOn(); - // else - // ProMemory.cameraController.ContinuousShot_TriggerOff(); - //})).Start(); + ProMemory.isSyning = false; + if (ProMemory.isWait) + ProMemory.cameraController.ContinuousShot_TriggerOn(); + else + ProMemory.cameraController.ContinuousShot_TriggerOff(); + })).Start(); + } LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据库更新失败"); } updatePermissionResult = re; diff --git a/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll b/irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll index 3f94007..ebeff1a 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 97499b0..3986e68 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.csproj.ResolveComReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache index ffa9824..76ee92e 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache +++ b/irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache Binary files differ diff --git a/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache b/irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache index 5298c8b..0f66a7d 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 c43ac11..92bb869 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 3cf49fb..a1aea34 100644 --- a/irisRefactor/obj/x86/Debug/irisRefactor.pdb +++ b/irisRefactor/obj/x86/Debug/irisRefactor.pdb Binary files differ