添加设备异常、网络断开启报警灯

shangjian/AutoUpdate/bin/Debug/AutoUpdate.application

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
   <assemblyIdentity name="AutoUpdate.application" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="HP" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <description asmv2:publisher="AutoUpdate" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true" />
   <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
     <framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>UDIK1LWGtaGVshr2mLrwELButE1vzUzbgzij3shhDnw=</dsig:DigestValue>
+        <dsig:DigestValue>u1K2cqbB56xwixKbhy0eKCftxfa07TGwWwtdOtL8PIs=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

shangjian/AutoUpdate/bin/Debug/AutoUpdate.exe.manifest

@@ -49,7 +49,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>SxzOrr+CVv0cVMqucQhCKOAUGimCliKPSXFqjkQ8jSM=</dsig:DigestValue>
+        <dsig:DigestValue>WAPtOpDlGQDOGkow6DsogCU4DmdHhdL4pDDQZXfblYE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.application

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
   <assemblyIdentity name="AutoUpdate.application" version="1.0.0.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="HP" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <description asmv2:publisher="AutoUpdate" asmv2:product="AutoUpdate" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true" />
   <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
     <framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>UDIK1LWGtaGVshr2mLrwELButE1vzUzbgzij3shhDnw=</dsig:DigestValue>
+        <dsig:DigestValue>u1K2cqbB56xwixKbhy0eKCftxfa07TGwWwtdOtL8PIs=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-eea3ff7a82b036285dd19ec3ef2dc8d3e7eddf67
+f67dc885e7551d573c533635607a154a9fcfd039

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

shangjian/AutoUpdate/obj/x86/Debug/AutoUpdate.exe.manifest

@@ -49,7 +49,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>SxzOrr+CVv0cVMqucQhCKOAUGimCliKPSXFqjkQ8jSM=</dsig:DigestValue>
+        <dsig:DigestValue>WAPtOpDlGQDOGkow6DsogCU4DmdHhdL4pDDQZXfblYE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

shangjian/CentralControl/obj/Debug/CentralControl.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-0abd85b80046b9258518751daf3009dfc20e23db
+65ea42614d5210ce1f76f304a0b99eadc686e4a3

shangjian/CommonFunc/LoginUserInfo.cs

@@ -35,6 +35,12 @@ namespace CommonFunc
         /// 班次
         /// </summary>
         public static string ShiftCode { get; set; }
+
+
+        /// <summary>
+        /// 版本
+        /// </summary>
+        public static string Version { get; set; }
     }
     public class vsionclass
     {

shangjian/CommonFunc/obj/x86/Debug/CommonFunc.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-ae55a20c78909b7f5eb9ba6dc5a5b469abf93216
+cfb04e75b94c39ee4374f63be8ad6b6fac4e7180

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

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

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;;
 

shangjian/LanJu/obj/Debug/LanJu.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-bc174b8fc67ac08f66a67e37a513d69b6869cfa6
+51790d22c3b0468f4e446c933001b592c3e5c2c3

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

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;;
 

shangjian/LanJuLib/obj/Debug/LanJuLib.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-93e6bdf40a6f5d4b88993bae3e272b7f08763f68
+75b64367c22655afbbe469bfdef148da7e480363

shangjian/WPFupdate/obj/Debug/WPFupdate.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-47ffa676f6bdf3bae90defb59fba4f8fa246ddda
+57f46a9d84fe0cf9b52d094f86f1528843920246

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

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

shangjian/XGL.Data/obj/x86/Debug/XGL.Data.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-45efadceadc58f77d05a25f4464e8495a412c5d8
+79f02adf94b81a462e2d021ffaeb806c569f29e2

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;

shangjian/XGL.Model/obj/Debug/XGL.Models.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-e875e48168eeec01a6513a832f5824108995a472
+ba8f52b01cbb380daf24abf11e9369249f394d6c