xiongzhu 4 лет назад
Родитель
Сommit
75cf061b9f
31 измененных файлов с 66 добавлено и 20 удалено
  1. 2 2
      CamTool/MainWindow.xaml
  2. 4 4
      CamTool/MainWindow.xaml.cs
  3. BIN
      CamTool/bin/Debug/CamTool.exe
  4. BIN
      CamTool/bin/Debug/CamTool.pdb
  5. 0 0
      CamTool/bin/Debug/logs/app.log.2020-09-07.log
  6. BIN
      CamTool/bin/x86/Debug/CamTool.exe
  7. BIN
      CamTool/bin/x86/Debug/CamTool.pdb
  8. 1 1
      CamTool/obj/Debug/CamTool.csproj.CoreCompileInputs.cache
  9. 23 0
      CamTool/obj/Debug/CamTool.csproj.FileListAbsolute.txt
  10. BIN
      CamTool/obj/Debug/CamTool.csproj.GenerateResource.cache
  11. BIN
      CamTool/obj/Debug/CamTool.csprojAssemblyReference.cache
  12. BIN
      CamTool/obj/Debug/CamTool.exe
  13. BIN
      CamTool/obj/Debug/CamTool.g.resources
  14. BIN
      CamTool/obj/Debug/CamTool.pdb
  15. 3 3
      CamTool/obj/Debug/CamTool_MarkupCompile.cache
  16. 1 1
      CamTool/obj/Debug/CamTool_MarkupCompile.lref
  17. BIN
      CamTool/obj/Debug/MainWindow.baml
  18. 1 1
      CamTool/obj/Debug/MainWindow.g.cs
  19. 1 1
      CamTool/obj/Debug/MainWindow.g.i.cs
  20. 1 1
      CamTool/obj/x86/Debug/CamTool.csproj.CoreCompileInputs.cache
  21. 23 0
      CamTool/obj/x86/Debug/CamTool.csproj.FileListAbsolute.txt
  22. BIN
      CamTool/obj/x86/Debug/CamTool.csproj.GenerateResource.cache
  23. BIN
      CamTool/obj/x86/Debug/CamTool.csprojAssemblyReference.cache
  24. BIN
      CamTool/obj/x86/Debug/CamTool.exe
  25. BIN
      CamTool/obj/x86/Debug/CamTool.g.resources
  26. BIN
      CamTool/obj/x86/Debug/CamTool.pdb
  27. 3 3
      CamTool/obj/x86/Debug/CamTool_MarkupCompile.cache
  28. 1 1
      CamTool/obj/x86/Debug/CamTool_MarkupCompile.lref
  29. BIN
      CamTool/obj/x86/Debug/MainWindow.baml
  30. 1 1
      CamTool/obj/x86/Debug/MainWindow.g.cs
  31. 1 1
      CamTool/obj/x86/Debug/MainWindow.g.i.cs

+ 2 - 2
CamTool/MainWindow.xaml

@@ -8,11 +8,11 @@
         Title="后台服务软件,请勿关闭" Height="216.25" Width="350" ResizeMode="NoResize" Initialized="Window_Initialized" Loaded="Window_Loaded">
     <Grid>
         <TextBox x:Name="camInIP" Padding="0 4 0 4" HorizontalAlignment="Left" Margin="98,28,0,0" TextWrapping="Wrap"
-                 VerticalAlignment="Top" Width="210" Text="192.168.1.111" />
+                 VerticalAlignment="Top" Width="210" Text="192.168.3.111" />
         <Label Content="入场相机ip" HorizontalAlignment="Left" Margin="24,28,0,0" VerticalAlignment="Top" />
         <Label Content="出场相机ip" HorizontalAlignment="Left" Margin="24,58,0,0" VerticalAlignment="Top" />
         <TextBox x:Name="camOutIP" Padding="0 4 0 4" HorizontalAlignment="Left" Margin="98,58,0,0" TextWrapping="Wrap"
-                 VerticalAlignment="Top" Width="210" Text="192.168.1.112" />
+                 VerticalAlignment="Top" Width="210" Text="192.168.3.112" />
         <Label Content="服务器" HorizontalAlignment="Left" Margin="36,88,0,0" VerticalAlignment="Top" />
         <TextBox x:Name="server" Padding="0 4 0 4" HorizontalAlignment="Left" Margin="98,88,0,0" TextWrapping="Wrap"
                  VerticalAlignment="Top" Width="210" Text="http://zhgd.drewslab.cn" SpellCheck.IsEnabled="True" />

