默认不显示日志框，每次需要打开后才显示。

LN
Commit b5cfda84 由 LN 编写于 2020-10-30 10:43:20 +0800
source/ACSingleStore/FrmStoreBox.Designer.cs
source/ACSingleStore/FrmStoreBox.cs
source/ACSingleStore/Properties/Resource.en-US.resx
source/ACSingleStore/Properties/Resource.zh-CN.resx
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
--- a/source/ACSingleStore/FrmStoreBox.Designer.cs
查看文件 @b5cfda8
+++ b/source/ACSingleStore/FrmStoreBox.Designer.cs
查看文件 @b5cfda8
@@ -43,6 +43,7 @@
            this.label21 = new System.Windows.Forms.Label();
            this.btnOutStore = new System.Windows.Forms.Button();
            this.groupBox6 = new System.Windows.Forms.GroupBox();
+            this.btnClearBuzzer = new System.Windows.Forms.Button();
            this.btnSingleTrayIn = new System.Windows.Forms.Button();
            this.lblBatchMsg = new System.Windows.Forms.Label();
            this.btnOpenDoor = new System.Windows.Forms.Button();
@@ -56,7 +57,6 @@
            this.lblOutInfo = new System.Windows.Forms.Label();
            this.tabControl1 = new System.Windows.Forms.TabControl();
            this.tabPage4 = new System.Windows.Forms.TabPage();
-            this.btnClearBuzzer = new System.Windows.Forms.Button();
            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
            this.btnClearLog = new System.Windows.Forms.Button();
            this.tabPage2 = new System.Windows.Forms.TabPage();
@@ -235,12 +235,14 @@
            this.摄像机调试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
            this.出入库调试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator();
+            this.打开日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.语言 = new System.Windows.Forms.ToolStripMenuItem();
            this.清理日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
            this.英文ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
            this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem();
            this.contextMenuStrip1.SuspendLayout();
            this.groupAuto.SuspendLayout();
            this.groupBox6.SuspendLayout();
@@ -462,6 +464,7 @@
            // 
            this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
            | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBox6.Controls.Add(this.btnClearBuzzer);
            this.groupBox6.Controls.Add(this.btnSingleTrayIn);
            this.groupBox6.Controls.Add(this.lblBatchMsg);
            this.groupBox6.Controls.Add(this.btnOpenDoor);
@@ -481,6 +484,17 @@
            this.groupBox6.TabStop = false;
            this.groupBox6.Text = "批量上下料操作";
            // 
+            // btnClearBuzzer
+            // 
+            this.btnClearBuzzer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnClearBuzzer.Location = new System.Drawing.Point(11, 176);
+            this.btnClearBuzzer.Name = "btnClearBuzzer";
+            this.btnClearBuzzer.Size = new System.Drawing.Size(155, 38);
+            this.btnClearBuzzer.TabIndex = 257;
+            this.btnClearBuzzer.Text = "清理蜂鸣器";
+            this.btnClearBuzzer.UseVisualStyleBackColor = true;
+            this.btnClearBuzzer.Click += new System.EventHandler(this.btnClearBuzzer_Click);
+            // 
            // btnSingleTrayIn
            // 
            this.btnSingleTrayIn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -619,7 +633,6 @@
            // 
            // tabPage4
            // 
-            this.tabPage4.Controls.Add(this.btnClearBuzzer);
            this.tabPage4.Controls.Add(this.richTextBox1);
            this.tabPage4.Controls.Add(this.btnClearLog);
            this.tabPage4.Location = new System.Drawing.Point(4, 26);
@@ -629,18 +642,6 @@
            this.tabPage4.Text = "日志";
            this.tabPage4.UseVisualStyleBackColor = true;
            // 
-            // btnClearBuzzer
-            // 
-            this.btnClearBuzzer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnClearBuzzer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnClearBuzzer.Location = new System.Drawing.Point(11, 390);
-            this.btnClearBuzzer.Name = "btnClearBuzzer";
-            this.btnClearBuzzer.Size = new System.Drawing.Size(151, 38);
-            this.btnClearBuzzer.TabIndex = 257;
-            this.btnClearBuzzer.Text = "清理蜂鸣器";
-            this.btnClearBuzzer.UseVisualStyleBackColor = true;
-            this.btnClearBuzzer.Click += new System.EventHandler(this.btnClearBuzzer_Click);
-            // 
            // richTextBox1
            // 
            this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -657,7 +658,7 @@
            // 
            this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
            this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnClearLog.Location = new System.Drawing.Point(494, 390);
+            this.btnClearLog.Location = new System.Drawing.Point(11, 390);
            this.btnClearLog.Name = "btnClearLog";
            this.btnClearLog.Size = new System.Drawing.Size(151, 38);
            this.btnClearLog.TabIndex = 224;
