From c98c47d5fc31ac10f1671a67eee588cb74b223c6 Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期五, 03 四月 2026 15:56:09 +0800
Subject: [PATCH] 修复通讯工具修改后地址不更新的bug。
---
LB_VisionProcesses/Cameras/LBCameras/LBCamera.cs | 185 +++++++++++++++++++++------------------------
1 files changed, 86 insertions(+), 99 deletions(-)
diff --git a/LB_VisionProcesses/Cameras/LBCameras/LBCamera.cs b/LB_VisionProcesses/Cameras/LBCameras/LBCamera.cs
index 810ffd3..728e267 100644
--- a/LB_VisionProcesses/Cameras/LBCameras/LBCamera.cs
+++ b/LB_VisionProcesses/Cameras/LBCameras/LBCamera.cs
@@ -4,6 +4,7 @@
using LB_VisionProcesses.Cameras;
using Sunny.UI.Win32;
using System;
+using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Imaging;
@@ -533,14 +534,23 @@
private void CreateAndFireBitmap()
{
+ Bitmap bmp = null;
+ BitmapData bmpData = null;
+
try
{
int width = _currentBitmapWidth;
- int height = _currentLineCount; // 浣跨敤瀹為檯閲囬泦鍒扮殑琛屾暟
+ int height = _currentLineCount;
- if (width <= 0 || height <= 0 || _rawPixelBuffer == null) return;
+ // 鍩虹鍚堟硶鎬ф牎楠�
+ if (width <= 0 || height <= 0 || _rawPixelBuffer == null || _rawPixelBuffer.Length < width * height)
+ {
+ AsyncLogHelper.Warn($"LBCamera[{SN}]: 鍥惧儚鍙傛暟鏃犳晥锛岃烦杩囩敓鎴�");
+ return;
+ }
- Bitmap bmp = new Bitmap(width, height, PixelFormat.Format8bppIndexed);
+ // 1. 鍒涘缓8浣嶇伆搴︿綅鍥�
+ bmp = new Bitmap(width, height, PixelFormat.Format8bppIndexed);
// 璁剧疆鐏板害璋冭壊鏉�
ColorPalette palette = bmp.Palette;
@@ -550,9 +560,8 @@
}
bmp.Palette = palette;
- // 鎷疯礉鏁版嵁
- BitmapData bmpData = bmp.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
-
+ // 2. 楂樻晥鍐呭瓨鎷疯礉锛堟敮鎸丼tride瀵归綈锛屾暣琛屽鍒讹級
+ bmpData = bmp.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
// 娉ㄦ剰锛欱itmap Stride 鍙兘涓嶇瓑浜� Width锛岄渶瑕侀�愯鎷疯礉
int stride = bmpData.Stride;
IntPtr ptr = bmpData.Scan0;
@@ -567,141 +576,119 @@
}
bmp.UnlockBits(bmpData);
+ bmpData = null; // 鏍囪宸茶В閿�
_frameCount++;
- AsyncLogHelper.Info($"LBCamera[{SN}]: Frame {_frameCount} generated ({width}x{height})");
- //绌哄�兼牎楠岋細杞崲澶辫触鍒欑洿鎺ヨ繑鍥�
- if (bmp == null)
+ AsyncLogHelper.Info($"LBCamera[{SN}]: 鐢熸垚绗� {_frameCount} 甯� ({width}x{height})");
+
+ // 3. 鑾峰彇/鍒涘缓绾跨▼瀹夊叏闃熷垪
+ var queue = CollectedImages.GetOrAdd(SN, new ConcurrentQueue<Bitmap>());
+
+ // 4. 闃熷垪闄愭祦锛岄槻姝㈠唴瀛樻孩鍑�
+ if (queue.Count >= MAX_QUEUE_CAPACITY)
{
- AsyncLogHelper.Warn(SN + "甯ц浆鎹负Bitmap澶辫触锛岃烦杩囧鐞�");
- return;
- }
- // 绾跨▼瀹夊叏鍦板皢Bitmap娣诲姞鍒癈ollectedImages瀛楀吀
- lock (_collectedImagesLock)
- {
- // 纭繚褰撳墠鐩告満SN瀵瑰簲鐨勫垪琛ㄥ瓨鍦�
- if (!CollectedImages.ContainsKey(SN))
+ if (queue.TryDequeue(out Bitmap old))
{
- CollectedImages[SN] = new List<Bitmap>();
+ old.Dispose(); // 涓㈠純鏈�鏃у抚锛岄噴鏀惧唴瀛�
+ AsyncLogHelper.Warn($"LBCamera[{SN}]: 闃熷垪宸叉弧锛岃嚜鍔ㄤ涪寮冩渶鏃у抚");
}
- CollectedImages[SN].Add(bmp);
- AsyncLogHelper.Info(SN + $"鍥惧儚宸插姞鍏ョ紦瀛橈紝褰撳墠缂撳瓨鏁伴噺锛歿CollectedImages[SN].Count}");
}
- // 澶勭悊CollectedImages涓殑鍥惧儚锛氶亶鍘嗘秷璐瑰垪琛ㄧ涓�涓厓绱犵洿鍒颁负绌�
- ProcessCollectedImages();
- //// 寮傛瑙﹀彂浜嬩欢锛岄伩鍏嶉樆濉濻DK鍥炶皟绾跨▼
- //Task.Factory.StartNew(() =>
+ // 5. 鍏ラ槦
+ queue.Enqueue(bmp);
+ AsyncLogHelper.Info($"LBCamera[{SN}]: 鍥惧儚鍏ラ槦锛屽綋鍓嶉槦鍒楋細{queue.Count}");
+
+ // 6. 鍚姩闃熷垪锛堝崟渚嬶紝閬垮厤澶氱嚎绋嬮噸澶嶏級
+ StartConsumeQueue();
+ //Task.Factory.StartNew(() =>
//{
- // try
+ // CallBackImg = (Bitmap)bitmap.Clone();
+ // if (CallBackImg == null)
// {
- // ImageGrabbed?.Invoke(this, new LBCameraEventArgs(SN, bmp, true));
- // CallBackImg = (Bitmap)bmp.Clone();
- // if (CallBackImg == null)
- // {
- // return;
- // }
- // if (GetTriggerMode(out TriggerMode mode, out TriggerSource source))
- // {
- // if (mode == TriggerMode.On && source != TriggerSource.Software)
- // TriggerRunMessageReceived?.Invoke(SN, source.ToString()); // 瑙﹀彂杩愯浜嬩欢
- // }
- // bmp.Dispose();
+ // return;
// }
- // catch (Exception ex)
+ // if (GetTriggerMode(out TriggerMode mode, out TriggerSource source))
// {
- // AsyncLogHelper.Error($"LBCamera: Event Invoke error - {ex.Message}");
- // bmp.Dispose(); // 寮傚父鏃堕噴鏀捐祫婧�
+ // if (mode == TriggerMode.On && source != TriggerSource.Software)
+ // TriggerRunMessageReceived?.Invoke(SN, source.ToString()); // 瑙﹀彂杩愯浜嬩欢
// }
+ // bitmap.Dispose();
//});
}
catch (Exception ex)
{
- AsyncLogHelper.Error($"LBCamera: CreateBitmap error - {ex.Message}");
+ AsyncLogHelper.Error($"LBCamera[{SN}]: 鍒涘缓鍥惧儚澶辫触 - {ex.Message}", ex);
+ }
+ finally
+ {
+ // 寮哄埗璧勬簮閲婃斁锛岀粷瀵规潨缁濇硠婕�
+ if (bmpData != null)
+ {
+ try { bmp?.UnlockBits(bmpData); } catch { }
+ }
+ // 娉ㄦ剰锛歜mp 宸插叆闃燂紝涓嶈兘鍦ㄨ繖閲岄噴鏀撅紝鐢辫皟鐢ㄨ�呴噴鏀�
}
}
+
+ /// <summary>
+ /// 鍚姩闃熷垪锛堜繚璇佸崟绾跨▼锛�
+ /// </summary>
+ private void StartConsumeQueue()
+ {
+ // 浣跨敤杞婚噺绾у垽鏂紝閬垮厤閲嶅鍚姩娑堣垂浠诲姟
+ if (CollectedImages.TryGetValue(SN, out var queue) && !queue.IsEmpty)
+ {
+ Task.Factory.StartNew(ProcessImageQueue, TaskCreationOptions.LongRunning);
+ }
+ }
+
/// <summary>
/// 澶勭悊CollectedImages涓殑缂撳瓨鍥惧儚
/// 鏍稿績閫昏緫锛氶亶鍘嗗彇绗竴涓浘鍍� -> 璧嬪�肩粰CallBackImg -> 瑙﹀彂浜嬩欢 -> 閲婃斁骞剁Щ闄�
/// </summary>
- private void ProcessCollectedImages()
+ private void ProcessImageQueue()
{
- Task.Factory.StartNew(() =>
+ try
{
- // 鍔犻攣淇濊瘉绾跨▼瀹夊叏锛岄槻姝㈠绾跨▼鍚屾椂鎿嶄綔鍒楄〃
- lock (_collectedImagesLock)
+ if (!CollectedImages.TryGetValue(SN, out var queue) || queue.IsEmpty)
+ return;
+
+ // 鐭攣锛氫粎鍑洪槦锛屼笉闃诲鐢熶骇
+ while (queue.TryDequeue(out Bitmap bitmap))
{
- // 鏍￠獙褰撳墠鐩告満鐨勫浘鍍忓垪琛ㄦ槸鍚﹀瓨鍦ㄤ笖鏈夋暟鎹�
- if (!CollectedImages.ContainsKey(SN) || CollectedImages[SN].Count == 0)
- {
- AsyncLogHelper.Info(SN + "褰撳墠鏃犵紦瀛樺浘鍍忥紝璺宠繃澶勭悊");
- return;
- }
- // 寰幆澶勭悊锛氱洿鍒板垪琛ㄤ负绌�
- while (CollectedImages[SN].Count > 0)
+ using (bitmap) // 鑷姩閲婃斁锛歶sing 鏄渶瀹夊叏鐨勬柟寮�
{
try
{
- // 1 鍙栧垪琛ㄧ涓�涓储寮曠殑鍥惧儚璧嬪�肩粰CallBackImg
- Bitmap firstBitmap = CollectedImages[SN][0];
- ImageGrabbed?.Invoke(this, new LBCameraEventArgs(SN, firstBitmap, true));
- CallBackImg = (Bitmap)firstBitmap.Clone(); // 鍏嬮殕閬垮厤鍘熷璞¤閲婃斁鍚庡紩鐢ㄥけ鏁�
+ // 鍏抽敭锛氫簨浠朵紶閫掑厠闅嗗璞★紝缁濆瀹夊叏锛屼笉浼犻�掑師璧勬簮
+ using (Bitmap clone = (Bitmap)bitmap.Clone())
+ {
+ // 瑙﹀彂鍥惧儚浜嬩欢
+ ImageGrabbed?.Invoke(this, new LBCameraEventArgs(SN, clone, true));
+ }
- // 2 鑾峰彇瑙﹀彂妯″紡骞跺垽鏂槸鍚﹁Е鍙戣繍琛屼簨浠�
+ // 瑙﹀彂妯″紡鍒ゆ柇
if (GetTriggerMode(out TriggerMode mode, out TriggerSource source))
{
- // 纭Е鍙戞ā寮忎笅瑙﹀彂杩愯浜嬩欢
if (mode == TriggerMode.On && source != TriggerSource.Software)
{
- AsyncLogHelper.Info(SN + $"瑙﹀彂纭Е鍙戜簨浠讹紝瑙﹀彂婧愶細{source}");
TriggerRunMessageReceived?.Invoke(SN, source.ToString());
+ AsyncLogHelper.Info($"LBCamera[{SN}]: 纭Е鍙戜簨浠� - {source}");
}
}
- else
- {
- AsyncLogHelper.Warn(SN + "鑾峰彇瑙﹀彂妯″紡澶辫触锛岃烦杩囦簨浠惰Е鍙�");
- }
-
- // 3 閲婃斁绗竴涓浘鍍忚祫婧愬苟浠庡垪琛ㄧЩ闄�
- // 鍏堥噴鏀綛itmap鍐呭瓨锛屽啀绉婚櫎鍒楄〃鍏冪礌
- firstBitmap.Dispose();
- CollectedImages[SN].RemoveAt(0);
- AsyncLogHelper.Info(SN + $"宸叉秷璐圭紦瀛樺浘鍍忥紝鍓╀綑缂撳瓨鏁伴噺锛歿CollectedImages[SN].Count}");
}
catch (Exception ex)
{
- AsyncLogHelper.Error(SN + $"澶勭悊缂撳瓨鍥惧儚寮傚父锛歿ex.Message}", ex);
- // 鍗曚釜鍥惧儚澶勭悊澶辫触鏃讹紝绉婚櫎璇ュ浘鍍忛伩鍏嶉樆濉炲悗缁鐞�
- if (CollectedImages[SN].Count > 0)
- {
- try
- {
- CollectedImages[SN][0]?.Dispose(); // 灏濊瘯閲婃斁
- CollectedImages[SN].RemoveAt(0);
- }
- catch (Exception innerEx)
- {
- AsyncLogHelper.Error(SN + $"娓呯悊寮傚父鍥惧儚澶辫触锛歿innerEx.Message}", innerEx);
- }
- }
- // 鍗曚釜鍥惧儚澶勭悊澶辫触涓嶇粓姝㈠惊鐜紝缁х画澶勭悊涓嬩竴涓�
- // 4. 鎵�鏈夊浘鍍忓鐞嗗畬鎴愬悗锛屾竻绌篊allBackImg
- if (CallBackImg != null)
- {
- CallBackImg.Dispose();
- CallBackImg = null;
- }
- continue;
- }
- // 4. 鎵�鏈夊浘鍍忓鐞嗗畬鎴愬悗锛屾竻绌篊allBackImg
- if (CallBackImg != null)
- {
- CallBackImg.Dispose();
- CallBackImg = null;
+ AsyncLogHelper.Error($"LBCamera[{SN}]: 澶勭悊鍗曞抚鍥惧儚寮傚父 - {ex.Message}", ex);
+ continue; // 鍗曞抚寮傚父锛岀户缁鐞嗕笅涓�甯�
}
}
}
- });
+ }
+ catch (Exception ex)
+ {
+ AsyncLogHelper.Error($"LBCamera[{SN}]: 娑堣垂闃熷垪寮傚父 - {ex.Message}", ex);
+ }
}
--
Gitblit v1.9.3