+ 4 - 4
CamTool/MainWindow.xaml.cs

@@ -106,10 +106,10 @@ namespace CamTool
                 //serial = Marshal.PtrToStringAnsi(device_Info.serial_number);
 
                 //switchLight(1, true);
-                registerAscDevice(new AcsDevice("192.168.1.64", "admin", "admin123", "IN"));
-                registerAscDevice(new AcsDevice("192.168.1.65", "admin", "admin123", "OUT"));
-                registerAscDevice(new AcsDevice("192.168.1.66", "admin", "admin123", "IN"));
-                registerAscDevice(new AcsDevice("192.168.1.67", "admin", "admin123", "OUT"));
+                //registerAscDevice(new AcsDevice("192.168.1.64", "admin", "admin123", "IN"));
+                //registerAscDevice(new AcsDevice("192.168.1.65", "admin", "admin123", "OUT"));
+                //registerAscDevice(new AcsDevice("192.168.1.66", "admin", "admin123", "IN"));
+                //registerAscDevice(new AcsDevice("192.168.1.67", "admin", "admin123", "OUT"));
 
 
                 System.Windows.Threading.DispatcherTimer dispatcherTimer = new System.Windows.Threading.DispatcherTimer();

BIN
CamTool/bin/Debug/CamTool.exe


BIN
CamTool/bin/Debug/CamTool.pdb


+ 0 - 0
CamTool/bin/Debug/logs/app.log.2020-09-07.log


BIN
CamTool/bin/x86/Debug/CamTool.exe


BIN
CamTool/bin/x86/Debug/CamTool.pdb


+ 1 - 1
CamTool/obj/Debug/CamTool.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-000a89deeb9bbd9a507223425e75e150555cfbca
+d9b7ee65a0967900070b6f1bc5f87d472a33626b

+ 23 - 0
CamTool/obj/Debug/CamTool.csproj.FileListAbsolute.txt

@@ -74,3 +74,26 @@ C:\Users\drew\Projects\win\CamTool\CamTool\obj\Debug\CamTool.csproj.CoreCompileI
 C:\Users\drew\Projects\win\CamTool\CamTool\obj\Debug\CamTool.csproj.CopyComplete
 C:\Users\drew\Projects\win\CamTool\CamTool\obj\Debug\CamTool.exe
 C:\Users\drew\Projects\win\CamTool\CamTool\obj\Debug\CamTool.pdb
+C:\Users\xiong\Projects\CamTool\CamTool\bin\Debug\log4net.config
+C:\Users\xiong\Projects\CamTool\CamTool\bin\Debug\CamTool.exe.config
+C:\Users\xiong\Projects\CamTool\CamTool\bin\Debug\CamTool.exe
+C:\Users\xiong\Projects\CamTool\CamTool\bin\Debug\CamTool.pdb
+C:\Users\xiong\Projects\CamTool\CamTool\bin\Debug\log4net.dll
+C:\Users\xiong\Projects\CamTool\CamTool\bin\Debug\Newtonsoft.Json.dll
+C:\Users\xiong\Projects\CamTool\CamTool\bin\Debug\RestSharp.dll
+C:\Users\xiong\Projects\CamTool\CamTool\bin\Debug\log4net.xml
+C:\Users\xiong\Projects\CamTool\CamTool\bin\Debug\Newtonsoft.Json.xml
+C:\Users\xiong\Projects\CamTool\CamTool\bin\Debug\RestSharp.xml
+C:\Users\xiong\Projects\CamTool\CamTool\obj\Debug\CamTool.csprojAssemblyReference.cache
+C:\Users\xiong\Projects\CamTool\CamTool\obj\Debug\MainWindow.g.cs
+C:\Users\xiong\Projects\CamTool\CamTool\obj\Debug\App.g.cs
+C:\Users\xiong\Projects\CamTool\CamTool\obj\Debug\CamTool_MarkupCompile.cache
+C:\Users\xiong\Projects\CamTool\CamTool\obj\Debug\CamTool_MarkupCompile.lref
+C:\Users\xiong\Projects\CamTool\CamTool\obj\Debug\MainWindow.baml
+C:\Users\xiong\Projects\CamTool\CamTool\obj\Debug\CamTool.g.resources
+C:\Users\xiong\Projects\CamTool\CamTool\obj\Debug\CamTool.Properties.Resources.resources
+C:\Users\xiong\Projects\CamTool\CamTool\obj\Debug\CamTool.csproj.GenerateResource.cache
+C:\Users\xiong\Projects\CamTool\CamTool\obj\Debug\CamTool.csproj.CoreCompileInputs.cache
+C:\Users\xiong\Projects\CamTool\CamTool\obj\Debug\CamTool.csproj.CopyComplete
+C:\Users\xiong\Projects\CamTool\CamTool\obj\Debug\CamTool.exe
+C:\Users\xiong\Projects\CamTool\CamTool\obj\Debug\CamTool.pdb