@@ -2605,7 +2606,9 @@
            this.toolStripSeparator10,
            this.摄像机调试ToolStripMenuItem,
            this.toolStripSeparator20,
-            this.出入库调试ToolStripMenuItem});
+            this.出入库调试ToolStripMenuItem,
+            this.toolStripSeparator23,
+            this.打开日志ToolStripMenuItem});
            this.设备调试ToolStripMenuItem.Name = "设备调试ToolStripMenuItem";
            this.设备调试ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
            this.设备调试ToolStripMenuItem.Text = "设备调试";
@@ -2665,6 +2668,18 @@
            this.出入库调试ToolStripMenuItem.Text = "启用调试";
            this.出入库调试ToolStripMenuItem.Click += new System.EventHandler(this.出入库调试ToolStripMenuItem_Click);
            // 
+            // toolStripSeparator23
+            // 
+            this.toolStripSeparator23.Name = "toolStripSeparator23";
+            this.toolStripSeparator23.Size = new System.Drawing.Size(189, 6);
+            // 
+            // 打开日志ToolStripMenuItem
+            // 
+            this.打开日志ToolStripMenuItem.Name = "打开日志ToolStripMenuItem";
+            this.打开日志ToolStripMenuItem.Size = new System.Drawing.Size(192, 26);
+            this.打开日志ToolStripMenuItem.Text = "打开日志";
+            this.打开日志ToolStripMenuItem.Click += new System.EventHandler(this.打开日志ToolStripMenuItem_Click);
+            // 
            // 语言
            // 
            this.语言.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -2680,34 +2695,34 @@
            // 清理日志ToolStripMenuItem
            // 
            this.清理日志ToolStripMenuItem.Name = "清理日志ToolStripMenuItem";
-            this.清理日志ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.清理日志ToolStripMenuItem.Size = new System.Drawing.Size(112, 26);
            this.清理日志ToolStripMenuItem.Text = "中文";
            this.清理日志ToolStripMenuItem.Click += new System.EventHandler(this.清理日志ToolStripMenuItem_Click);
            // 
            // toolStripSeparator12
            // 
            this.toolStripSeparator12.Name = "toolStripSeparator12";
-            this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6);
+            this.toolStripSeparator12.Size = new System.Drawing.Size(109, 6);
            // 
            // 英文ToolStripMenuItem
            // 
            this.英文ToolStripMenuItem.Name = "英文ToolStripMenuItem";
-            this.英文ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.英文ToolStripMenuItem.Size = new System.Drawing.Size(112, 26);
            this.英文ToolStripMenuItem.Text = "英文";
            this.英文ToolStripMenuItem.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click);
            // 
+            // toolStripSeparator22
+            // 
+            this.toolStripSeparator22.Name = "toolStripSeparator22";
+            this.toolStripSeparator22.Size = new System.Drawing.Size(109, 6);
+            // 
            // toolStripMenuItem6
            // 
            this.toolStripMenuItem6.Name = "toolStripMenuItem6";
-            this.toolStripMenuItem6.Size = new System.Drawing.Size(180, 26);
+            this.toolStripMenuItem6.Size = new System.Drawing.Size(112, 26);
            this.toolStripMenuItem6.Text = "日语";
            this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
            // 
-            // toolStripSeparator22
-            // 
-            this.toolStripSeparator22.Name = "toolStripSeparator22";
-            this.toolStripSeparator22.Size = new System.Drawing.Size(177, 6);
-            // 
            // FrmStoreBox
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -2982,6 +2997,8 @@
        private System.Windows.Forms.ToolStripSeparator toolStripSeparator21;
        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem6;
        private System.Windows.Forms.ToolStripSeparator toolStripSeparator22;
+        private System.Windows.Forms.ToolStripMenuItem 打开日志ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator23;
    }
 }
--- a/source/ACSingleStore/FrmStoreBox.cs
查看文件 @b5cfda8
+++ b/source/ACSingleStore/FrmStoreBox.cs
查看文件 @b5cfda8
@@ -110,6 +110,8 @@ namespace OnlineStore.AutoInOutStore
        public static string warn = ResourceCulture.GetString(ResourceCulture.WarnMsg, "警告");
        private string StartCycle = ResourceCulture.GetString(ResourceCulture.StartCycle, "开始循环出库");
        private string StopCycle = ResourceCulture.GetString(ResourceCulture.StopCycle, "停止循环出库");
