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

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

diff --git a/main.go b/main.go
index 7c5c143..bce026b 100644
--- a/main.go
+++ b/main.go
@@ -10,7 +10,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt"
 	"github.com/robfig/cron/v3"
-	"gocv.io/x/gocv"
 	"log"
 	"runtime"
 	"strconv"
@@ -71,12 +70,13 @@ func init() {
 	if err != nil {
 		panic("failed to read config file:" + err.Error())
 	}
+	service.DeviceFrameCount = make(map[int]int)
 	for _, device := range proto.Config.DeviceInfo {
 		//service.DeviceRWMap[device.ID] = sync.RWMutex{}
 		//service.DeviceCurrentFrameMap[device.ID] = gocv.NewMat()
 		//service.DeviceIsGettingFrame[device.ID] = false
 		service.DeviceRWMap.Store(device.ID, &sync.RWMutex{})
-		service.DeviceCurrentFrameMap.Store(device.ID, gocv.NewMat())
+		//service.DeviceCurrentFrameMap.Store(device.ID, gocv.NewMat())
 		service.DeviceFrameCount[device.ID] = 0
 		service.DeviceIsGettingFrame.Store(device.ID, false)
 	}
@@ -99,7 +99,7 @@ func ReadConfigAndSetSystem() {
 		if !ok {
 			//说明没有这个设备，需初始化添加
 			service.DeviceRWMap.Store(device.ID, &sync.RWMutex{})
-			service.DeviceCurrentFrameMap.Store(device.ID, gocv.NewMat())
+			//service.DeviceCurrentFrameMap.Store(device.ID, gocv.NewMat())
 			service.DeviceFrameCount[device.ID] = 0
 			service.DeviceIsGettingFrame.Store(device.ID, false)
 		}
diff --git a/service/tool.go b/service/tool.go
index c3922e2..7230485 100644
--- a/service/tool.go
+++ b/service/tool.go
@@ -15,7 +15,8 @@ import (
 )
 
 var DeviceRWMap = &sync.Map{}
-var DeviceCurrentFrameMap = &sync.Map{}
+
+// var DeviceCurrentFrameMap = &sync.Map{}
 var DeviceFrameCount map[int]int
 var DeviceIsGettingFrame = &sync.Map{}
 var Device1CurrentFrame gocv.Mat