1

刘韬
Commit e1a569e6 由刘韬编写于 2024-03-01 13:36:22 +0800
App/App.csproj
App/FrmBase.cs
App/NewCode/FrmAdjustQuotiety2.cs
App/NewCode/FrmAdjustQuotiety2.designer.cs
App/NewCode/FrmTestManage2.cs
App/Properties/AssemblyInfo.cs
App/Properties/LResource.en-US.resx
App/Properties/LResource.zh-CN - 复制.resx
App/Properties/LResource.zh-CN.resx
App/Properties/Resources.Designer.cs
App/Properties/Settings.Designer.cs
App/app.config
Dal/Dal.csproj
MachineDll/MachineDll.csproj
loadingControl/loadingControl.csproj
--- a/App/App.csproj
查看文件 @e1a569e
+++ b/App/App.csproj
查看文件 @e1a569e
@@ -16,7 +16,7 @@
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    <TargetFrameworkProfile>
    </TargetFrameworkProfile>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
@@ -399,6 +399,9 @@
    <EmbeddedResource Include="Properties\LResource.ja-JP.resx">
      <SubType>Designer</SubType>
    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\LResource.zh-CN - 复制.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
    <EmbeddedResource Include="Properties\LResource.zh-CN.resx">
      <SubType>Designer</SubType>
    </EmbeddedResource>

--- a/App/FrmBase.cs
查看文件 @e1a569e
+++ b/App/FrmBase.cs
查看文件 @e1a569e
@@ -120,10 +120,14 @@ namespace App
                Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo(str_LResourse);
                CultureInfo ci = Thread.CurrentThread.CurrentCulture;//获取当前线程所设置的语言区域
                currentLanguage = rm.GetString(strId, ci);//通过所选语言区域匹配资源文件，根据传入控件名称返回该控件相应的TEXT
+                if (string.IsNullOrWhiteSpace(currentLanguage))
+                    LOGGER.Info(strId+"\tnone");
            }
            catch(Exception ex)
            {
-                //LOGGER.Info(ex.StackTrace);
+                LOGGER.Info(strId + "\tnone");
                currentLanguage = "";//未找到匹配字符时返回默认的字符
            }
            return currentLanguage;

--- a/App/NewCode/FrmAdjustQuotiety2.cs
查看文件 @e1a569e
+++ b/App/NewCode/FrmAdjustQuotiety2.cs
查看文件 @e1a569e
@@ -119,10 +119,10 @@ namespace App
            this.filterStata.Text = getMsg("NonWork");//工作中
            this.cleanState.Text = getMsg("NonWork");//非工作中
            this.BtnReConnect.Text = getMsg("Reconnect");//重新连接
-            this.btnCalibration.Text = "校准";//getMsg("autoCalibration");
+            this.btnCalibration.Text = getMsg("Calibration"); //"校准";//getMsg("autoCalibration");
-            lbl_WashUpperLimit.Text = "过滤上限";//getMsg("WashUpperLimit");
+            lbl_WashUpperLimit.Text = getMsg("WashUpperLimit");//"过滤上限";//
-            lbl_WashTime.Text = "过滤时间";//getMsg("WashTime");
+            lbl_WashTime.Text = getMsg("WashTime");//"过滤时间";//
            var PortName = fuction.GetParameterByParaName(Const.PARA_PORT, "currency"); //读连接的COMS
