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 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)