+        private string openLog= ResourceCulture.GetString("打开日志", "打开日志");
+        private string closeLog = ResourceCulture.GetString("关闭日志", "关闭日志");
        public void processMenu()
        {
@@ -126,6 +128,8 @@ namespace OnlineStore.AutoInOutStore
            StopAuto = ResourceCulture.GetString(ResourceCulture.StopAuto, StopAuto);
            AutoOut = ResourceCulture.GetString(ResourceCulture.AutoOut, "自动出库：");
            AutoIn = ResourceCulture.GetString(ResourceCulture.AutoIn, "自动入库：");
+            openLog = ResourceCulture.GetString("打开日志", "打开日志");
+          closeLog = ResourceCulture.GetString("关闭日志", "关闭日志");
        //摄像机调试ToolStripMenuItem.Visible = CurrLanguage.Equals(ResourceCulture.China);
        //toolStripSeparator10.Visible = CurrLanguage.Equals(ResourceCulture.China);
@@ -151,6 +155,15 @@ namespace OnlineStore.AutoInOutStore
                    }
                }
            }
+            if (tabControl1.TabPages.Contains(tabPage4))
+            { 
+                打开日志ToolStripMenuItem.Text = closeLog ;
+            }
+            else
+            {
+                打开日志ToolStripMenuItem.Text = openLog;
+            }
+            tabPage4.Text= ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, tabPage4.Name), tabPage4.Text);
            显示ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, 显示ToolStripMenuItem.Name), 显示ToolStripMenuItem.Text);
            toolStripMenuItem1.Text = ResourceCulture.GetString(ResourceCulture.GetTextIdStr(className, toolStripMenuItem1.Name), toolStripMenuItem1.Text);
            notifyIcon1.Text = this.Text;
@@ -248,6 +261,11 @@ namespace OnlineStore.AutoInOutStore
            cmbJianGe.SelectedIndex = 1;
            btnCycleOut.Visible = ConfigAppSettings.GetIntValue(Setting_Init.OpenCycleOut).Equals(1);
            DebugStatus(false);
+            if (tabControl1.TabPages.Contains(tabPage4))
+            {
+                tabControl1.TabPages.Remove(tabPage4);
+            }
+            打开日志ToolStripMenuItem.Text = openLog;
        }
        private void Store_ResetEvent()
@@ -1898,5 +1916,27 @@ namespace OnlineStore.AutoInOutStore
            ConfigAppSettings.SaveValue(Setting_Init.Default_Language, str);
            this.LanguageProcess();
        }
+        private void 打开日志ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (打开日志ToolStripMenuItem.Text.Equals(openLog))
+            {
+                if (!tabControl1.TabPages.Contains(tabPage4))
+                {
+                    tabControl1.TabPages.Insert(0,tabPage4);
+                }
+                tabControl1.SelectedIndex = 0;
+                打开日志ToolStripMenuItem.Text = closeLog;
+            }
+            else
+            {
+                if (tabControl1.TabPages.Contains(tabPage4))
+                {
+                    tabControl1.TabPages.Remove(tabPage4);
+                }
+                打开日志ToolStripMenuItem.Text = openLog;
+            }
+        }
    }
 }
--- a/source/ACSingleStore/Properties/Resource.en-US.resx
查看文件 @b5cfda8
+++ b/source/ACSingleStore/Properties/Resource.en-US.resx
查看文件 @b5cfda8
@@ -1426,4 +1426,10 @@
  <data name="FrmStoreBox_toolStripMenuItem6_Text" xml:space="preserve">
    <value>Japanese</value>
  </data>
+  <data name="关闭日志" xml:space="preserve">
+    <value>Turn off log display</value>
+  </data>
+  <data name="打开日志" xml:space="preserve">
+    <value>Open log display</value>
+  </data>
 </root>
\ No newline at end of file
--- a/source/ACSingleStore/Properties/Resource.zh-CN.resx
查看文件 @b5cfda8
+++ b/source/ACSingleStore/Properties/Resource.zh-CN.resx
查看文件 @b5cfda8
@@ -1425,4 +1425,10 @@
  <data name="FrmStoreBox_toolStripMenuItem6_Text" xml:space="preserve">
    <value>日语</value>
  </data>
+  <data name="关闭日志" xml:space="preserve">
+    <value>关闭日志</value>
+  </data>
+  <data name="打开日志" xml:space="preserve">
+    <value>打开日志</value>
+  </data>
 </root>
\ No newline at end of file
--- a/source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
查看文件 @b5cfda8
+++ b/source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
查看文件 @b5cfda8
@@ -132,7 +132,7 @@ PRO,(轴三)进出轴最大误差脉冲值,InoutAxis_ErrorCountMax,1000,,,,,,,
 PRO,出入库多少次，会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,
 PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,, ,
 PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
-PRO,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,,,
+PRO,是否使用料盘检测信号,IsUse_Tray_Check,1,,,,,,,
 PRO,(轴一)旋转轴最小限位,MiddleAxis_PositionMin,0,,,,,,,
 PRO,(轴二)升降轴最小限位,UpdownAxis_PositionMin,0,,,,,,,
 PRO,(轴三)进出轴最小限位,InoutAxis_PositionMin,0,,,,,,,