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;
@@ -42,6 +43,10 @@
                   cvImage.OnElementChangedHandle += CvImage_OnElementChangedHandle;

                   timer1.Enabled = true;

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

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

@@ -88,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)
@@ -115,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)
@@ -258,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(() =>
@@ -290,10 +317,14 @@
            {
                _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 = "";
            }

@@ -305,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()
@@ -390,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 = "开始测量";
@@ -472,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)
@@ -485,5 +522,44 @@
        {
            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 = "";
                    }
                }));
            });
        }
    }
}