1. gocator添加byte2/byte4的配置，目前测试byte4不成功，暂时还是使用byte2配置。 2. 添加键名代码映射配置和NG键名代码...

patrick.xu

2020-12-21 1bc2df66bc88a6405df345dccc24a5031e18b592

 src/Bro.M071.Process/UI/M071_MainForm.cs

@@ -1,6 +1,7 @@
using Bro.Common.Base;
using Bro.Common.Helper;
using Bro.UI.Model.Winform;
using Bro.UI.Model.Winform.UI;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -40,6 +41,12 @@
                   cvImage.SetScreenSize();
                   cvImage.OnElementChangedHandle -= CvImage_OnElementChangedHandle;
                   cvImage.OnElementChangedHandle += CvImage_OnElementChangedHandle;

                   timer1.Enabled = true;

                   btnReset.Text = $"复位（长按{Config.FullResetRequiredDuration}秒大复位）";

                   lblCT.Text = tsslError.Text = "";
               };
        }

@@ -86,6 +93,8 @@
                           item.Tag = u.Id;
                           lvMeasures.Items.Add(item);
                       });

                       lblOperator.Text = string.IsNullOrWhiteSpace(Process_M071.OperatorCode) ? "NotLogin" : Process_M071.OperatorCode;
                   }));
            }
            catch (Exception ex)
@@ -113,6 +122,9 @@

            Process_M071.OnElementUpdated -= Process_M071_OnElementUpdated;
            Process_M071.OnElementUpdated += Process_M071_OnElementUpdated;

            Process_M071.OnCheckHintUpload = OnCheckHintUpload;
            Process_M071.OnOperatorLogin = OnOperatorLogin;
        }

        private void Config_PropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -135,6 +147,27 @@
        {
            tscEditLocation.Visible = tsmiShowEditor.Checked;
            tscEditLocation.BringToFront();
        }

        private void tsmiRefreshLabels_Click(object sender, EventArgs e)
        {
            cvImage.Elements.Clear();
            lvMeasures.Items.Clear();

            Config.MeasurementUnitCollection.ForEach(u =>
            {
                if (!u.IsEnabled)
                    return;

                var ele = new KeyIndicator(u.Id, u.DisplayLocation);
                cvImage.Elements.Add(ele);

                ListViewItem item = new ListViewItem(u.GetDisplayText());
                item.Tag = u.Id;
                lvMeasures.Items.Add(item);
            });

            this.Invalidate();
        }
        #endregion

