测试通过

ScanCodeServer/HDCodeHelper.cs

@@ -163,31 +163,31 @@ namespace ScanCodeServer
                 
                 
                 if (hv_Area != null)
                 if (hv_Area != null)
                 {
                 {
-                    hv_Area.UnPinTuple();
+                    hv_Area.UnpinTuple();
                 }
                 }
                 if (hv_Row1 != null)
                 if (hv_Row1 != null)
                 {
                 {
-                    hv_Row1.UnPinTuple();
+                    hv_Row1.UnpinTuple();
                 }
                 }
                 if (hv_Column != null)
                 if (hv_Column != null)
                 {
                 {
-                    hv_Column.UnPinTuple();
+                    hv_Column.UnpinTuple();
                 }
                 }
                 if (hv_PointOrder != null)
                 if (hv_PointOrder != null)
                 {
                 {
-                    hv_PointOrder.UnPinTuple();
+                    hv_PointOrder.UnpinTuple();
                 }
                 }
                 if (hv_ResultHandles != null)
                 if (hv_ResultHandles != null)
                 {
                 {
-                    hv_ResultHandles.UnPinTuple();
+                    hv_ResultHandles.UnpinTuple();
                 }
                 }
                 if (hv_DecodedDataStrings != null)
                 if (hv_DecodedDataStrings != null)
                 {
                 {
-                    hv_DecodedDataStrings.UnPinTuple();
+                    hv_DecodedDataStrings.UnpinTuple();
                 }
                 }
                 if (hv_DataCodeHandle != null)
                 if (hv_DataCodeHandle != null)
                 {
                 {
-                    hv_DataCodeHandle.UnPinTuple();
+                    hv_DataCodeHandle.UnpinTuple();
                 }
                 }
 
 
                 if (ho_SymbolXLDs != null)
                 if (ho_SymbolXLDs != null)
@@ -415,19 +415,19 @@ namespace ScanCodeServer
                 HOperatorSet.ClearBarCodeModel(hv_BarCodeHandle);
                 HOperatorSet.ClearBarCodeModel(hv_BarCodeHandle);
                 if (hv_Area != null)
                 if (hv_Area != null)
                 {
                 {
-                    hv_Area.UnPinTuple();
+                    hv_Area.UnpinTuple();
                 }
                 }
                 if (hv_Row1 != null)
                 if (hv_Row1 != null)
                 {
                 {
-                    hv_Row1.UnPinTuple();
+                    hv_Row1.UnpinTuple();
                 }
                 }
                 if (hv_Column != null)
                 if (hv_Column != null)
                 {
                 {
-                    hv_Column.UnPinTuple();
+                    hv_Column.UnpinTuple();
                 }
                 }
                 if (hv_Orientation != null)
                 if (hv_Orientation != null)
                 {
                 {
-                    hv_Orientation.UnPinTuple();
+                    hv_Orientation.UnpinTuple();
                 }
                 }
                 if (ho_GrayImage != null)
                 if (ho_GrayImage != null)
                 {
                 {

ScanCodeServer/ScanCodeServer.csproj

@@ -43,6 +43,10 @@
     <Reference Include="ConfigHelper">
     <Reference Include="ConfigHelper">
       <HintPath>..\..\ConfigHelper\ConfigHelper\bin\Debug\ConfigHelper.dll</HintPath>
       <HintPath>..\..\ConfigHelper\ConfigHelper\bin\Debug\ConfigHelper.dll</HintPath>
     </Reference>
     </Reference>
+    <Reference Include="halcondotnet, Version=20.11.1.2, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>halcon20\halcondotnet.dll</HintPath>
+    </Reference>
     <Reference Include="log4net">
     <Reference Include="log4net">
       <HintPath>..\..\增广夹爪\Rmaxis\bin\Debug\log4net.dll</HintPath>
       <HintPath>..\..\增广夹爪\Rmaxis\bin\Debug\log4net.dll</HintPath>
     </Reference>
     </Reference>
@@ -107,8 +111,6 @@
     <None Include="App.config" />
     <None Include="App.config" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="halcon12\halcon.dll" />
-    <Content Include="halcon12\halcondotnet.dll" />
     <Content Include="halcon20\halcon.dll" />
     <Content Include="halcon20\halcon.dll" />
     <Content Include="halcon20\halcondotnet.dll" />
     <Content Include="halcon20\halcondotnet.dll" />
   </ItemGroup>
   </ItemGroup>