diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo index ed8fd4a..da3ff3e 100644 Binary files a/shangjian/.vs/BL/v17/.suo and b/shangjian/.vs/BL/v17/.suo differ diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.application b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.application index d17f196..24d78c2 100644 --- a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.application +++ b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.application @@ -1,7 +1,7 @@  - + @@ -14,7 +14,7 @@ - UDIK1LWGtaGVshr2mLrwELButE1vzUzbgzij3shhDnw= + u1K2cqbB56xwixKbhy0eKCftxfa07TGwWwtdOtL8PIs= diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe index bc46c3e..7095052 100644 Binary files a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe and b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe differ diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest index 326d764..49d1b82 100644 --- a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest +++ b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest @@ -49,7 +49,7 @@ - SxzOrr+CVv0cVMqucQhCKOAUGimCliKPSXFqjkQ8jSM= + WAPtOpDlGQDOGkow6DsogCU4DmdHhdL4pDDQZXfblYE= diff --git a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.pdb b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.pdb index ef20e2f..a7f695d 100644 Binary files a/shangjian/AutoUpdate/bin/Debug/AutoUpdate.pdb and b/shangjian/AutoUpdate/bin/Debug/AutoUpdate.pdb differ diff --git a/shangjian/AutoUpdate/bin/Debug/app.publish/AutoUpdate.exe b/shangjian/AutoUpdate/bin/Debug/app.publish/AutoUpdate.exe index bc46c3e..7095052 100644 Binary files a/shangjian/AutoUpdate/bin/Debug/app.publish/AutoUpdate.exe and b/shangjian/AutoUpdate/bin/Debug/app.publish/AutoUpdate.exe differ diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application index d17f196..24d78c2 100644 --- a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application +++ b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application @@ -1,7 +1,7 @@  - + @@ -14,7 +14,7 @@ - UDIK1LWGtaGVshr2mLrwELButE1vzUzbgzij3shhDnw= + u1K2cqbB56xwixKbhy0eKCftxfa07TGwWwtdOtL8PIs= diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache index e4772a7..97c5d4d 100644 Binary files a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache and b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.AssemblyReference.cache differ diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.CoreCompileInputs.cache b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.CoreCompileInputs.cache index 67d7c4b..3e54865 100644 --- a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.CoreCompileInputs.cache +++ b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eea3ff7a82b036285dd19ec3ef2dc8d3e7eddf67 +f67dc885e7551d573c533635607a154a9fcfd039 diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.FileListAbsolute.txt b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.FileListAbsolute.txt index 7ac03ac..d4f7e0d 100644 --- a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.FileListAbsolute.txt +++ b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.FileListAbsolute.txt @@ -50,3 +50,21 @@ E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.applicat E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.CopyComplete E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.exe E:\workspace\LanJu\client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.pdb +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\7z.dll +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\7z64.dll +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.exe.config +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.exe.manifest +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.application +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.exe +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\AutoUpdate.pdb +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\bin\Debug\SevenZipSharp.dll +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.AssemblyReference.cache +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.SuggestedBindingRedirects.cache +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.Properties.Resources.resources +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.GenerateResource.cache +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.CoreCompileInputs.cache +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.exe.manifest +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.application +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.csproj.CopyComplete +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.exe +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\AutoUpdate\obj\x86\Debug\AutoUpdate.pdb diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.GenerateResource.cache b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.GenerateResource.cache index 62d51ac..74285bb 100644 Binary files a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.GenerateResource.cache and b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.GenerateResource.cache differ diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe index bc46c3e..7095052 100644 Binary files a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe and b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe differ diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest index 326d764..49d1b82 100644 --- a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest +++ b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest @@ -49,7 +49,7 @@ - SxzOrr+CVv0cVMqucQhCKOAUGimCliKPSXFqjkQ8jSM= + WAPtOpDlGQDOGkow6DsogCU4DmdHhdL4pDDQZXfblYE= diff --git a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.pdb b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.pdb index ef20e2f..a7f695d 100644 Binary files a/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.pdb and b/shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.pdb differ diff --git a/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index baa8879..946926c 100644 Binary files a/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/AutoUpdate/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.exe b/shangjian/CentralControl/bin/Debug/CentralControl.exe index 6c1c410..e3b4e0c 100644 Binary files a/shangjian/CentralControl/bin/Debug/CentralControl.exe and b/shangjian/CentralControl/bin/Debug/CentralControl.exe differ diff --git a/shangjian/CentralControl/bin/Debug/CentralControl.pdb b/shangjian/CentralControl/bin/Debug/CentralControl.pdb index b0cdf3a..303470b 100644 Binary files a/shangjian/CentralControl/bin/Debug/CentralControl.pdb and b/shangjian/CentralControl/bin/Debug/CentralControl.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/CommonFunc.dll b/shangjian/CentralControl/bin/Debug/CommonFunc.dll index ab90d47..a1c3f68 100644 Binary files a/shangjian/CentralControl/bin/Debug/CommonFunc.dll and b/shangjian/CentralControl/bin/Debug/CommonFunc.dll differ diff --git a/shangjian/CentralControl/bin/Debug/CommonFunc.pdb b/shangjian/CentralControl/bin/Debug/CommonFunc.pdb index 4f85efe..4cc3fea 100644 Binary files a/shangjian/CentralControl/bin/Debug/CommonFunc.pdb and b/shangjian/CentralControl/bin/Debug/CommonFunc.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.dll b/shangjian/CentralControl/bin/Debug/XGL.Data.dll index 44dc8c6..1a09629 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Data.dll and b/shangjian/CentralControl/bin/Debug/XGL.Data.dll differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb index 27223ab..b18a7b7 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Data.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Data.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Models.dll b/shangjian/CentralControl/bin/Debug/XGL.Models.dll index 1a26f53..9f6865a 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Models.dll and b/shangjian/CentralControl/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Models.pdb b/shangjian/CentralControl/bin/Debug/XGL.Models.pdb index dbe1773..966febc 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Models.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll b/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll index e5f2e95..c4b3406 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll and b/shangjian/CentralControl/bin/Debug/XGL.Thrift.dll differ diff --git a/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb b/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb index 4408b54..733af8f 100644 Binary files a/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb and b/shangjian/CentralControl/bin/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache index ffe8a94..ab18f37 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache and b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.AssemblyReference.cache differ diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache index 580e9dc..bd9c3bb 100644 --- a/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache +++ b/shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -0abd85b80046b9258518751daf3009dfc20e23db +65ea42614d5210ce1f76f304a0b99eadc686e4a3 diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.exe b/shangjian/CentralControl/obj/Debug/CentralControl.exe index 6c1c410..e3b4e0c 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.exe and b/shangjian/CentralControl/obj/Debug/CentralControl.exe differ diff --git a/shangjian/CentralControl/obj/Debug/CentralControl.pdb b/shangjian/CentralControl/obj/Debug/CentralControl.pdb index b0cdf3a..303470b 100644 Binary files a/shangjian/CentralControl/obj/Debug/CentralControl.pdb and b/shangjian/CentralControl/obj/Debug/CentralControl.pdb differ diff --git a/shangjian/CentralControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/CentralControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 96da0ef..af63f5e 100644 Binary files a/shangjian/CentralControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/CentralControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/CommonFunc/LoginUserInfo.cs b/shangjian/CommonFunc/LoginUserInfo.cs index 4d4d3f3..b56a865 100644 --- a/shangjian/CommonFunc/LoginUserInfo.cs +++ b/shangjian/CommonFunc/LoginUserInfo.cs @@ -35,6 +35,12 @@ namespace CommonFunc /// 班次 /// public static string ShiftCode { get; set; } + + + /// + /// 版本 + /// + public static string Version { get; set; } } public class vsionclass { diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll index ab90d47..a1c3f68 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll and b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb index 4f85efe..4cc3fea 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb and b/shangjian/CommonFunc/bin/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll index 1a26f53..9f6865a 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll and b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.dll differ diff --git a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb index dbe1773..966febc 100644 Binary files a/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb and b/shangjian/CommonFunc/bin/x86/Debug/XGL.Models.pdb differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache index e36d190..0effda4 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.AssemblyReference.cache differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache index 23dc6dc..d4e0d75 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -ae55a20c78909b7f5eb9ba6dc5a5b469abf93216 +cfb04e75b94c39ee4374f63be8ad6b6fac4e7180 diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.FileListAbsolute.txt b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.FileListAbsolute.txt index f3fd1f2..18b2134 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.FileListAbsolute.txt +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.FileListAbsolute.txt @@ -241,3 +241,4 @@ E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.csproj.C E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.dll E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\CommonFunc.pdb E:\workspace\LanJu\client\shangjian\CommonFunc\bin\x86\Debug\NLog.dll +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\bin\x86\Debug\NLog.dll diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll index ab90d47..a1c3f68 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb index 4f85efe..4cc3fea 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb and b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache index e964739..90935ef 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.cache @@ -4,7 +4,7 @@ library C# .cs -E:\workspace\LanJu\client\shangjian\CommonFunc\obj\x86\Debug\ +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\ CommonFunc none false @@ -13,7 +13,7 @@ DEBUG;TRACE 12023204370 2-1355062061 241494203934 -44-170053996 +44-239516262 HMessageBox.xaml; False diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref index ff7c908..da2c703 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.lref @@ -1,4 +1,4 @@  -FE:\workspace\LanJu\client\shangjian\CommonFunc\HMessageBox.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\HMessageBox.xaml;; diff --git a/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index fd4cefe..4ba6f21 100644 Binary files a/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/CommonFunc/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/LanJu/bin/Debug/LanJu.exe b/shangjian/LanJu/bin/Debug/LanJu.exe index 462c818..7587aba 100644 Binary files a/shangjian/LanJu/bin/Debug/LanJu.exe and b/shangjian/LanJu/bin/Debug/LanJu.exe differ diff --git a/shangjian/LanJu/bin/Debug/LanJu.pdb b/shangjian/LanJu/bin/Debug/LanJu.pdb index 9611020..8e82317 100644 Binary files a/shangjian/LanJu/bin/Debug/LanJu.pdb and b/shangjian/LanJu/bin/Debug/LanJu.pdb differ diff --git a/shangjian/LanJu/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/LanJu/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 738a6e9..e58152e 100644 Binary files a/shangjian/LanJu/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/LanJu/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache b/shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache index 7f1439f..a0fb44e 100644 --- a/shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache +++ b/shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -bc174b8fc67ac08f66a67e37a513d69b6869cfa6 +51790d22c3b0468f4e446c933001b592c3e5c2c3 diff --git a/shangjian/LanJu/obj/Debug/LanJu.csproj.GenerateResource.cache b/shangjian/LanJu/obj/Debug/LanJu.csproj.GenerateResource.cache index ea8edcc..a73f463 100644 Binary files a/shangjian/LanJu/obj/Debug/LanJu.csproj.GenerateResource.cache and b/shangjian/LanJu/obj/Debug/LanJu.csproj.GenerateResource.cache differ diff --git a/shangjian/LanJu/obj/Debug/LanJu.exe b/shangjian/LanJu/obj/Debug/LanJu.exe index 462c818..7587aba 100644 Binary files a/shangjian/LanJu/obj/Debug/LanJu.exe and b/shangjian/LanJu/obj/Debug/LanJu.exe differ diff --git a/shangjian/LanJu/obj/Debug/LanJu.pdb b/shangjian/LanJu/obj/Debug/LanJu.pdb index 9611020..8e82317 100644 Binary files a/shangjian/LanJu/obj/Debug/LanJu.pdb and b/shangjian/LanJu/obj/Debug/LanJu.pdb differ diff --git a/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.cache b/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.cache index f44f5d0..6a5ba16 100644 --- a/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.cache +++ b/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.cache @@ -4,12 +4,12 @@ winexe C# .cs -E:\workspace\LanJu\client\shangjian\LanJu\obj\Debug\ +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\obj\Debug\ LanJu none false DEBUG;TRACE -E:\workspace\LanJu\client\shangjian\LanJu\App.xaml +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\App.xaml 9-1725419280 131720844138 diff --git a/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.lref b/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.lref index ea23b0e..95a3601 100644 --- a/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.lref +++ b/shangjian/LanJu/obj/Debug/LanJu_MarkupCompile.lref @@ -1,12 +1,12 @@  -FE:\workspace\LanJu\client\shangjian\LanJu\MainWindow.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Complete.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_DeviceItems.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Flow.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Index.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Material.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Operator.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Paused.xaml;; -FE:\workspace\LanJu\client\shangjian\LanJu\Views\LanJu_Prepare.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\MainWindow.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Complete.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_DeviceItems.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Flow.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Index.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Material.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Operator.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Paused.xaml;; +FD:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\LanJu\Views\LanJu_Prepare.xaml;; diff --git a/shangjian/LanJuControl/bin/Debug/LanJuControl.exe b/shangjian/LanJuControl/bin/Debug/LanJuControl.exe index bf651ee..396cfd1 100644 Binary files a/shangjian/LanJuControl/bin/Debug/LanJuControl.exe and b/shangjian/LanJuControl/bin/Debug/LanJuControl.exe differ diff --git a/shangjian/LanJuControl/bin/Debug/LanJuControl.pdb b/shangjian/LanJuControl/bin/Debug/LanJuControl.pdb index fb40f79..89126ea 100644 Binary files a/shangjian/LanJuControl/bin/Debug/LanJuControl.pdb and b/shangjian/LanJuControl/bin/Debug/LanJuControl.pdb differ diff --git a/shangjian/LanJuControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/LanJuControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index cb9a280..a5b3f8a 100644 Binary files a/shangjian/LanJuControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/LanJuControl/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/LanJuControl/obj/Debug/LanJuControl.exe b/shangjian/LanJuControl/obj/Debug/LanJuControl.exe index bf651ee..396cfd1 100644 Binary files a/shangjian/LanJuControl/obj/Debug/LanJuControl.exe and b/shangjian/LanJuControl/obj/Debug/LanJuControl.exe differ diff --git a/shangjian/LanJuControl/obj/Debug/LanJuControl.pdb b/shangjian/LanJuControl/obj/Debug/LanJuControl.pdb index fb40f79..89126ea 100644 Binary files a/shangjian/LanJuControl/obj/Debug/LanJuControl.pdb and b/shangjian/LanJuControl/obj/Debug/LanJuControl.pdb differ diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll index ab90d47..a1c3f68 100644 Binary files a/shangjian/LanJuLib/bin/Debug/CommonFunc.dll and b/shangjian/LanJuLib/bin/Debug/CommonFunc.dll differ diff --git a/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb b/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb index 4f85efe..4cc3fea 100644 Binary files a/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb and b/shangjian/LanJuLib/bin/Debug/CommonFunc.pdb differ diff --git a/shangjian/LanJuLib/bin/Debug/LanJuLib.dll b/shangjian/LanJuLib/bin/Debug/LanJuLib.dll index d6b2065..26b49a0 100644 Binary files a/shangjian/LanJuLib/bin/Debug/LanJuLib.dll and b/shangjian/LanJuLib/bin/Debug/LanJuLib.dll differ diff --git a/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb b/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb index 2c98b2c..a6ba9df 100644 Binary files a/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb and b/shangjian/LanJuLib/bin/Debug/LanJuLib.pdb differ diff --git a/shangjian/LanJuLib/bin/Debug/XGL.Models.dll b/shangjian/LanJuLib/bin/Debug/XGL.Models.dll index 1a26f53..9f6865a 100644 Binary files a/shangjian/LanJuLib/bin/Debug/XGL.Models.dll and b/shangjian/LanJuLib/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb b/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb index dbe1773..966febc 100644 Binary files a/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb and b/shangjian/LanJuLib/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index bb68a74..a1434b8 100644 Binary files a/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/LanJuLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache index c24a840..42ce042 100644 Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache and b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.AssemblyReference.cache differ diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache index ad46bb4..cc8d6fc 100644 --- a/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache +++ b/shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -93e6bdf40a6f5d4b88993bae3e272b7f08763f68 +75b64367c22655afbbe469bfdef148da7e480363 diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.dll b/shangjian/LanJuLib/obj/Debug/LanJuLib.dll index d6b2065..26b49a0 100644 Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.dll and b/shangjian/LanJuLib/obj/Debug/LanJuLib.dll differ diff --git a/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb b/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb index 2c98b2c..a6ba9df 100644 Binary files a/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb and b/shangjian/LanJuLib/obj/Debug/LanJuLib.pdb differ diff --git a/shangjian/WPFupdate/bin/Debug/WPFupdate.exe b/shangjian/WPFupdate/bin/Debug/WPFupdate.exe index 94e1a88..5877c12 100644 Binary files a/shangjian/WPFupdate/bin/Debug/WPFupdate.exe and b/shangjian/WPFupdate/bin/Debug/WPFupdate.exe differ diff --git a/shangjian/WPFupdate/bin/Debug/WPFupdate.pdb b/shangjian/WPFupdate/bin/Debug/WPFupdate.pdb index c8f6003..784c130 100644 Binary files a/shangjian/WPFupdate/bin/Debug/WPFupdate.pdb and b/shangjian/WPFupdate/bin/Debug/WPFupdate.pdb differ diff --git a/shangjian/WPFupdate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/WPFupdate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index e19c105..1baf0aa 100644 Binary files a/shangjian/WPFupdate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/WPFupdate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.AssemblyReference.cache b/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.AssemblyReference.cache index 564b185..e8472d7 100644 Binary files a/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.AssemblyReference.cache and b/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.AssemblyReference.cache differ diff --git a/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.CoreCompileInputs.cache b/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.CoreCompileInputs.cache index 56b015d..c367b0a 100644 --- a/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.CoreCompileInputs.cache +++ b/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -47ffa676f6bdf3bae90defb59fba4f8fa246ddda +57f46a9d84fe0cf9b52d094f86f1528843920246 diff --git a/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.FileListAbsolute.txt b/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.FileListAbsolute.txt index f6dece9..cd14485 100644 --- a/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.FileListAbsolute.txt +++ b/shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.FileListAbsolute.txt @@ -10,3 +10,15 @@ E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.CoreCom E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.CopyComplete E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.exe E:\workspace\LanJu\client\shangjian\WPFupdate\obj\Debug\WPFupdate.pdb +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\WPFupdate.exe.config +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\WPFupdate.exe +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\WPFupdate.pdb +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\HtmlAgilityPack.dll +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\HtmlAgilityPack.pdb +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\bin\Debug\HtmlAgilityPack.xml +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.AssemblyReference.cache +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.SuggestedBindingRedirects.cache +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.CoreCompileInputs.cache +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.csproj.CopyComplete +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.exe +D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\WPFupdate\obj\Debug\WPFupdate.pdb diff --git a/shangjian/WPFupdate/obj/Debug/WPFupdate.exe b/shangjian/WPFupdate/obj/Debug/WPFupdate.exe index 94e1a88..5877c12 100644 Binary files a/shangjian/WPFupdate/obj/Debug/WPFupdate.exe and b/shangjian/WPFupdate/obj/Debug/WPFupdate.exe differ diff --git a/shangjian/WPFupdate/obj/Debug/WPFupdate.pdb b/shangjian/WPFupdate/obj/Debug/WPFupdate.pdb index c8f6003..784c130 100644 Binary files a/shangjian/WPFupdate/obj/Debug/WPFupdate.pdb and b/shangjian/WPFupdate/obj/Debug/WPFupdate.pdb differ diff --git a/shangjian/WPFupdate/update.cs b/shangjian/WPFupdate/update.cs index 594e2fb..581ca02 100644 --- a/shangjian/WPFupdate/update.cs +++ b/shangjian/WPFupdate/update.cs @@ -10,6 +10,7 @@ class Update { public void Update1(string args) { + string iisServerBaseUrl = "http://192.168.202.23:8081/"; // IIS服务器基本URL string iisFolder = ""; // IIS服务器上的文件夹路径 string localFolderBase = AppDomain.CurrentDomain.BaseDirectory; // 本地文件夹的基本路径 @@ -58,6 +59,7 @@ class Update } public void SynchronizeFiles(string serverBaseUrl, string serverFolder, string localFolder) { + System.Threading.Thread.Sleep(3000); using (HttpClient client = new HttpClient()) { try diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll index ab90d47..a1c3f68 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll and b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb index 4f85efe..4cc3fea 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb and b/shangjian/XGL.Data/bin/x86/Debug/CommonFunc.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJu.exe b/shangjian/XGL.Data/bin/x86/Debug/LanJu.exe index 462c818..7587aba 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJu.exe and b/shangjian/XGL.Data/bin/x86/Debug/LanJu.exe differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJu.pdb b/shangjian/XGL.Data/bin/x86/Debug/LanJu.pdb index 9611020..8e82317 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJu.pdb and b/shangjian/XGL.Data/bin/x86/Debug/LanJu.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.exe b/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.exe index bf651ee..396cfd1 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.exe and b/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.exe differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.pdb b/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.pdb index fb40f79..89126ea 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.pdb and b/shangjian/XGL.Data/bin/x86/Debug/LanJuControl.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll index d6b2065..26b49a0 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll and b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb index 2c98b2c..a6ba9df 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb and b/shangjian/XGL.Data/bin/x86/Debug/LanJuLib.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll index 44dc8c6..1a09629 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb index 27223ab..b18a7b7 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Data.pdb differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll index 1a26f53..9f6865a 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb index dbe1773..966febc 100644 Binary files a/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb and b/shangjian/XGL.Data/bin/x86/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 31fbcf3..802cb2c 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL.Data/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache index 002d569..838b0c5 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache index 2d5a30b..da343cf 100644 --- a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache +++ b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -45efadceadc58f77d05a25f4464e8495a412c5d8 +79f02adf94b81a462e2d021ffaeb806c569f29e2 diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll index 44dc8c6..1a09629 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.dll differ diff --git a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb index 27223ab..b18a7b7 100644 Binary files a/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb and b/shangjian/XGL.Data/obj/x86/Debug/XGL.Data.pdb differ diff --git a/shangjian/XGL.Data/userDB.cs b/shangjian/XGL.Data/userDB.cs index 6857ddf..3f4c0c6 100644 --- a/shangjian/XGL.Data/userDB.cs +++ b/shangjian/XGL.Data/userDB.cs @@ -324,7 +324,7 @@ namespace XGL.Data issuccess = Utils.VerifyPassword(pwd, info.password); LoginUser.UserId = info.user_id; LoginUser.UserCode = info.user_name; - LoginUser.UserName = info.nick_name; + LoginUser.UserName = info.nick_name; //待补充班组班次 } return issuccess;//lst.Count > 0 ? true : false; diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll index 1a26f53..9f6865a 100644 Binary files a/shangjian/XGL.Model/bin/Debug/XGL.Models.dll and b/shangjian/XGL.Model/bin/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb b/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb index dbe1773..966febc 100644 Binary files a/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb and b/shangjian/XGL.Model/bin/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 864ebb1..58bd50d 100644 Binary files a/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache index 4c54f2d..709a5dc 100644 Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache and b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache index 0e52749..64dac35 100644 --- a/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache +++ b/shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e875e48168eeec01a6513a832f5824108995a472 +ba8f52b01cbb380daf24abf11e9369249f394d6c diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.dll b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll index 1a26f53..9f6865a 100644 Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.dll and b/shangjian/XGL.Model/obj/Debug/XGL.Models.dll differ diff --git a/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb b/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb index dbe1773..966febc 100644 Binary files a/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb and b/shangjian/XGL.Model/obj/Debug/XGL.Models.pdb differ diff --git a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll index e5f2e95..c4b3406 100644 Binary files a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll and b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.dll differ diff --git a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb index 4408b54..733af8f 100644 Binary files a/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb and b/shangjian/XGL.Thrift/bin/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/XGL.Thrift/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/shangjian/XGL.Thrift/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 12e4358..44594cb 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/shangjian/XGL.Thrift/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.AssemblyReference.cache b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.AssemblyReference.cache index 3a0d63e..cf52ee4 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.AssemblyReference.cache and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.AssemblyReference.cache differ diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.CoreCompileInputs.cache b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.CoreCompileInputs.cache index 64a63a1..ffad49a 100644 --- a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.CoreCompileInputs.cache +++ b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -da04babf50ef3035790f6c85a018240439a4cf82 +4c1eda63a6eb933282d4915d9cfa5b18a18739b1 diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll index e5f2e95..c4b3406 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.dll differ diff --git a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb index 4408b54..733af8f 100644 Binary files a/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb and b/shangjian/XGL.Thrift/obj/Debug/XGL.Thrift.pdb differ diff --git a/shangjian/XGL/App.config b/shangjian/XGL/App.config index 7da01e9..1a26756 100644 --- a/shangjian/XGL/App.config +++ b/shangjian/XGL/App.config @@ -13,24 +13,13 @@ + - - + - - - - - - - - - - - - + - + diff --git a/shangjian/XGL/App.xaml.cs b/shangjian/XGL/App.xaml.cs index b1f81ca..7f95bd9 100644 --- a/shangjian/XGL/App.xaml.cs +++ b/shangjian/XGL/App.xaml.cs @@ -20,6 +20,12 @@ namespace XGL { public App() { + var processs = Process.GetProcessesByName(Process.GetCurrentProcess().MainModule.ModuleName.Replace(".exe", "")); + if (processs.Length > 1) + { + Environment.Exit(0); + } + //UI线程未捕获异常处理事件（UI主线程） this.DispatcherUnhandledException += App_DispatcherUnhandledException; diff --git a/shangjian/XGL/FormItem/Main.xaml.cs b/shangjian/XGL/FormItem/Main.xaml.cs index 042237d..664732e 100644 --- a/shangjian/XGL/FormItem/Main.xaml.cs +++ b/shangjian/XGL/FormItem/Main.xaml.cs @@ -19,6 +19,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shapes; using XGL.Data.DBService; +using XGL.Tools; using XGL.Views; namespace XGL.FormItem @@ -146,7 +147,7 @@ namespace XGL.FormItem timerDeciveState.Interval = Utils.GetAppSetting("GetDeviceStateInterval") == "" ? 15000 : Convert.ToInt32(Utils.GetAppSetting("GetDeviceStateInterval")); timerDeciveState.Elapsed += TimerDeciveState_Elapsed; timerDeciveState.Start(); - this.lbVersion.Content = "20231005001"; + this.lbVersion.Content = LoginUser.Version; } @@ -159,13 +160,14 @@ namespace XGL.FormItem { p1.SendAsyncCancel(); p1.SendPingAsync(serviceIp, 2000).ContinueWith(result => - { + { try { string time = result?.Result?.RoundtripTime.ToString(); + //LogHelper.instance.log.Info("ip>>>>>>" + serviceIp + "延迟>>" + time); Application.Current.Dispatcher.Invoke(() => { - if (!string.IsNullOrEmpty(time) && time != "0") + if (!string.IsNullOrEmpty(time)) { _PingSeconds = time; PingSeconds = time; @@ -180,7 +182,7 @@ namespace XGL.FormItem int second = 0; if (int.TryParse(time, out second)) { - if (second > 0 && second <= 20) + if (second >= 0 && second <= 20) { this.btnText.Foreground = Brushes.Green; //System.Windows.Media.ColorConverter.ConvertFromString("#FF4FEE4F"); @@ -199,6 +201,7 @@ namespace XGL.FormItem } catch (Exception ex) { + //LogHelper.instance.log.Info("ip>>>>>>" +ex.Message); result?.Dispose(); } @@ -211,16 +214,54 @@ namespace XGL.FormItem }, 1, 0, 2000); } + SerialHelper serialHelper = new SerialHelper(); + int time = 0; private void TimerDeciveState_Elapsed(object sender, ElapsedEventArgs e) { - FormingMachineService formingMachineService = new FormingMachineService(); - DataTable dt = formingMachineService.GetFormingMachineState(deviceCode); - if (dt == null) return; - // 使用Dispatcher来在UI线程上更新UI - this.Dispatcher.Invoke( - new Action(() => { LbDeviceState.Content = dt.Rows[0][0].ToString() == "1" ? "正常" : "异常"; } - ), - System.Windows.Threading.DispatcherPriority.Render); + try + { + FormingMachineService formingMachineService = new FormingMachineService(); + DataTable dt = formingMachineService.GetFormingMachineState(deviceCode); + if (dt == null && time == 0) + { + time = time + 1; + //报警 + serialHelper.ComOn(); + serialHelper.redLightOn(); + serialHelper.buzzerOn(); + serialHelper.ComOff(); + return; + } + // 使用Dispatcher来在UI线程上更新UI + this.Dispatcher.Invoke( + new Action(() => { LbDeviceState.Content = dt.Rows[0][0].ToString() == "1" ? "正常" : "异常"; } + ), + System.Windows.Threading.DispatcherPriority.Render); + if (dt.Rows[0][0].ToString() == "1" && time == 6) + { + //报警 + serialHelper.ComOn(); + serialHelper.redLightOff(); + serialHelper.buzzerOff(); + serialHelper.ComOff(); + } + else + { + time = 6; + //报警 + serialHelper.ComOn(); + serialHelper.redLightOn(); + serialHelper.buzzerOn(); + serialHelper.ComOff(); + } + } + catch (Exception ex) + { + + throw; + } + + //if (dt.Rows[0][0].ToString() == "1") //{ // this.Dispatcher.Invoke( diff --git a/shangjian/XGL/LoginPage.xaml b/shangjian/XGL/LoginPage.xaml index 2fc5c64..cf4d740 100644 --- a/shangjian/XGL/LoginPage.xaml +++ b/shangjian/XGL/LoginPage.xaml @@ -51,6 +51,6 @@ - +