@@ -235,6 +268,23 @@
        #region 标签结果显示
        private async void Process_M071_OnElementUpdated(Common.Interface.IShapeElement obj)
        {
            //this.Invoke(new Action(() =>
            //{
            //    if (obj is KeyIndicator keyIndicator)
            //    {
            //        var ele = cvImage.Elements.FirstOrDefault(u => u.ID == keyIndicator.ID);

            //        //(ele as KeyIndicator).Text = keyIndicator.Text;
            //        //(ele as KeyIndicator).ResultState = keyIndicator.ResultState;
            //        if (ele != null)
            //        {
            //            ele = keyIndicator;
            //        }

            //        this.Invalidate();
            //    }                
            //}));

            if (obj is KeyIndicator keyIndicator)
            {
                this.Invoke(new Action(() =>
@@ -263,10 +313,18 @@
            {
                _barcode += keyStr.ToUpper();
            }
            else if (keyStr.Length == 2 && keyStr.StartsWith("D"))
            {
                _barcode += keyStr.Substring(1).ToUpper();
            }
            else if (keyStr.StartsWith("NumPad"))
            {
                _barcode += keyStr.Replace("NumPad", "");
            }

            if (e.KeyValue == 13)
            {
                txtBarcode.Text = _barcode;
                Process_M071.BarCode = txtBarcode.Text = _barcode;
                _barcode = "";
            }

@@ -278,7 +336,7 @@

        private void txtBarcode_TextChanged(object sender, EventArgs e)
        {
            Process_M071.BarCode = txtBarcode.Text.Trim();
            //Process_M071.BarCode = txtBarcode.Text.Trim();
        }

        private void M071_MainForm_OnClearBarcode()
@@ -292,7 +350,7 @@
        {
            if (lblMachineState.IsHandleCreated)
            {
                lblMachineState.BeginInvoke(new Action(() =>
                lblMachineState.Invoke(new Action(() =>
                {
                    switch (state)
                    {
@@ -303,7 +361,6 @@

                            btnStartMeasure.Text = "开始测量";
                            btnStartMeasure.Enabled = false;
                            btnStartMeasure.BackColor = Color.Red;
                            break;
                        case MachineState.Pause:
                            btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Yellow;
@@ -312,25 +369,22 @@

                            btnStartMeasure.Text = "继续测量";
                            btnStartMeasure.Enabled = true;
                            btnStartMeasure.BackColor = Color.Lime;
                            break;
                        case MachineState.Ready:
                            btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Lime;
                            btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.White;
                            btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.Black;
                            lblMachineState.Text = "就绪";
                            

                            btnStartMeasure.Text = "开始测量";
                            btnStartMeasure.Enabled = true;
                            btnStartMeasure.BackColor = Color.Lime;
                            break;
                        case MachineState.Running:
                            btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Lime;
                            btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Transparent;
                            btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.DarkGreen;
                            lblMachineState.Text = "运行";

                            btnStartMeasure.Text = "暂停测量";
                            btnStartMeasure.Enabled = true;
                            btnStartMeasure.BackColor = Color.Lime;
                            break;
                        case MachineState.Unknown:
                            btnStartMeasure.BackColor = lblMachineState.BackColor = SystemColors.Control;
@@ -338,7 +392,6 @@
                            lblMachineState.Text = "未知";

                            btnStartMeasure.Enabled = false;
                            btnStartMeasure.BackColor = Color.Red;
                            break;
                    }
                }));
@@ -368,11 +421,17 @@
                    lblProductionState.ForeColor = Color.White;
                    lblProductionState.Text = "OK";
                }
                else
                else if (result == 0)
                {
                    lblProductionState.BackColor = Color.Red;
                    lblProductionState.ForeColor = Color.White;
                    lblProductionState.Text = "NG";
                }
                else
                {
                    lblProductionState.BackColor = Color.White;
                    lblProductionState.ForeColor = Color.Red;
                    lblProductionState.Text = "NA";
                }

                //btnStartMeasure.Text = "开始测量";
@@ -424,11 +483,11 @@
            }
            else if (btnStartMeasure.Text == "继续测量")
            {
                Process_M071.SwitchJobStatus(new OperationConfigBase() { InputPara = new List<int>() { 0 } }, null, null);
                Process_M071.SwitchJobStatus(new OperationConfigBase() { InputPara = new List<int>() { 10 } }, null, null);
            }
            else
            {
                Process_M071.SwitchJobStatus(new OperationConfigBase() { InputPara = new List<int>() { 1 } }, null, null);
                Process_M071.SwitchJobStatus(new OperationConfigBase() { InputPara = new List<int>() { 11 } }, null, null);
            }
        }

@@ -450,7 +509,7 @@
                Process_M071.Reset(null, null, null);
            }

            Process_M071.ResetTimer.Change(1000 * 5, -1);
            Process_M071.ResetTimer.Change(1000 * Config.FullResetRequiredDuration, -1);
        }

        private void btnReset_MouseUp(object sender, MouseEventArgs e)
@@ -458,5 +517,49 @@
            Process_M071.ResetTimer.Change(-1, -1);
        }
        #endregion

        private void timer1_Tick(object sender, EventArgs e)
        {
            cvImage.Refresh();
        }

        private void lblOperator_DoubleClick(object sender, EventArgs e)
        {
            InputWindow inputFrm = new InputWindow("请输入操作员工号");
            if (inputFrm.ShowDialog() == DialogResult.OK)
            {
                Process_M071.OperatorCode = inputFrm.Input;
            }
        }

        private void OnOperatorLogin(string operatorCode)
        {
            this.Invoke(new Action(() =>
            {
                lblOperator.Text = operatorCode;
            }));
        }

        private async void OnCheckHintUpload(string hintMsg, bool isAlarm)
        {
            await Task.Run(() =>
            {
                this.Invoke(new Action(() =>
                {
                    if (!string.IsNullOrWhiteSpace(hintMsg))
                    {
                        stStripHint.Visible = true;
                        tsslError.Text = hintMsg;

                        tsslError.BackColor = isAlarm ? Color.Red : Color.Green;
                    }
                    else
                    {
                        stStripHint.Visible = false;
                        tsslError.Text = "";
                    }
                }));
            });
        }
    }
}