BIN
CamTool/obj/Debug/CamTool.csproj.GenerateResource.cache


BIN
CamTool/obj/Debug/CamTool.csprojAssemblyReference.cache


BIN
CamTool/obj/Debug/CamTool.exe


BIN
CamTool/obj/Debug/CamTool.g.resources


BIN
CamTool/obj/Debug/CamTool.pdb


+ 3 - 3
CamTool/obj/Debug/CamTool_MarkupCompile.cache

@@ -4,16 +4,16 @@
 winexe
 C#
 .cs
-C:\Users\drew\Projects\win\CamTool\CamTool\obj\Debug\
+C:\Users\xiong\Projects\CamTool\CamTool\obj\Debug\
 CamTool
 none
 false
 DEBUG;TRACE
-C:\Users\drew\Projects\win\CamTool\CamTool\App.xaml
+C:\Users\xiong\Projects\CamTool\CamTool\App.xaml
 11151548125
 
 19-406300163
-19-1126508823
+19321657741
 MainWindow.xaml;
 
 False

+ 1 - 1
CamTool/obj/Debug/CamTool_MarkupCompile.lref

@@ -1,4 +1,4 @@
 
 
-FC:\Users\drew\Projects\win\CamTool\CamTool\MainWindow.xaml;;
+FC:\Users\xiong\Projects\CamTool\CamTool\MainWindow.xaml;;
 

BIN
CamTool/obj/Debug/MainWindow.baml


+ 1 - 1
CamTool/obj/Debug/MainWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "73B89C23B62008AB5499BFC7182F9ADE73C0C878F7485AAFB9ACC6AECDA8FE35"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C066F4AAD0DC39221DAED39D8B444B5F979251D9FDE5F6BBC772D5DA61E29EF8"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

+ 1 - 1
CamTool/obj/Debug/MainWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "73B89C23B62008AB5499BFC7182F9ADE73C0C878F7485AAFB9ACC6AECDA8FE35"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C066F4AAD0DC39221DAED39D8B444B5F979251D9FDE5F6BBC772D5DA61E29EF8"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

+ 1 - 1
CamTool/obj/x86/Debug/CamTool.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-8b0efca6324a5ec42b9b0965dc61f1618b74392b
+812e9ea9c6ac4710d91b58e6c8be62f6b9a84520

+ 23 - 0
CamTool/obj/x86/Debug/CamTool.csproj.FileListAbsolute.txt

@@ -83,3 +83,26 @@ C:\Users\xiong\Projects\win\CamTool\CamTool\obj\x86\Debug\CamTool.csproj.CoreCom
 C:\Users\xiong\Projects\win\CamTool\CamTool\obj\x86\Debug\CamTool.csproj.CopyComplete
 C:\Users\xiong\Projects\win\CamTool\CamTool\obj\x86\Debug\CamTool.exe
 C:\Users\xiong\Projects\win\CamTool\CamTool\obj\x86\Debug\CamTool.pdb
