From a12a055e530405487dfd50970184b3dc546c0159 Mon Sep 17 00:00:00 2001
From: lijun <lijun@xiaoduotech.com>
Date: Sat, 18 Jan 2025 19:47:36 +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

---
 service/tool.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/service/tool.go b/service/tool.go
index 8da0661..5902592 100644
--- a/service/tool.go
+++ b/service/tool.go
@@ -23,17 +23,17 @@ var Device1CurrentFrame gocv.Mat
 var Device50CurrentFrame gocv.Mat
 var Device73CurrentFrame gocv.Mat
 
-func SetDeviceCurrentFrame(frame *gocv.Mat, device_id int) error {
+func SetDeviceCurrentFrame(frame *gocv.Mat, deviceId int) error {
 	//获取读写锁
-	mutex_, ok := DeviceRWMap.Load(device_id)
+	mutex_, ok := DeviceRWMap.Load(deviceId)
 	if !ok {
-		return fmt.Errorf("设备:%s 读写锁不存在", device_id)
+		return fmt.Errorf("设备:%s 读写锁不存在", deviceId)
 	}
 	mutex := mutex_.(*sync.RWMutex)
 	mutex.Lock()
 	defer mutex.Unlock()
 	//设置当前帧
-	switch device_id {
+	switch deviceId {
 	case 1:
 		if Device1CurrentFrame.Empty() {
 			Device1CurrentFrame = gocv.NewMatWithSize((*frame).Rows(), (*frame).Cols(), (*frame).Type())
@@ -51,12 +51,12 @@ func SetDeviceCurrentFrame(frame *gocv.Mat, device_id int) error {
 		(*frame).CopyTo(&Device73CurrentFrame)
 	}
 
-	frameCount, ok := DeviceFrameCount[device_id]
+	frameCount, ok := DeviceFrameCount[deviceId]
 	if !ok {
-		return fmt.Errorf("设备:%s 当前帧计数不存在", device_id)
+		return fmt.Errorf("设备:%s 当前帧计数不存在", deviceId)
 	}
 	frameCount++
-	DeviceFrameCount[device_id] = frameCount
+	DeviceFrameCount[deviceId] = frameCount
 	return nil
 }