diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index 59f6bf3..e356dfa 100644 Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config index 896cda7..5c4fdaf 100644 --- a/shangjian/XGL/App.config +++ b/shangjian/XGL/App.config @@ -12,7 +12,7 @@ - + diff --git a/shangjian/XGL/FormItem/Main.xaml b/shangjian/XGL/FormItem/Main.xaml index 5f89042..920bd33 100644 --- a/shangjian/XGL/FormItem/Main.xaml +++ b/shangjian/XGL/FormItem/Main.xaml @@ -349,6 +349,7 @@ VerticalAlignment="Center" Orientation="Horizontal"> // 此代码由工具生成。 @@ -67,7 +67,15 @@ namespace XGL.FormItem { #line hidden - #line 358 "..\..\..\..\FormItem\Main.xaml" + #line 352 "..\..\..\..\FormItem\Main.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock shebei; + + #line default + #line hidden + + + #line 359 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock tbDevice; @@ -75,7 +83,7 @@ namespace XGL.FormItem { #line hidden - #line 382 "..\..\..\..\FormItem\Main.xaml" + #line 383 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label LbDeviceState; @@ -83,7 +91,7 @@ namespace XGL.FormItem { #line hidden - #line 412 "..\..\..\..\FormItem\Main.xaml" + #line 413 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock tbOperator; @@ -91,7 +99,7 @@ namespace XGL.FormItem { #line hidden - #line 423 "..\..\..\..\FormItem\Main.xaml" + #line 424 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid UpperStart2; @@ -99,7 +107,7 @@ namespace XGL.FormItem { #line hidden - #line 430 "..\..\..\..\FormItem\Main.xaml" + #line 431 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ContentControl Index; @@ -107,7 +115,7 @@ namespace XGL.FormItem { #line hidden - #line 459 "..\..\..\..\FormItem\Main.xaml" + #line 460 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label LabDate; @@ -115,7 +123,7 @@ namespace XGL.FormItem { #line hidden - #line 470 "..\..\..\..\FormItem\Main.xaml" + #line 471 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label LabTime; @@ -123,7 +131,7 @@ namespace XGL.FormItem { #line hidden - #line 520 "..\..\..\..\FormItem\Main.xaml" + #line 521 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel DownStart; @@ -131,7 +139,7 @@ namespace XGL.FormItem { #line hidden - #line 542 "..\..\..\..\FormItem\Main.xaml" + #line 543 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock myTb; @@ -139,7 +147,7 @@ namespace XGL.FormItem { #line hidden - #line 545 "..\..\..\..\FormItem\Main.xaml" + #line 546 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Documents.Run btnText; @@ -147,7 +155,7 @@ namespace XGL.FormItem { #line hidden - #line 557 "..\..\..\..\FormItem\Main.xaml" + #line 558 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label lbVersion; @@ -155,7 +163,7 @@ namespace XGL.FormItem { #line hidden - #line 566 "..\..\..\..\FormItem\Main.xaml" + #line 567 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button notsos; @@ -163,7 +171,7 @@ namespace XGL.FormItem { #line hidden - #line 569 "..\..\..\..\FormItem\Main.xaml" + #line 570 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnZXH; @@ -171,7 +179,7 @@ namespace XGL.FormItem { #line hidden - #line 573 "..\..\..\..\FormItem\Main.xaml" + #line 574 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnFault; @@ -232,60 +240,63 @@ namespace XGL.FormItem { this.tbLineCode = ((System.Windows.Controls.TextBlock)(target)); return; case 5: - this.tbDevice = ((System.Windows.Controls.TextBlock)(target)); + this.shebei = ((System.Windows.Controls.TextBlock)(target)); return; case 6: - this.LbDeviceState = ((System.Windows.Controls.Label)(target)); + this.tbDevice = ((System.Windows.Controls.TextBlock)(target)); return; case 7: - this.tbOperator = ((System.Windows.Controls.TextBlock)(target)); + this.LbDeviceState = ((System.Windows.Controls.Label)(target)); return; case 8: - this.UpperStart2 = ((System.Windows.Controls.Grid)(target)); + this.tbOperator = ((System.Windows.Controls.TextBlock)(target)); return; case 9: - this.Index = ((System.Windows.Controls.ContentControl)(target)); + this.UpperStart2 = ((System.Windows.Controls.Grid)(target)); return; case 10: - this.LabDate = ((System.Windows.Controls.Label)(target)); + this.Index = ((System.Windows.Controls.ContentControl)(target)); return; case 11: - this.LabTime = ((System.Windows.Controls.Label)(target)); + this.LabDate = ((System.Windows.Controls.Label)(target)); return; case 12: - this.DownStart = ((System.Windows.Controls.StackPanel)(target)); + this.LabTime = ((System.Windows.Controls.Label)(target)); return; case 13: - this.myTb = ((System.Windows.Controls.TextBlock)(target)); + this.DownStart = ((System.Windows.Controls.StackPanel)(target)); return; case 14: - this.btnText = ((System.Windows.Documents.Run)(target)); + this.myTb = ((System.Windows.Controls.TextBlock)(target)); return; case 15: - this.lbVersion = ((System.Windows.Controls.Label)(target)); + this.btnText = ((System.Windows.Documents.Run)(target)); return; case 16: + this.lbVersion = ((System.Windows.Controls.Label)(target)); + return; + case 17: this.notsos = ((System.Windows.Controls.Button)(target)); - #line 566 "..\..\..\..\FormItem\Main.xaml" + #line 567 "..\..\..\..\FormItem\Main.xaml" this.notsos.Click += new System.Windows.RoutedEventHandler(this.notsos_Click); #line default #line hidden return; - case 17: + case 18: this.btnZXH = ((System.Windows.Controls.Button)(target)); - #line 569 "..\..\..\..\FormItem\Main.xaml" + #line 570 "..\..\..\..\FormItem\Main.xaml" this.btnZXH.Click += new System.Windows.RoutedEventHandler(this.btnZXH_Click); #line default #line hidden return; - case 18: + case 19: this.btnFault = ((System.Windows.Controls.Button)(target)); - #line 578 "..\..\..\..\FormItem\Main.xaml" + #line 579 "..\..\..\..\FormItem\Main.xaml" this.btnFault.Click += new System.Windows.RoutedEventHandler(this.btnExit_Click); #line default diff --git a/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.i.cs b/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.i.cs index 08ba4d5..a4def5a 100644 --- a/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.i.cs +++ b/shangjian/XGL/obj/x86/Debug/FormItem/Main.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "84CC84ABB2A43A21EBE699A00C7C6E77D0AC1C22377A9346B423E5E739555B93" +#pragma checksum "..\..\..\..\FormItem\Main.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "E38DC8F69DCC9829AAB04D5A881B058BA816B655E361D925290D51D85F8B778A" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -67,7 +67,15 @@ namespace XGL.FormItem { #line hidden - #line 358 "..\..\..\..\FormItem\Main.xaml" + #line 352 "..\..\..\..\FormItem\Main.xaml" + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + internal System.Windows.Controls.TextBlock shebei; + + #line default + #line hidden + + + #line 359 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock tbDevice; @@ -75,7 +83,7 @@ namespace XGL.FormItem { #line hidden - #line 382 "..\..\..\..\FormItem\Main.xaml" + #line 383 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label LbDeviceState; @@ -83,7 +91,7 @@ namespace XGL.FormItem { #line hidden - #line 412 "..\..\..\..\FormItem\Main.xaml" + #line 413 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock tbOperator; @@ -91,7 +99,7 @@ namespace XGL.FormItem { #line hidden - #line 423 "..\..\..\..\FormItem\Main.xaml" + #line 424 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Grid UpperStart2; @@ -99,7 +107,7 @@ namespace XGL.FormItem { #line hidden - #line 430 "..\..\..\..\FormItem\Main.xaml" + #line 431 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.ContentControl Index; @@ -107,7 +115,7 @@ namespace XGL.FormItem { #line hidden - #line 459 "..\..\..\..\FormItem\Main.xaml" + #line 460 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label LabDate; @@ -115,7 +123,7 @@ namespace XGL.FormItem { #line hidden - #line 470 "..\..\..\..\FormItem\Main.xaml" + #line 471 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label LabTime; @@ -123,7 +131,7 @@ namespace XGL.FormItem { #line hidden - #line 520 "..\..\..\..\FormItem\Main.xaml" + #line 521 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.StackPanel DownStart; @@ -131,7 +139,7 @@ namespace XGL.FormItem { #line hidden - #line 542 "..\..\..\..\FormItem\Main.xaml" + #line 543 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock myTb; @@ -139,7 +147,7 @@ namespace XGL.FormItem { #line hidden - #line 545 "..\..\..\..\FormItem\Main.xaml" + #line 546 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Documents.Run btnText; @@ -147,7 +155,7 @@ namespace XGL.FormItem { #line hidden - #line 557 "..\..\..\..\FormItem\Main.xaml" + #line 558 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Label lbVersion; @@ -155,7 +163,7 @@ namespace XGL.FormItem { #line hidden - #line 566 "..\..\..\..\FormItem\Main.xaml" + #line 567 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button notsos; @@ -163,7 +171,7 @@ namespace XGL.FormItem { #line hidden - #line 569 "..\..\..\..\FormItem\Main.xaml" + #line 570 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnZXH; @@ -171,7 +179,7 @@ namespace XGL.FormItem { #line hidden - #line 573 "..\..\..\..\FormItem\Main.xaml" + #line 574 "..\..\..\..\FormItem\Main.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button btnFault; @@ -232,60 +240,63 @@ namespace XGL.FormItem { this.tbLineCode = ((System.Windows.Controls.TextBlock)(target)); return; case 5: - this.tbDevice = ((System.Windows.Controls.TextBlock)(target)); + this.shebei = ((System.Windows.Controls.TextBlock)(target)); return; case 6: - this.LbDeviceState = ((System.Windows.Controls.Label)(target)); + this.tbDevice = ((System.Windows.Controls.TextBlock)(target)); return; case 7: - this.tbOperator = ((System.Windows.Controls.TextBlock)(target)); + this.LbDeviceState = ((System.Windows.Controls.Label)(target)); return; case 8: - this.UpperStart2 = ((System.Windows.Controls.Grid)(target)); + this.tbOperator = ((System.Windows.Controls.TextBlock)(target)); return; case 9: - this.Index = ((System.Windows.Controls.ContentControl)(target)); + this.UpperStart2 = ((System.Windows.Controls.Grid)(target)); return; case 10: - this.LabDate = ((System.Windows.Controls.Label)(target)); + this.Index = ((System.Windows.Controls.ContentControl)(target)); return; case 11: - this.LabTime = ((System.Windows.Controls.Label)(target)); + this.LabDate = ((System.Windows.Controls.Label)(target)); return; case 12: - this.DownStart = ((System.Windows.Controls.StackPanel)(target)); + this.LabTime = ((System.Windows.Controls.Label)(target)); return; case 13: - this.myTb = ((System.Windows.Controls.TextBlock)(target)); + this.DownStart = ((System.Windows.Controls.StackPanel)(target)); return; case 14: - this.btnText = ((System.Windows.Documents.Run)(target)); + this.myTb = ((System.Windows.Controls.TextBlock)(target)); return; case 15: - this.lbVersion = ((System.Windows.Controls.Label)(target)); + this.btnText = ((System.Windows.Documents.Run)(target)); return; case 16: + this.lbVersion = ((System.Windows.Controls.Label)(target)); + return; + case 17: this.notsos = ((System.Windows.Controls.Button)(target)); - #line 566 "..\..\..\..\FormItem\Main.xaml" + #line 567 "..\..\..\..\FormItem\Main.xaml" this.notsos.Click += new System.Windows.RoutedEventHandler(this.notsos_Click); #line default #line hidden return; - case 17: + case 18: this.btnZXH = ((System.Windows.Controls.Button)(target)); - #line 569 "..\..\..\..\FormItem\Main.xaml" + #line 570 "..\..\..\..\FormItem\Main.xaml" this.btnZXH.Click += new System.Windows.RoutedEventHandler(this.btnZXH_Click); #line default #line hidden return; - case 18: + case 19: this.btnFault = ((System.Windows.Controls.Button)(target)); - #line 578 "..\..\..\..\FormItem\Main.xaml" + #line 579 "..\..\..\..\FormItem\Main.xaml" this.btnFault.Click += new System.Windows.RoutedEventHandler(this.btnExit_Click); #line default diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml index 3f516d9..ed1cdd6 100644 Binary files a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml and b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Operator.baml differ diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs index faf2018..cd418b4 100644 --- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs +++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C41C0F6408F571D0A43946E277603A73C43EE476D5D0A621C63C1A2021A4F740" +#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0A5FD97D2D955461CAEDBE69C6CAF78B96F3F157BD1BF36EC001B750938330D8" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs index faf2018..cd418b4 100644 --- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs +++ b/shangjian/XGL/obj/x86/Debug/Views/LanJu_Prepare.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "C41C0F6408F571D0A43946E277603A73C43EE476D5D0A621C63C1A2021A4F740" +#pragma checksum "..\..\..\..\Views\LanJu_Prepare.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0A5FD97D2D955461CAEDBE69C6CAF78B96F3F157BD1BF36EC001B750938330D8" //------------------------------------------------------------------------------ // // 此代码由工具生成。 diff --git a/shangjian/XGL/obj/x86/Debug/XGL.exe b/shangjian/XGL/obj/x86/Debug/XGL.exe index 65c243a..a7c041c 100644 Binary files a/shangjian/XGL/obj/x86/Debug/XGL.exe and b/shangjian/XGL/obj/x86/Debug/XGL.exe differ diff --git a/shangjian/XGL/obj/x86/Debug/XGL.g.resources b/shangjian/XGL/obj/x86/Debug/XGL.g.resources index 9307b63..59d9422 100644 Binary files a/shangjian/XGL/obj/x86/Debug/XGL.g.resources and b/shangjian/XGL/obj/x86/Debug/XGL.g.resources differ diff --git a/shangjian/XGL/obj/x86/Debug/XGL.pdb b/shangjian/XGL/obj/x86/Debug/XGL.pdb index 17f6731..2ba5c73 100644 Binary files a/shangjian/XGL/obj/x86/Debug/XGL.pdb and b/shangjian/XGL/obj/x86/Debug/XGL.pdb differ