From a965a9dd7d9b87d4a0a0de13f0d06a17f6b4dc2e Mon Sep 17 00:00:00 2001
From: lijun <lijun@xiaoduotech.com>
Date: Sat, 18 Jan 2025 15:38:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98,=E6=B7=B1=E6=8B=B7=E8=B4=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 go.mod          | 1 +
 go.sum          | 4 ++--
 service/tool.go | 8 ++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index 348bac6..d2fcb4e 100644
--- a/go.mod
+++ b/go.mod
@@ -11,6 +11,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/robfig/cron/v3 v3.0.1
+	github.com/ulule/deepcopier v0.0.0-20200430083143-45decc6639b6
 	gocv.io/x/gocv v0.39.0
 	gorm.io/driver/mysql v1.5.7
 	gorm.io/driver/postgres v1.5.11
diff --git a/go.sum b/go.sum
index e7f958c..f6e7f34 100644
--- a/go.sum
+++ b/go.sum
@@ -106,10 +106,10 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/ulule/deepcopier v0.0.0-20200430083143-45decc6639b6 h1:TtyC78WMafNW8QFfv3TeP3yWNDG+uxNkk9vOrnDu6JA=
+github.com/ulule/deepcopier v0.0.0-20200430083143-45decc6639b6/go.mod h1:h8272+G2omSmi30fBXiZDMkmHuOgonplfKIKjQWzlfs=
 gocv.io/x/gocv v0.39.0 h1:vWHupDE22LebZW6id2mVeT767j1YS8WqGt+ZiV7XJXE=
 gocv.io/x/gocv v0.39.0/go.mod h1:zYdWMj29WAEznM3Y8NsU3A0TRq/wR/cy75jeUypThqU=
-gocv.io/x/gocv v0.40.0 h1:kGBu/UVj+dO6A9dhQmGOnCICSL7ke7b5YtX3R3azdXI=
-gocv.io/x/gocv v0.40.0/go.mod h1:zYdWMj29WAEznM3Y8NsU3A0TRq/wR/cy75jeUypThqU=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
 golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
diff --git a/service/tool.go b/service/tool.go
index 6431fe6..d05113e 100644
--- a/service/tool.go
+++ b/service/tool.go
@@ -5,6 +5,7 @@ import (
 	"VideoStream/proto"
 	"VideoStream/worker"
 	"fmt"
+	"github.com/ulule/deepcopier"
 	"gocv.io/x/gocv"
 	"image"
 	"image/color"
@@ -69,13 +70,16 @@ func SetDeviceCurrentFrameV2(frame *gocv.Mat, device_id int) error {
 		//if err != nil {
 		//	log.Printf("设备:%d, 错误: 无法关闭帧\n", device_id)
 		//}
-		Device1CurrentFrame = *frame
+
+		deepcopier.Copy(frame).To(&Device1CurrentFrame)
+		//Device1CurrentFrame = *frame
 	case 50:
 		//err := Device50CurrentFrame.Close()
 		//if err != nil {
 		//	log.Printf("设备:%d, 错误: 无法关闭帧\n", device_id)
 		//}
-		Device50CurrentFrame = *frame
+		//Device50CurrentFrame = *frame
+		deepcopier.Copy(frame).To(&Device50CurrentFrame)
 	}
 	frame_count, ok := DeviceFrameCount.Load(device_id)
 	if !ok {