Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 9526becb 由 LN
选项

增加调试状态按钮

1 个父辈 e3a55949
内嵌 并排
正在显示 5 个修改的文件 包含 53 行增加 和 4 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.tabControl2 = new System.Windows.Forms.TabControl(); this.tabControl2 = new System.Windows.Forms.TabControl();
this.tabPage4 = new System.Windows.Forms.TabPage(); this.tabPage4 = new System.Windows.Forms.TabPage();
this.chbIsDebug = new System.Windows.Forms.CheckBox();
this.chbBuzzer = new System.Windows.Forms.CheckBox(); this.chbBuzzer = new System.Windows.Forms.CheckBox();
this.btnStoreExit = new System.Windows.Forms.Button(); this.btnStoreExit = new System.Windows.Forms.Button();
this.btnStoreHome = new System.Windows.Forms.Button(); this.btnStoreHome = new System.Windows.Forms.Button();
...@@ -237,6 +238,7 @@ ...@@ -237,6 +238,7 @@
// //
// tabPage4 // tabPage4
// //
this.tabPage4.Controls.Add(this.chbIsDebug);
this.tabPage4.Controls.Add(this.chbBuzzer); this.tabPage4.Controls.Add(this.chbBuzzer);
this.tabPage4.Controls.Add(this.btnStoreExit); this.tabPage4.Controls.Add(this.btnStoreExit);
this.tabPage4.Controls.Add(this.btnStoreHome); this.tabPage4.Controls.Add(this.btnStoreHome);
...@@ -252,12 +254,25 @@ ...@@ -252,12 +254,25 @@
this.tabPage4.Text = " 料仓操作 "; this.tabPage4.Text = " 料仓操作 ";
this.tabPage4.UseVisualStyleBackColor = true; this.tabPage4.UseVisualStyleBackColor = true;
// //
// chbIsDebug
//
this.chbIsDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbIsDebug.AutoSize = true;
this.chbIsDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbIsDebug.Location = new System.Drawing.Point(710, 13);
this.chbIsDebug.Name = "chbIsDebug";
this.chbIsDebug.Size = new System.Drawing.Size(84, 24);
this.chbIsDebug.TabIndex = 272;
this.chbIsDebug.Text = "调试状态";
this.chbIsDebug.UseVisualStyleBackColor = true;
this.chbIsDebug.CheckedChanged += new System.EventHandler(this.chbIsDebug_CheckedChanged);
//
// chbBuzzer // chbBuzzer
// //
this.chbBuzzer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbBuzzer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbBuzzer.AutoSize = true; this.chbBuzzer.AutoSize = true;
this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBuzzer.Location = new System.Drawing.Point(736, 13); this.chbBuzzer.Location = new System.Drawing.Point(848, 13);
this.chbBuzzer.Name = "chbBuzzer"; this.chbBuzzer.Name = "chbBuzzer";
this.chbBuzzer.Size = new System.Drawing.Size(98, 24); this.chbBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbBuzzer.TabIndex = 271; this.chbBuzzer.TabIndex = 271;
...@@ -294,7 +309,7 @@ ...@@ -294,7 +309,7 @@
this.chbAuto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbAuto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbAuto.AutoSize = true; this.chbAuto.AutoSize = true;
this.chbAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAuto.Location = new System.Drawing.Point(890, 13); this.chbAuto.Location = new System.Drawing.Point(965, 13);
this.chbAuto.Name = "chbAuto"; this.chbAuto.Name = "chbAuto";
this.chbAuto.Size = new System.Drawing.Size(112, 24); this.chbAuto.Size = new System.Drawing.Size(112, 24);
this.chbAuto.TabIndex = 270; this.chbAuto.TabIndex = 270;
...@@ -2127,6 +2142,7 @@ ...@@ -2127,6 +2142,7 @@
private ACPackingStore.AxisMoveControl axisMoveControl1; private ACPackingStore.AxisMoveControl axisMoveControl1;
private System.Windows.Forms.Button btnUpdown; private System.Windows.Forms.Button btnUpdown;
private System.Windows.Forms.Button btnLan; private System.Windows.Forms.Button btnLan;
private System.Windows.Forms.CheckBox chbIsDebug;
} }
} }
source/ACSingleStore/FrmStoreBox.cs
...@@ -147,6 +147,7 @@ namespace OnlineStore.ACSingleStore ...@@ -147,6 +147,7 @@ namespace OnlineStore.ACSingleStore
notifyIcon1.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title); notifyIcon1.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
this.chbBuzzer.Checked = store.UseBuzzer; this.chbBuzzer.Checked = store.UseBuzzer;
axisMoveControl1.LoadData(store, store.moveAxisList.ToArray()); axisMoveControl1.LoadData(store, store.moveAxisList.ToArray());
chbIsDebug.Checked = store.IsDebug;
LoadOk = true; LoadOk = true;
HideForm(); HideForm();
this.Opacity = 1; this.Opacity = 1;
...@@ -1154,5 +1155,31 @@ namespace OnlineStore.ACSingleStore ...@@ -1154,5 +1155,31 @@ namespace OnlineStore.ACSingleStore
// this.richTextBox1.Clear(); // this.richTextBox1.Clear();
//} //}
} }
private void chbIsDebug_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (chbIsDebug.Checked.Equals(store.IsDebug))
{
return;
}
if (chbIsDebug.Checked)
{
store.IsDebug = true;
LogUtil.info("勾选：调试模式");
store.Config.IsInDebug = 1;
StoreManager.UpdateBoxConfig(store.Config);
}
else
{
store.IsDebug = false;
LogUtil.info("去掉：调试模式");
store.Config.IsInDebug = 0;
StoreManager.UpdateBoxConfig(store.Config);
}
}
} }
} }
source/ACSingleStore/resource/language.resource
...@@ -297,4 +297,5 @@ trayHeight,料盘高度,Reel height, ...@@ -297,4 +297,5 @@ trayHeight,料盘高度,Reel height,
开启DEBUG,开启DEBUG, Open DEBUG 开启DEBUG,开启DEBUG, Open DEBUG
出库{0}叉子从库位退出后，未检测到料盘有料,出库{0}叉子从库位退出后，未检测到料盘有料,Outgoing {0} after the fork exits from the storage，no material on the tray is detected 出库{0}叉子从库位退出后，未检测到料盘有料,出库{0}叉子从库位退出后，未检测到料盘有料,Outgoing {0} after the fork exits from the storage，no material on the tray is detected
左侧门未关,左侧门未关,Left door open 左侧门未关,左侧门未关,Left door open
右侧门未关,右侧门未关,Right door open
\ No newline at end of file \ No newline at end of file
右侧门未关,右侧门未关,Right door open
FrmStoreBox_chbIsDebug_Text,调试状态,debug mode
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/resource/zh-CN.resource
...@@ -336,4 +336,4 @@ FrmAbout_btnCopy_Text=复制编号 ...@@ -336,4 +336,4 @@ FrmAbout_btnCopy_Text=复制编号
FrmAbout_lblCodeName_Text=软件编号：52 43 2D 44 4C 2D 41 43 53 69 6E 67 6C 65 53 74 6F 72 65 FrmAbout_lblCodeName_Text=软件编号：52 43 2D 44 4C 2D 41 43 53 69 6E 67 6C 65 53 74 6F 72 65
FrmAbout_lblTime_Text=更新时间：2020-02-07 11:35 FrmAbout_lblTime_Text=更新时间：2020-02-07 11:35
FrmAbout_lblVersion_Text=版本号：1.0.7342.20852 FrmAbout_lblVersion_Text=版本号：1.0.7342.20852
FrmAbout_btnNext_Text=确定 FrmAbout_btnNext_Text=确定
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/记录.txt
...@@ -108,3 +108,8 @@ DeCodeType=解码类型，0=halcon，1=zxing解码 西安料仓解析方式。2= ...@@ -108,3 +108,8 @@ DeCodeType=解码类型，0=halcon，1=zxing解码 西安料仓解析方式。2=
出入库拿到料盘和放下料盘必须判断叉子料盘检测信号 出入库拿到料盘和放下料盘必须判断叉子料盘检测信号
英文版本显示中文日志 英文版本显示中文日志
20200227
增加调试状态按钮。
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!