+C:\Users\xiong\Projects\CamTool\CamTool\bin\x86\Debug\log4net.config
+C:\Users\xiong\Projects\CamTool\CamTool\bin\x86\Debug\CamTool.exe.config
+C:\Users\xiong\Projects\CamTool\CamTool\bin\x86\Debug\CamTool.exe
+C:\Users\xiong\Projects\CamTool\CamTool\bin\x86\Debug\CamTool.pdb
+C:\Users\xiong\Projects\CamTool\CamTool\bin\x86\Debug\log4net.dll
+C:\Users\xiong\Projects\CamTool\CamTool\bin\x86\Debug\Newtonsoft.Json.dll
+C:\Users\xiong\Projects\CamTool\CamTool\bin\x86\Debug\RestSharp.dll
+C:\Users\xiong\Projects\CamTool\CamTool\bin\x86\Debug\log4net.xml
+C:\Users\xiong\Projects\CamTool\CamTool\bin\x86\Debug\Newtonsoft.Json.xml
+C:\Users\xiong\Projects\CamTool\CamTool\bin\x86\Debug\RestSharp.xml
+C:\Users\xiong\Projects\CamTool\CamTool\obj\x86\Debug\CamTool.csprojAssemblyReference.cache
+C:\Users\xiong\Projects\CamTool\CamTool\obj\x86\Debug\MainWindow.g.cs
+C:\Users\xiong\Projects\CamTool\CamTool\obj\x86\Debug\App.g.cs
+C:\Users\xiong\Projects\CamTool\CamTool\obj\x86\Debug\CamTool_MarkupCompile.cache
+C:\Users\xiong\Projects\CamTool\CamTool\obj\x86\Debug\CamTool_MarkupCompile.lref
+C:\Users\xiong\Projects\CamTool\CamTool\obj\x86\Debug\MainWindow.baml
+C:\Users\xiong\Projects\CamTool\CamTool\obj\x86\Debug\CamTool.g.resources
+C:\Users\xiong\Projects\CamTool\CamTool\obj\x86\Debug\CamTool.Properties.Resources.resources
+C:\Users\xiong\Projects\CamTool\CamTool\obj\x86\Debug\CamTool.csproj.GenerateResource.cache
+C:\Users\xiong\Projects\CamTool\CamTool\obj\x86\Debug\CamTool.csproj.CoreCompileInputs.cache
+C:\Users\xiong\Projects\CamTool\CamTool\obj\x86\Debug\CamTool.csproj.CopyComplete
+C:\Users\xiong\Projects\CamTool\CamTool\obj\x86\Debug\CamTool.exe
+C:\Users\xiong\Projects\CamTool\CamTool\obj\x86\Debug\CamTool.pdb

BIN
CamTool/obj/x86/Debug/CamTool.csproj.GenerateResource.cache


BIN
CamTool/obj/x86/Debug/CamTool.csprojAssemblyReference.cache


BIN
CamTool/obj/x86/Debug/CamTool.exe


BIN
CamTool/obj/x86/Debug/CamTool.g.resources


BIN
CamTool/obj/x86/Debug/CamTool.pdb


+ 3 - 3
CamTool/obj/x86/Debug/CamTool_MarkupCompile.cache

@@ -4,16 +4,16 @@
 winexe
 C#
 .cs
-C:\Users\xiong\Projects\csharp\CamTool\CamTool\obj\x86\Debug\
+C:\Users\xiong\Projects\CamTool\CamTool\obj\x86\Debug\
 CamTool
 none
 false
 
-C:\Users\xiong\Projects\csharp\CamTool\CamTool\App.xaml
+C:\Users\xiong\Projects\CamTool\CamTool\App.xaml
 11151548125
 
 19-406300163
-191610000482
+19321657741
 MainWindow.xaml;
 
 False

+ 1 - 1
CamTool/obj/x86/Debug/CamTool_MarkupCompile.lref

@@ -1,4 +1,4 @@
 
 
-FC:\Users\xiong\Projects\csharp\CamTool\CamTool\MainWindow.xaml;;
+FC:\Users\xiong\Projects\CamTool\CamTool\MainWindow.xaml;;
 

BIN
CamTool/obj/x86/Debug/MainWindow.baml


+ 1 - 1
CamTool/obj/x86/Debug/MainWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "73B89C23B62008AB5499BFC7182F9ADE73C0C878F7485AAFB9ACC6AECDA8FE35"
+#pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C066F4AAD0DC39221DAED39D8B444B5F979251D9FDE5F6BBC772D5DA61E29EF8"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。

+ 1 - 1
CamTool/obj/x86/Debug/MainWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "73B89C23B62008AB5499BFC7182F9ADE73C0C878F7485AAFB9ACC6AECDA8FE35"
+#pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C066F4AAD0DC39221DAED39D8B444B5F979251D9FDE5F6BBC772D5DA61E29EF8"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。