From abea9bd374c3cc7f34b8df51cd5b3521d7478da4 Mon Sep 17 00:00:00 2001
From: lijun <lijun@xiaoduotech.com>
Date: Sat, 18 Jan 2025 20:04:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=88=86=E7=A6=BB=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91=E6=B5=81?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handler/tool.go | 6 +++---
 main.go         | 2 ++
 service/tool.go | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/handler/tool.go b/handler/tool.go
index 683436b..db2bb54 100644
--- a/handler/tool.go
+++ b/handler/tool.go
@@ -143,11 +143,11 @@ func GetRealTimeImage(c *gin.Context) {
 		return
 	}
 	//查看设备是否在获取
-	is_get, ok := service.DeviceIsGettingFrame.Load(device.ID)
-	if !ok || is_get == false {
+	isGet, ok := service.DeviceIsGettingFrame.Load(device.ID)
+	if !ok || isGet == false {
 		//直接返回
 		c.JSON(http.StatusOK, gin.H{"code": 4, "message": "device not getting frame or not exist"})
-		log.Printf("device:%d not found", device.ID)
+		log.Printf("device:%d not found,isGet:%v , ok = %v", device.ID, isGet, ok)
 		return
 	}
 	ws, err := upgrader.Upgrade(c.Writer, c.Request, nil)
diff --git a/main.go b/main.go
index 4feaf7b..e64fd53 100644
--- a/main.go
+++ b/main.go
@@ -110,6 +110,8 @@ func ReadConfigAndSetSystem() {
 				service.Device1CurrentFrame = gocv.NewMat()
 			case 50:
 				service.Device50CurrentFrame = gocv.NewMat()
+			case 73:
+				service.Device73CurrentFrame = gocv.NewMat()
 			}
 			go service.GetVideoStream(device.ID)
 			log.Printf("device:%d has started!\n", device.ID)
diff --git a/service/tool.go b/service/tool.go
index 9e5cb6b..af1e305 100644
--- a/service/tool.go
+++ b/service/tool.go
@@ -161,7 +161,9 @@ func GetDeviceCurrentFrameV3(deviceId int) (gocv.Mat, int) {
 		Device50CurrentFrame.CopyTo(&frame)
 		//查看帧状态
 		//log.Printf("frame:%v,Device50CurrentFrame:%v\n", frame.Empty(), Device50CurrentFrame.Empty())
-
+	case 73:
+		frame = gocv.NewMatWithSize(Device73CurrentFrame.Rows(), Device73CurrentFrame.Cols(), Device73CurrentFrame.Type())
+		Device73CurrentFrame.CopyTo(&frame)
 	}
 
 	frameCount, ok := DeviceFrameCount[deviceId]