hy12bug修改

source/AssemblyLineClient/AssemblyLineClient.csproj

@@ -289,6 +289,9 @@
     <Content Include="image\red0.png">
     <Content Include="image\red0.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
+    <Content Include="resources\resources.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="记录.txt" />
     <Content Include="记录.txt" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>

source/AssemblyLineClient/resources/resources.txt

+FrmCodeDecode_Text,二维码识别,Qr code recognition
+FrmCodeDecode_label4_Text,参数路径,Parameters of the path
+FrmCodeDecode_chbUseParam_Text,使用参数,operation parameter
+FrmCodeDecode_btnAn_Text,变暗,darken
+FrmCodeDecode_btnLight_Text,提亮,brighten
+FrmCodeDecode_btnCopyN_Text,复制名称,Copy Name
+FrmCodeDecode_label3_Text,条码类型：,Bar code type:
+FrmCodeDecode_label2_Text,相机列表：,Camera list:
+FrmCodeDecode_btnExit_Text,退出,Exit
+FrmCodeDecode_btnCameraImage_Text,相机获取图片,camera image
+FrmCodeDecode_lblCount_Text,条码数量：,Barcode number:
+FrmCodeDecode_btnClearLog_Text,清理日志,Clear log
+FrmCodeDecode_btnDCode_Text,二维码识别,Qr code recognition
+FrmCodeDecode_btnLearn_Text,学习,learn
+FrmCodeDecode_btnbarCode_Text,一维码识别,One dimensional code recognition
+FrmCodeDecode_btnGray_Text,图像转灰,Turning grey
+FrmCodeDecode_btnErZhi_Text,二值化,binaryzation 
+FrmCodeDecode_btnSelImage_Text,打开本地图片,Open local image
+FrmCodeDecode_label1_Text,图片路径,Image path
+FrmCodeLearn_Text,条码参数学习,Bar code parameter learning
+FrmCodeLearn_chbHalcon_Text,Halcon获取图片,Halcon Get photo
+FrmCodeLearn_label4_Text,图片路径,Image path
+FrmCodeLearn_btnDelOld_Text,删除旧参数,Delete old parameter
+FrmCodeLearn_chbUseCamera_Text,相机获取实时图片,camera image
+FrmCodeLearn_btnSelImage_Text,打开本地图片,Open local image
+FrmCodeLearn_chbTest_Text,学习结束自动识别测试,Automatic identification test
+FrmCodeLearn_btnClearLog_Text,清理日志,Clear log
+FrmCodeLearn_lblCount_Text,条码数量：,Barcode number:
+FrmCodeLearn_label3_Text,参数路径,Parameters of the path
+FrmCodeLearn_label2_Text,类型：,Type:
+FrmCodeLearn_label1_Text,相机：,camera:
+FrmCodeLearn_btnExit_Text,退出,Exit
+FrmCodeLearn_btnStop_Text,结束学习,End of learning
+FrmCodeLearn_btnOpen_Text,开始学习,start to learn
+selCamera,请先选择相机,Please select camera
+selImage,请先选择图片,Please select picture
+title,提示,Notice
+imageIsNull,获取二维码图片为空,Get the two-dimensional code picture is empty
+sureDelete,确定删除文件：,Make sure to delete the file:
+FrmCodeDecode_btnScanTest_Text,新算法解码,New algorithm decoding
\ No newline at end of file

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs

@@ -336,7 +336,8 @@ namespace OnlineStore.DeviceLibrary
             else
             else
             {
             {
                 CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：启动横移电机，阻挡上升，顶升气缸上升");
                 CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：启动横移电机，阻挡上升，顶升气缸上升");
-                LineRun(SecondMoveInfo);
+                //LineRun(SecondMoveInfo);
+                LineStop();
                 CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
                 CylinderMove(SecondMoveInfo, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
             }
             }
         }
         }