111

source/ACSingleStore/ACSingleStore.csproj

@@ -52,6 +52,9 @@
   <PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>box.ico</ApplicationIcon>
     <ApplicationIcon>box.ico</ApplicationIcon>
   </PropertyGroup>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
   <ItemGroup>
     <Reference Include="CodeLibrary, Version=1.0.7874.27460, Culture=neutral, processorArchitecture=MSIL">
     <Reference Include="CodeLibrary, Version=1.0.7874.27460, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <SpecificVersion>False</SpecificVersion>
@@ -204,6 +207,7 @@
     <EmbeddedResource Include="useControl\uc_boxdebug.resx">
     <EmbeddedResource Include="useControl\uc_boxdebug.resx">
       <DependentUpon>uc_boxdebug.cs</DependentUpon>
       <DependentUpon>uc_boxdebug.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
+    <None Include="app.manifest" />
     <None Include="packages.config" />
     <None Include="packages.config" />
     <None Include="resource\language.resource">
     <None Include="resource\language.resource">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

source/ACSingleStore/FrmStoreBox.cs

@@ -902,9 +902,9 @@ namespace OnlineStore.ACSingleStore
             short slvAddr = store.Config.UpDown_Axis.GetAxisValue();
             short slvAddr = store.Config.UpDown_Axis.GetAxisValue();
             int ioIndex = 0;
             int ioIndex = 0;
             //  if (store.Config.StoreDIList.ContainsKey(IO_Type.UpdownPositionSingal))
             //  if (store.Config.StoreDIList.ContainsKey(IO_Type.UpdownPositionSingal))
-            if (store.Config.StoreDIList.ContainsKey(IO_Type.TrayCheck_Fixture))
+            if (store.Config.StoreDIList.ContainsKey(IO_Type.Laser_detection))
             {
             {
-                ioIndex = store.Config.StoreDIList[IO_Type.TrayCheck_Fixture].GetIOAddr();
+                ioIndex = store.Config.StoreDIList[IO_Type.Laser_detection].GetIOAddr();
             }
             }
             FrmPositionTool frm = new FrmPositionTool(PortName, slvAddr, ioIndex, store.Config.UpDown_Axis.HomeHighSpeed, store.Config.UpDown_Axis.HomeLowSpeed, store.Config.UpDown_Axis.HomeAddSpeed);
             FrmPositionTool frm = new FrmPositionTool(PortName, slvAddr, ioIndex, store.Config.UpDown_Axis.HomeHighSpeed, store.Config.UpDown_Axis.HomeLowSpeed, store.Config.UpDown_Axis.HomeAddSpeed);
             frm.ShowDialog();
             frm.ShowDialog();

source/ACSingleStore/app.manifest

+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC 清单选项
+             如果想要更改 Windows 用户帐户控制级别，请使用
+             以下节点之一替换 requestedExecutionLevel 节点。n
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            指定 requestedExecutionLevel 元素将禁用文件和注册表虚拟化。
+            如果你的应用程序需要此虚拟化来实现向后兼容性，则删除此
+            元素。
+        -->
+		  <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- 设计此应用程序与其一起工作且已针对此应用程序进行测试的
+           Windows 版本的列表。取消评论适当的元素，
+           Windows 将自动选择最兼容的环境。 -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+
+    </application>
+  </compatibility>
+
+  <!-- 指示该应用程序可感知 DPI 且 Windows 在 DPI 较高时将不会对其进行
+       自动缩放。Windows Presentation Foundation (WPF)应用程序自动感知 DPI，无需
+       选择加入。选择加入此设置的 Windows 窗体应用程序(面向 .NET Framework 4.6)还应
+       在其 app.config 中将 "EnableWindowsFormsHighDpiAutoResizing" 设置设置为 "true"。
+       
+       将应用程序设为感知长路径。请参阅 https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- 启用 Windows 公共控件和对话框的主题(Windows XP 和更高版本) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>

source/ACSingleStore/useControl/uc_boxdebug.cs

@@ -19,6 +19,7 @@ namespace OnlineStore.ACSingleStore.useControl
 {
 {
     public partial class uc_boxdebug : UserControl
     public partial class uc_boxdebug : UserControl
     {
     {
+        private static string ApplicationData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
         private AC_SA_BoxBean store;
         private AC_SA_BoxBean store;
         private string StartAuto = ResourceCulture.GetString("开始自动出入库");
         private string StartAuto = ResourceCulture.GetString("开始自动出入库");
         private string StopAuto = ResourceCulture.GetString("停止自动出入库");
         private string StopAuto = ResourceCulture.GetString("停止自动出入库");
@@ -34,10 +35,21 @@ namespace OnlineStore.ACSingleStore.useControl
             public int OutStoreCheck = 0;
             public int OutStoreCheck = 0;
 
 
         }
         }
+        string checkfiledir;
+        string poscheckfile;
         public uc_boxdebug()
         public uc_boxdebug()
         {
         {
             InitializeComponent();
             InitializeComponent();
-            
+            checkfiledir = Path.Combine(ApplicationData, "acsinglestore");
+            Directory.CreateDirectory(checkfiledir);
+            poscheckfile = positionConfigFile + ".check";
+            poscheckfile = Path.GetFileName(poscheckfile);
+            poscheckfile = Path.Combine(checkfiledir, poscheckfile);
+
+            if (File.Exists(positionConfigFile + ".check") && !File.Exists(poscheckfile)) {
+                File.Move(positionConfigFile + ".check", poscheckfile);
+            }
+
         }
         }
         public void Init(AC_SA_BoxBean store)
         public void Init(AC_SA_BoxBean store)
         {
         {
@@ -115,7 +127,7 @@ namespace OnlineStore.ACSingleStore.useControl
 
 
         }
         }
         void LoadPosCheck() {
         void LoadPosCheck() {
-            var poscheckfile = positionConfigFile + ".check";
+            
             if (File.Exists(poscheckfile))
             if (File.Exists(poscheckfile))
             {
             {
                 try
                 try
@@ -145,7 +157,7 @@ namespace OnlineStore.ACSingleStore.useControl
                 posState[posid].InStoreCheck = inStoreCheck;
                 posState[posid].InStoreCheck = inStoreCheck;
             if (outStoreCheck > 0)
             if (outStoreCheck > 0)
                 posState[posid].OutStoreCheck = outStoreCheck;
                 posState[posid].OutStoreCheck = outStoreCheck;
-            var poscheckfile = positionConfigFile + ".check";
+
             File.WriteAllText(poscheckfile, JsonHelper.SerializeObject(posState));
             File.WriteAllText(poscheckfile, JsonHelper.SerializeObject(posState));
             return posState[posid];
             return posState[posid];
         }
         }

source/DeviceLibrary/acSingleStore/DoorControl.cs

@@ -86,7 +86,7 @@ namespace OnlineStore.DeviceLibrary
             while (true) {                
             while (true) {                
                 if (DoorRunMonitorEnable)
                 if (DoorRunMonitorEnable)
                 {
                 {
-                    Thread.Sleep(5);
+                    Thread.Sleep(10);
                 }
                 }
                 else {
                 else {
                     //检测到门在运行立刻开始监控
                     //检测到门在运行立刻开始监控