中英文修改

几米阳光
Commit 6c36c99b 由 几米阳光 编写于 2019-01-24 15:22:41 +0800
dll/CodeLibrary.dll
source/ACSingleStore/FrmStoreBox.Designer.cs
source/ACSingleStore/FrmStoreBox.cs
source/ACSingleStore/Properties/Resource.en-US.resx
source/ACSingleStore/ResourceCulture.cs
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
--- a/dll/CodeLibrary.dll
查看文件 @6c36c99
+++ b/dll/CodeLibrary.dll
查看文件 @6c36c99
--- a/source/ACSingleStore/FrmStoreBox.Designer.cs
查看文件 @6c36c99
+++ b/source/ACSingleStore/FrmStoreBox.Designer.cs
查看文件 @6c36c99
@@ -1809,12 +1809,12 @@
            // toolStripSeparator10
            // 
            this.toolStripSeparator10.Name = "toolStripSeparator10";
-            this.toolStripSeparator10.Size = new System.Drawing.Size(177, 6);
+            this.toolStripSeparator10.Size = new System.Drawing.Size(173, 6);
            // 
            // 学习二维码ToolStripMenuItem
            // 
            this.学习二维码ToolStripMenuItem.Name = "学习二维码ToolStripMenuItem";
-            this.学习二维码ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.学习二维码ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
            this.学习二维码ToolStripMenuItem.Text = "学习二维码";
            this.学习二维码ToolStripMenuItem.Click += new System.EventHandler(this.学习二维码ToolStripMenuItem_Click);
            // 
@@ -1949,6 +1949,7 @@
            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
            this.MainMenuStrip = this.menuStrip1;
            this.Name = "FrmStoreBox";
+            this.Opacity = 0D;
            this.Text = "AC_SA_料仓";
            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmTest_FormClosing);

--- a/source/ACSingleStore/FrmStoreBox.cs
查看文件 @6c36c99
+++ b/source/ACSingleStore/FrmStoreBox.cs
查看文件 @6c36c99
@@ -117,8 +117,8 @@ namespace OnlineStore.ACSingleStore
            AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库：");
            AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
