xiongzhu 6 lat temu
rodzic
commit
ffc747c44a

+ 33 - 32
CamTool/log4net.config

@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <log4net>
-  <root>
-    <level value="INFO" />
-    <appender-ref ref="console" />
-    <appender-ref ref="RollingLogFileAppender" />
-  </root>
-  <appender name="console" type="log4net.Appender.ConsoleAppender">
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%date %level %logger - %message%newline" />
-    </layout>
-  </appender>
-  <appender name="file" type="log4net.Appender.RollingFileAppender">
-    <file value="DIRECTORY WHERE YOU WANT TO COPY THE LOG FILES\LOG_FILE_NAME.log" />
-    <appendToFile value="true" />
-    <rollingStyle value="Size" />
-    <maxSizeRollBackups value="5" />
-    <maximumFileSize value="2MB" />
-    <staticLogFileName value="true" />
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%date [%thread] %level %logger - %message%newline" />
-    </layout>
-  </appender>
-  <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-    <file value="logs\app.log" />
-    <appendToFile value="true" />
-    <rollingStyle value="Date" />
-    <maxSizeRollBackups value="30" />
-    <maximumFileSize value="10MB" />
-    <datePattern value="yyyyMMdd-HHmm" />
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%date %level %logger - %message%newline" />
-    </layout>
-  </appender>
+	<root>
+		<level value="INFO" />
+		<appender-ref ref="console" />
+		<appender-ref ref="RollingLogFileAppender" />
+	</root>
+	<appender name="console" type="log4net.Appender.ConsoleAppender">
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%date %level %logger - %message%newline" />
+		</layout>
+	</appender>
+	<appender name="file" type="log4net.Appender.RollingFileAppender">
+		<file value="DIRECTORY WHERE YOU WANT TO COPY THE LOG FILES\LOG_FILE_NAME.log" />
+		<appendToFile value="true" />
+		<rollingStyle value="Size" />
+		<maxSizeRollBackups value="5" />
+		<maximumFileSize value="2MB" />
+		<staticLogFileName value="true" />
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%date [%thread] %level %logger - %message%newline" />
+		</layout>
+	</appender>
+	<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
+		<file value="logs\app.log" />
+		<appendToFile value="true" />
+		<rollingStyle value="Date" />
+		<maxSizeRollBackups value="30" />
+		<maximumFileSize value="100MB" />
+		<datePattern value=".yyyy-MM-dd.\l\o\g" />
+		<rollingStyle value="date"/>
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%date %level %logger - %message%newline" />
+		</layout>
+	</appender>
 </log4net>

+ 13 - 1
CamTool/obj/Debug/App.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4FA94C1BB2A1B4EB3B2F9717FB93D944B1D24EEEEEE1151D76B5FA55147F088A"
+#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EE6689AD4D58812B360CD389A8E9D432736BEED59E63DCFC5DADF33C550A99CF"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -47,6 +47,18 @@ namespace CamTool {
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
         public void InitializeComponent() {
             
+            #line 5 "..\..\App.xaml"
+            this.DispatcherUnhandledException += new System.Windows.Threading.DispatcherUnhandledExceptionEventHandler(this.Application_DispatcherUnhandledException);
+            
+            #line default
+            #line hidden
+            
+            #line 5 "..\..\App.xaml"
+            this.Exit += new System.Windows.ExitEventHandler(this.Application_Exit);
+            
+            #line default
+            #line hidden
+            
             #line 5 "..\..\App.xaml"
             this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative);
             

+ 13 - 1
CamTool/obj/Debug/App.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "4FA94C1BB2A1B4EB3B2F9717FB93D944B1D24EEEEEE1151D76B5FA55147F088A"
+#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "EE6689AD4D58812B360CD389A8E9D432736BEED59E63DCFC5DADF33C550A99CF"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -47,6 +47,18 @@ namespace CamTool {
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
         public void InitializeComponent() {
             
+            #line 5 "..\..\App.xaml"
+            this.DispatcherUnhandledException += new System.Windows.Threading.DispatcherUnhandledExceptionEventHandler(this.Application_DispatcherUnhandledException);
+            
+            #line default
+            #line hidden
+            
+            #line 5 "..\..\App.xaml"
+            this.Exit += new System.Windows.ExitEventHandler(this.Application_Exit);
+            
+            #line default
+            #line hidden
+            
             #line 5 "..\..\App.xaml"
             this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative);
             

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


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

@@ -4,16 +4,16 @@
 winexe
 C#
 .cs
-C:\Users\drew\Desktop\CamTool\CamTool\obj\Debug\
+C:\Users\drew\Projects\win\CamTool\CamTool\obj\Debug\
 CamTool
 none
 false
 DEBUG;TRACE
-C:\Users\drew\Desktop\CamTool\CamTool\App.xaml
+C:\Users\drew\Projects\win\CamTool\CamTool\App.xaml
 11151548125
 
-7-860850497
-121654848548
+111320074826
+18-1693679402
 MainWindow.xaml;
 
 True

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

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

+ 22 - 2
CamTool/obj/Debug/MainWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "95D50825EFC577AD63A1AD2C25CC18D0E2A21A58C6B4787F79930E8754C3D5FD"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "089DC85E32039CAC2D63D2A02E792DE48ABF1A53B65B4DB00DF05344E958D308"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -56,6 +56,22 @@ namespace CamTool {
         #line default
         #line hidden
         
+        
+        #line 17 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox server;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 19 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button Btn_Start;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -107,9 +123,13 @@ namespace CamTool {
             this.camOutIP = ((System.Windows.Controls.TextBox)(target));
             return;
             case 4:
+            this.server = ((System.Windows.Controls.TextBox)(target));
+            return;
+            case 5:
+            this.Btn_Start = ((System.Windows.Controls.Button)(target));
             
             #line 20 "..\..\MainWindow.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
+            this.Btn_Start.Click += new System.Windows.RoutedEventHandler(this.Button_Click);
             
             #line default
             #line hidden

+ 22 - 2
CamTool/obj/Debug/MainWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "95D50825EFC577AD63A1AD2C25CC18D0E2A21A58C6B4787F79930E8754C3D5FD"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "089DC85E32039CAC2D63D2A02E792DE48ABF1A53B65B4DB00DF05344E958D308"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -56,6 +56,22 @@ namespace CamTool {
         #line default
         #line hidden
         
+        
+        #line 17 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox server;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 19 "..\..\MainWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button Btn_Start;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -107,9 +123,13 @@ namespace CamTool {
             this.camOutIP = ((System.Windows.Controls.TextBox)(target));
             return;
             case 4:
+            this.server = ((System.Windows.Controls.TextBox)(target));
+            return;
+            case 5:
+            this.Btn_Start = ((System.Windows.Controls.Button)(target));
             
             #line 20 "..\..\MainWindow.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
+            this.Btn_Start.Click += new System.Windows.RoutedEventHandler(this.Button_Click);
             
             #line default
             #line hidden