Merge branch 'master' into feature/HR_Camera

C3032

2026-01-05 004f03913569122866d089a1696ed65c0f4cbcaf

 LB_SmartVision/Forms/Pages/ProcessPage/ProcessControl.cs

@@ -43,6 +43,11 @@

            if (ProcessRunBll != null)
                this.label1.Text = $"总数：{ProcessRunBll.total}";
            this.isClosed = false ;
            var TaskPhotoContinue = Task.Factory.StartNew(() =>
            {
                ThreadCircleRun();
            });
        }

        public void SetTitle(string title)
@@ -72,9 +77,7 @@
                }));
            }
            else
            {
                UserHSmartWindowControl.ClearObj();
            }
        }

        /// <summary>
@@ -93,9 +96,7 @@
                }));
            }
            else
            {
                this.label1.Text = $"总数：{ProcessRunBll.total}";
            }
        }

        public bool Run(out string msg)
@@ -107,9 +108,7 @@
            }

            if (isCircleRuning || ProcessRunBll.bRuning)
            {
                ProcessRunBll.LogInfo($"{ProcessRunBll.Name}正在运行", LogInfoType.ERROR);
            }

            ProcessRunBll.Run();

@@ -126,9 +125,7 @@
                try
                {
                    if (ProcessRunBll == null)
                    {
                        return;
                    }

                    ProcessRunBll.LogInfo(string.Format("流程[{0}]开始运行", this.ProcessRunBll.Name), LogInfoType.INFO);

@@ -136,9 +133,7 @@
                    result = Run(out msg);

                    if (ProcessRunBll.GetImage(_Layout, out _, out HObject RecordImage))
                    {
                        ShowHoImage(RecordImage);
                    }
                }
                catch { msg = "运行出现了异常"; }

@@ -159,37 +154,36 @@

                if (isCircleRuning)
                {
                    threadCircleRun = new Thread(ThreadCircleRun);
                    threadCircleRun.IsBackground = true;
                    threadCircleRun.Start();
                    this.mAutoResetEvent.Set();
                }
                else
                {
                    isCircleRuning = false;
                    //threadCircleRun.Abort();
                }
                if (!isCircleRuning)
                {
                    ProcessRunBll.LogInfo($"{ProcessRunBll.Name}关闭连续运行", LogInfoType.PASS);
                    return;
                }

                ProcessRunBll.LogInfo($"{ProcessRunBll.Name}开启连续运行", LogInfoType.WARN);
            }
            catch { }
        }

        Thread threadCircleRun = null;
        private AutoResetEvent mAutoResetEvent = new AutoResetEvent(false);
        bool isClosed = false;

        void ThreadCircleRun()
        {
            if (!isCircleRuning)
            while (!isClosed)
            {
                ProcessRunBll.LogInfo($"{ProcessRunBll.Name}关闭连续运行", LogInfoType.PASS);
                return;
            }

            ProcessRunBll.LogInfo($"{ProcessRunBll.Name}开启连续运行", LogInfoType.WARN);

            while (isCircleRuning)
            {
                //this.BeginInvoke(new Action(() =>
                //{
                try
                {
                    if (isCircleRuning == false)
                    {
                        this.mAutoResetEvent.WaitOne();
                    }

                    ProcessRunBll.LogInfo($"{ProcessRunBll.Name}开始运行", LogInfoType.WARN);
                    ClearObj();
                    bool result = ProcessRunBll.Run();
@@ -199,13 +193,9 @@
                        , result ? LogInfoType.PASS : LogInfoType.ERROR);

                    if (ProcessRunBll.GetImage(_Layout, out _, out HObject RecordImage))
                    {
                        ShowHoImage(RecordImage);
                    }
                }
                catch { }
                //}));

                Thread.Sleep(33);
            }
        }