-            学习二维码ToolStripMenuItem.Visible = CurrLanguage.Equals(ResourceCulture.China);
+            //学习二维码ToolStripMenuItem.Visible = CurrLanguage.Equals(ResourceCulture.China);
-            toolStripSeparator10.Visible = CurrLanguage.Equals(ResourceCulture.China);
+            //toolStripSeparator10.Visible = CurrLanguage.Equals(ResourceCulture.China);
            // richTextBox1.Visible = CurrLanguage.Equals(ResourceCulture.China);
            if (CurrLanguage.Equals(ResourceCulture.China))
            {
@@ -433,6 +433,7 @@ namespace OnlineStore.ACSingleStore
        private void btnInStore_Click(object sender, EventArgs e)
        {
            if (store.storeRunStatus >= StoreRunStatus.HomeMoving)
            {
                string selectPositionNum = cmbPosition.Text;
@@ -1121,6 +1122,7 @@ namespace OnlineStore.ACSingleStore
        private void 显示ToolStripMenuItem_Click(object sender, EventArgs e)
        {
+            this.Opacity = 1;
            this.Visible = true;
            this.WindowState = FormWindowState.Maximized;
            this.notifyIcon1.Visible = false;
@@ -1165,9 +1167,9 @@ namespace OnlineStore.ACSingleStore
        /// </summary>
        private void HideForm()
        {
+            this.Hide();
            this.ShowInTaskbar = false;
            this.notifyIcon1.Visible = true;
-            this.Hide();
        }
        private void FrmStoreBox_FormClosed(object sender, FormClosedEventArgs e)
        {

--- a/source/ACSingleStore/Properties/Resource.en-US.resx
查看文件 @6c36c99
+++ b/source/ACSingleStore/Properties/Resource.en-US.resx
查看文件 @6c36c99
@@ -142,7 +142,7 @@
    <value>Save error</value>
  </data>
  <data name="CanotReset" xml:space="preserve">
-    <value>Can return to stanby ,without alarm, providing, saving or reset </value>
+    <value>Can return to stanby ,without alarm, providing, storing or reset </value>
  </data>
  <data name="SureExit" xml:space="preserve">
    <value>Confirm exit</value>
@@ -154,10 +154,10 @@
    <value>Auto providing</value>
  </data>
  <data name="AutoIn" xml:space="preserve">
-    <value>Auto saving</value>
+    <value>Auto storing</value>
  </data>
  <data name="AutoEnd" xml:space="preserve">
-    <value>Auto saving end</value>
+    <value>Auto storing end</value>
  </data>
  <data name="DoorOpen" xml:space="preserve">
    <value>Front door open</value>
@@ -166,10 +166,10 @@
    <value>Fork tray full, please check</value>
  </data>
  <data name="StartAuto" xml:space="preserve">
-    <value>Start auto saving</value>
+    <value>Start auto storing</value>
  </data>
  <data name="StopAuto" xml:space="preserve">
-    <value>Stop auto saving</value>
+    <value>Stop auto storing</value>
  </data>
  <data name="WaitStart" xml:space="preserve">
    <value>Wait to start</value>
@@ -514,7 +514,7 @@
    <value>Start auto mode</value>
  </data>
  <data name="FrmStoreBox_label9_Text" xml:space="preserve">
-    <value>Interval saving position:</value>
+    <value>Interval storing position:</value>
  </data>
  <data name="FrmStoreBox_label21_Text" xml:space="preserve">
    <value>Select storage position:</value>
@@ -568,10 +568,10 @@
    <value>l-axis providing buffer P6:</value>
  </data>
  <data name="FrmStoreBox_btnUpDownP3_Text" xml:space="preserve">
-    <value>l-axis former saving P3:</value>
+    <value>l-axis former storing P3:</value>
  </data>
  <data name="FrmStoreBox_btnUpDownP4_Text" xml:space="preserve">
-    <value>l-axis saving buffer P4:</value>
+    <value>l-axis storing buffer P4:</value>
  </data>
  <data name="FrmIOStatus_Text" xml:space="preserve">
    <value>IO check</value>

--- a/source/ACSingleStore/ResourceCulture.cs
查看文件 @6c36c99
+++ b/source/ACSingleStore/ResourceCulture.cs
查看文件 @6c36c99
@@ -16,10 +16,12 @@ namespace OnlineStore.ACSingleStore
        public static string China = "zh-CN";
        public static string English = "en-US";
        public static string German = "ge-DE";
+        private static ResourceManager rm = null;
        public static string CurrLanguage = "zh-CN";
+        public static Dictionary<string, string> chineseMap = new Dictionary<string, string>();
+        public static Dictionary<string, string> englishMap = new Dictionary<string, string>();
        public static Dictionary<string, string> defaultMap = new Dictionary<string, string>();
        /// <summary>
        /// Set current culture by name
@@ -29,13 +31,8 @@ namespace OnlineStore.ACSingleStore
        {
            ResourceControl.GetStrEvent += GetString;
            ResourceControl.GetStringEvent += GetString;
-            CodeLibrary.CodeResourceControl.GetStrEvent += GetString;
-            CodeLibrary.CodeResourceControl.GetStringEvent += GetString;
+            CodeLibrary.CodeResourceControl.GetLanguageEvent += GetLanguage; 
-            CodeLibrary.CodeResourceControl.GetIdStrEvent += GetTextIdStr;
-            CodeLibrary.CodeResourceControl.GetProStrEvent += GetTextIdStr;
-            CodeLibrary.CodeResourceControl.GetLanguageEvent += GetLanguage;
-            //UserFromControl.UserControlResource.GetStrEvent += GetString;
-            //UserFromControl.UserControlResource.GetStringEvent += GetString;
            if (string.IsNullOrEmpty(name))
            {
                name = "en-US";
@@ -54,14 +51,19 @@ namespace OnlineStore.ACSingleStore
            try
            {
-                ResourceManager rm = new ResourceManager("OnlineStore.ACSingleStore.Properties.Resource", assembly);
+                if (rm == null)
+                {
+                    rm = new ResourceManager("OnlineStore.ACSingleStore.Properties.Resource", assembly); 
+                }
                CultureInfo ci = Thread.CurrentThread.CurrentCulture;
+                ci= new CultureInfo(CurrLanguage); 
                strCurLanguage = rm.GetString(id, ci).Trim();
                if (strCurLanguage.Equals("") && (!defaultStr.Equals("")))
                {
                    strCurLanguage = defaultStr;
                    NoIdLog(id, defaultStr);
                }
            }
            catch (Exception ex)
            {
@@ -83,8 +85,12 @@ namespace OnlineStore.ACSingleStore
            try
            {
-                ResourceManager rm = new ResourceManager("OnlineStore.ACSingleStore.Properties.Resource", Assembly.GetExecutingAssembly());
+                if (rm == null)
+                {
+                    rm = new ResourceManager("OnlineStore.ACSingleStore.Properties.Resource", assembly);
+                }
                CultureInfo ci = Thread.CurrentThread.CurrentCulture;
+                ci = new CultureInfo(CurrLanguage);
                strCurLanguage = rm.GetString(id, ci).Trim();
                if(strCurLanguage.Equals("")&&(!defaultStr.Equals(""))){
                    strCurLanguage = defaultStr;

--- a/source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
查看文件 @6c36c99
+++ b/source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
查看文件 @6c36c99
@@ -62,7 +62,7 @@ namespace OnlineStore.DeviceLibrary
                IsDebug = true;
            }
            IsHasCompress_Axis = config.IsHasCompress_Axis.Equals(1);
-            StoreName = ("料仓BOX_" + config.Id + " ").ToUpper();
+            StoreName = ("BOX_" + config.Id + " ").ToUpper();
            this.StoreID = config.Id;
            this.Config = config;
            this.DIList = config.StoreDIList;