@@ -294,7 +294,7 @@ namespace App
        {
            string[] listData;
            openFileDialog1.DefaultExt = "xml";
-            openFileDialog1.Filter = "xml文件|*.xml";
+            openFileDialog1.Filter = "xml file|*.xml";
            openFileDialog1.FileName = Const.ADJUSTCONFIGNAME;
            string directory = Fuction.m_CurrentDirectory + Const.AdjustRoot;
            openFileDialog1.InitialDirectory = directory;
@@ -326,7 +326,7 @@ namespace App
                return;
            saveFileDialog1.DefaultExt = "xml";
-            saveFileDialog1.Filter = "xml文件|*.xml";
+            saveFileDialog1.Filter = "xml file|*.xml";
            saveFileDialog1.FileName = Const.ADJUSTCONFIGNAME;
            string directory = Fuction.m_CurrentDirectory + Const.AdjustRoot;
            saveFileDialog1.InitialDirectory = directory;
@@ -510,6 +510,7 @@ namespace App
        {
            loadTestingPanel();
            ShowPanel("Testing");
+            InputValueTimer.Start();
        }
        private void loadTestingPanel()
@@ -658,6 +659,11 @@ namespace App
        private bool isCalibration = false;
+        private void panelCalibration_Load(object sender, EventArgs e)
+        {
+        }
        #endregion
        //应用标准

--- a/App/NewCode/FrmAdjustQuotiety2.designer.cs
查看文件 @e1a569e
+++ b/App/NewCode/FrmAdjustQuotiety2.designer.cs
查看文件 @e1a569e
@@ -113,7 +113,7 @@
            this.panelTesting.Controls.Add(this.Y1);
            this.panelTesting.Controls.Add(this.Y0);
            this.panelTesting.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.panelTesting.Location = new System.Drawing.Point(845, 67);
+            this.panelTesting.Location = new System.Drawing.Point(380, 49);
            this.panelTesting.Name = "panelTesting";
            this.panelTesting.Size = new System.Drawing.Size(644, 378);
            this.panelTesting.TabIndex = 166;
@@ -716,6 +716,7 @@
            this.panelCalibration.Name = "panelCalibration";
            this.panelCalibration.Size = new System.Drawing.Size(1039, 578);
            this.panelCalibration.TabIndex = 168;
+            this.panelCalibration.Load += new System.EventHandler(this.panelCalibration_Load);
            // 
            // panel1
            // 

--- a/App/NewCode/FrmTestManage2.cs
查看文件 @e1a569e
+++ b/App/NewCode/FrmTestManage2.cs
查看文件 @e1a569e
--- a/App/Properties/AssemblyInfo.cs
查看文件 @e1a569e
+++ b/App/Properties/AssemblyInfo.cs
查看文件 @e1a569e
@@ -30,6 +30,6 @@ using log4net.Config;
 //      内部版本号
 //      修订号
 //
-[assembly: AssemblyVersion("3.3.4.2")]
+[assembly: AssemblyVersion("3.3.5.0")]
-[assembly: AssemblyFileVersion("3.3.4.2")]
+[assembly: AssemblyFileVersion("3.3.5.0")]
 [assembly: log4net.Config.DOMConfigurator(ConfigFileExtension = "config", Watch = true)]
--- a/App/Properties/LResource.en-US.resx
查看文件 @e1a569e
+++ b/App/Properties/LResource.en-US.resx
查看文件 @e1a569e
--- a/App/Properties/LResource.zh-CN - 复制.resx 0 → 100644
查看文件 @e1a569e
+++ b/App/Properties/LResource.zh-CN - 复制.resx 0 → 100644
查看文件 @e1a569e
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    Version 2.0
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    Example:
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="frmLogin" xml:space="preserve">
+    <value>登录</value>
+    <comment>登录</comment>
+  </data>
+  <data name="frmLoginbtnSetting" xml:space="preserve">
+    <value>设置</value>
+    <comment>设置</comment>
+  </data>
+  <data name="frmLoginbtn_Cancel1" xml:space="preserve">
+    <value>取消</value>
+    <comment>取消</comment>
+  </data>
+  <data name="frmLoginbtn_OK1" xml:space="preserve">
+    <value>确定</value>
+    <comment>确定</comment>
+  </data>
+  <data name="frmLoginlbl_Language" xml:space="preserve">
+    <value>选择语言</value>
+    <comment>选择语言</comment>
+  </data>
+  <data name="frmLoginlbl_Login" xml:space="preserve">
+    <value>帐号</value>
+    <comment>帐号</comment>
+  </data>
+  <data name="frmLoginlbl_OldPSW" xml:space="preserve">
+    <value>密码</value>
+    <comment>密码</comment>
+  </data>
+  <data name="frmLoginManage" xml:space="preserve">
+    <value>帐号管理</value>
+    <comment>帐号管理</comment>
+  </data>
+  <data name="frmLoginManagebtn_Cancel1" xml:space="preserve">
+    <value>取消</value>
+    <comment>取消</comment>
+  </data>
+</root>
\ No newline at end of file
--- a/App/Properties/LResource.zh-CN.resx
查看文件 @e1a569e
+++ b/App/Properties/LResource.zh-CN.resx
查看文件 @e1a569e
@@ -1551,4 +1551,13 @@
  <data name="msg--30" xml:space="preserve">
    <value>数据丢失！</value>
  </data>
+  <data name="Calibration" xml:space="preserve">
+    <value>校准</value>
+  </data>
+  <data name="WashTime" xml:space="preserve">
+    <value>过滤时间</value>
+  </data>
+  <data name="WashUpperLimit" xml:space="preserve">
+    <value>过滤上限</value>
+  </data>
 </root>
\ No newline at end of file
--- a/App/Properties/Resources.Designer.cs
查看文件 @e1a569e
+++ b/App/Properties/Resources.Designer.cs
查看文件 @e1a569e
@@ -19,7 +19,7 @@ namespace App.Properties {
    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
    // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {

--- a/App/Properties/Settings.Designer.cs
查看文件 @e1a569e
+++ b/App/Properties/Settings.Designer.cs
查看文件 @e1a569e
@@ -12,7 +12,7 @@ namespace App.Properties {
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

--- a/App/app.config
查看文件 @e1a569e
+++ b/App/app.config
查看文件 @e1a569e
@@ -42,7 +42,7 @@
    </log4net>
 	</applicationSettings>
-<startup useLegacyV2RuntimeActivationPolicy="true"><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
+<startup useLegacyV2RuntimeActivationPolicy="true"><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>

--- a/Dal/Dal.csproj
查看文件 @e1a569e
+++ b/Dal/Dal.csproj
查看文件 @e1a569e
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>Dal</RootNamespace>
    <AssemblyName>Dal</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <OldToolsVersion>2.0</OldToolsVersion>
@@ -26,6 +26,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -35,6 +36,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />

--- a/MachineDll/MachineDll.csproj
查看文件 @e1a569e
+++ b/MachineDll/MachineDll.csproj
查看文件 @e1a569e
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>MachineDll</RootNamespace>
    <AssemblyName>MachineDll</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
@@ -27,6 +27,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -36,6 +37,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=AMD64">

--- a/loadingControl/loadingControl.csproj
查看文件 @e1a569e
+++ b/loadingControl/loadingControl.csproj
查看文件 @e1a569e
@@ -10,7 +10,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>loadingControl</RootNamespace>
    <AssemblyName>loadingControl</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    <TargetFrameworkProfile>
    </TargetFrameworkProfile>
    <FileAlignment>512</FileAlignment>