Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

wells.liu

2020-07-10 67c0c0d55c193d00ef6f3481e1f081d236bcab13

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

@@ -51,6 +51,8 @@
            if (string.IsNullOrWhiteSpace(Config.BackgroundImagePath))
                return;

            this.Invoke(new Action(() =>
            {
            try
            {
                Bitmap image = (Bitmap)Image.FromFile(Config.BackgroundImagePath);
@@ -65,6 +67,8 @@

            cvImage.Elements.Clear();
            lvMeasures.Items.Clear();
                txtBarcode.ReadOnly = Config.IsBarcodeManulInputBlocked;

            Config.MeasurementUnitCollection.ForEach(u =>
            {
                if (!u.IsEnabled)
@@ -77,9 +81,7 @@
                item.Tag = u.Id;
                lvMeasures.Items.Add(item);
            });

            if (txtBarcode.IsHandleCreated)
                txtBarcode.BeginInvoke(new Action(() => txtBarcode.ReadOnly = Config.IsBarcodeManulInputBlocked));
            }));

            Process_M071.OnClearBarcode -= M071_MainForm_OnClearBarcode;
            Process_M071.OnClearBarcode += M071_MainForm_OnClearBarcode;