From c34e0ee19273abe473d87068e4f791ab5d6cd133 Mon Sep 17 00:00:00 2001
From: lhiven <236881222@qq.com>
Date: Sat, 11 Nov 2023 09:06:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E6=9C=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.Camera/HikCamera.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Rs.Camera/HikCamera.cs b/Rs.Camera/HikCamera.cs
index d7349ca..0e9211c 100644
--- a/Rs.Camera/HikCamera.cs
+++ b/Rs.Camera/HikCamera.cs
@@ -77,6 +77,16 @@ namespace Rs.Camera
         private void ImageCallBack(IntPtr pData, ref MyCamera.MV_FRAME_OUT_INFO_EX pFrameInfo, IntPtr pUser)
         {
             int nIndex = (int)pUser;
+            string cameraname = string.Empty;
+            foreach(KeyValuePair<string,int> kv in cameraIDs) 
+            { 
+                if(kv.Value== nIndex)
+                {
+                    cameraname = kv.Key;
+                    break;
+                }
+            }
+            LogHelper.Debug($"{cameraname}有相机数据返回");
             HObject image = new HObject();
             //m_BufForDriver = Marshal.AllocHGlobal((Int32)pFrameInfo.nFrameLen);
             //CopyMemory(m_BufForDriver, pData, pFrameInfo.nFrameLen);
@@ -84,16 +94,16 @@ namespace Rs.Camera
             //HOperatorSet.RotateImage(image, out HObject rotateImage, 270, "constant");
             if (camTrigger!=null && camTrigger.ContainsKey(nIndex))
             {
-                if (camTrigger[(int)pUser] == ETriggerMode.Manual)
+                if (camTrigger[nIndex] == ETriggerMode.Manual)
                 {
                     //ImageProcess.AddManualTrigger(image);
-                    if (ManualGrabOkEvent != null)
+                    //if (ManualGrabOkEvent != null)
                     {
                         //ManualGrabOkEvent(nIndex, image);
                         ImageProcess.AddManualTrigger(image);
                     }
                 }
-                else if (camTrigger[(int)pUser] == ETriggerMode.Auto)
+                else if (camTrigger[nIndex] == ETriggerMode.Auto)
                 {
                     ImageProcess.AddAutoTrigger(image);
                     //if (AutoGrabOkEvent != null)