1. 更新dll引用地址 2. 主界面PLC操作安全屏蔽功能添加密码输入界面

patrick.xu

2021-05-24 3c583b1091133e4af23c2534ae96bd094c132d58

1. 更新dll引用地址
2. 主界面PLC操作安全屏蔽功能添加密码输入界面

 Bro.UI.HalconDisplay/Bro.UI.HalconDisplay.csproj

@@ -80,10 +80,10 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="halcondotnet">
      <HintPath>..\bin\Release\halcondotnet.dll</HintPath>
      <HintPath>..\libs\halcondotnet.dll</HintPath>
    </Reference>
    <Reference Include="hdevenginedotnet">
      <HintPath>..\bin\Release\hdevenginedotnet.dll</HintPath>
      <HintPath>..\libs\hdevenginedotnet.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core">

 ConfigPassword.cs

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Configuration;
using System.Data;
using System.Drawing;
using System.Linq;
@@ -20,7 +21,13 @@

        private void btnOK_Click(object sender, EventArgs e)
        {
            string password = "xs1234";
            string password = "";
            password = ConfigurationManager.AppSettings["Password"];
            if (string.IsNullOrWhiteSpace(password))
            {
                password = "xs1234";
            }

            if (tbPassWord.Text.ToUpper().Equals(password.ToUpper()))
            {
                this.DialogResult = DialogResult.OK;

 FormPlcOperation.cs

@@ -54,12 +54,18 @@

        private void cbPingbiGuangshan_CheckedChanged(object sender, EventArgs e)
        {
            _opc.Write(OPCOutputTag.PingbiGuangShan, cbPingbiGuangshan.Checked);
            if (new ConfigPassword("").ShowDialog() == DialogResult.OK)
            {
                _opc.Write(OPCOutputTag.PingbiGuangShan, cbPingbiGuangshan.Checked);
            }
        }

        private void cbPingbiSafeGuard_CheckedChanged(object sender, EventArgs e)
        {
            _opc.Write(OPCOutputTag.PingbiSafeGuard, cbPingbiSafeGuard.Checked);
            if (new ConfigPassword("").ShowDialog() == DialogResult.OK)
            {
                _opc.Write(OPCOutputTag.PingbiSafeGuard, cbPingbiSafeGuard.Checked);
            }
        }
    }
}

 M423project.csproj

@@ -72,38 +72,30 @@
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="AutoRunCard, Version=2017.1.19.1, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\M423Release\AutoRunCard.dll</HintPath>
    <Reference Include="AutoRunCard">
      <HintPath>libs\AutoRunCard.dll</HintPath>
    </Reference>
    <Reference Include="DownloadDLL, Version=2015.7.6.1, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>bin\Release\DownloadDLL.dll</HintPath>
    <Reference Include="DownloadDLL">
      <HintPath>libs\DownloadDLL.dll</HintPath>
    </Reference>
    <Reference Include="EventTool, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\M423Release\EventTool.dll</HintPath>
    <Reference Include="EventTool">
      <HintPath>libs\EventTool.dll</HintPath>
    </Reference>
    <Reference Include="FileToolkit, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\M423Release\FileToolkit.dll</HintPath>
    <Reference Include="FileToolkit">
      <HintPath>libs\FileToolkit.dll</HintPath>
    </Reference>
    <Reference Include="FlyCapture2Managed_v100, Version=2.10.3.169, Culture=neutral, PublicKeyToken=76c6583b4a4585f4, processorArchitecture=x86">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>C:\Program Files\Point Grey Research\FlyCapture2\bin\FlyCapture2Managed_v100.dll</HintPath>
    <Reference Include="FlyCapture2Managed_v100">
      <HintPath>libs\FlyCapture2Managed_v100.dll</HintPath>
    </Reference>
    <Reference Include="halcondotnet, Version=12.0.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\M423Release\halcondotnet.dll</HintPath>
    <Reference Include="halcondotnet">
      <HintPath>libs\halcondotnet.dll</HintPath>
    </Reference>
    <Reference Include="hdevenginedotnet, Version=12.0.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>bin\Release\hdevenginedotnet.dll</HintPath>
    <Reference Include="hdevenginedotnet">
      <HintPath>libs\hdevenginedotnet.dll</HintPath>
    </Reference>
    <Reference Include="Interop.OPCAutomation, Version=1.0.0.0, Culture=neutral">
      <SpecificVersion>False</SpecificVersion>
    <Reference Include="Interop.OPCAutomation">
      <HintPath>libs\Interop.OPCAutomation.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
      <HintPath>bin\Release\Interop.OPCAutomation.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -115,13 +107,11 @@
    <Reference Include="PresentationFramework">
      <RequiredTargetFramework>3.0</RequiredTargetFramework>
    </Reference>
    <Reference Include="ReduceMemory, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\M423Release\ReduceMemory.dll</HintPath>
    <Reference Include="ReduceMemory">
      <HintPath>libs\ReduceMemory.dll</HintPath>
    </Reference>
    <Reference Include="SperateData, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\M423Release\SperateData.dll</HintPath>
    <Reference Include="SperateData">
      <HintPath>libs\SperateData.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.configuration" />

 libs/DownloadDLL.dll

Binary files differ

 libs/FlyCapture2Managed_v100.dll

Binary files differ

 libs/Interop.OPCAutomation.dll

Binary files differ

 libs/ReduceMemory.dll

Binary files differ

 libs/SperateData.dll

Binary files differ

 libs/halcondotnetxl.dll

Binary files differ

 libs/halconxl.dll

Binary files differ

 libs/hdevenginedotnetxl.dll

Binary files differ