From e3b3b542a7d5f1b627805f9d5e56e66ea62568fc Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期六, 29 六月 2019 17:59:15 +0800
Subject: [PATCH] can use with web and camera
---
camera/camera.go | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/camera/camera.go b/camera/camera.go
index 750b1ae..d1cc7e0 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -39,8 +39,6 @@
// web绔垵濮嬪寲
CreateCamera("virtual-faceextract-sdk-pull_2" , "web")
-
-
// go AutoDelCamera(util.Cameraflag)
}
@@ -113,33 +111,42 @@
func Recv(socket SocketContext, remote string ) {
- var recvmsg protomsg.Recvmsg
+ var recvmessage []byte
+ var imagemsg protomsg.Image
+ var err error
for {
select {
case <-socket.Context.Done():
fmt.Println("listen recv quit")
return
default:
- if msg, err := socket.Sock.Recv(); err != nil {
+ if recvmessage, err = socket.Sock.Recv(); err != nil {
fmt.Println("err is: ", err)
continue
- } else {
- if err := proto.Unmarshal(msg,&recvmsg); err != nil {
- fmt.Println("recv msg is not protomsg.Recvmg")
- continue
- }
+ }
+
+ unmsg, err := util.UnCompress(recvmessage)
+ if err != nil {
+ fmt.Println(err)
+ continue
}
+
+ if err := proto.Unmarshal(unmsg,&imagemsg); err != nil {
+ fmt.Println("recv msg is not protomsgImage")
+ continue
+ }
+
fmt.Println("============== one msg input ==========")
switch remote {
case "camera":
- for _, taskid := range GetAlltask(recvmsg.Id) {
- // time.Sleep(5 * time.Second)
- fmt.Println("id: ", recvmsg.Id , " taskid: ", taskid)
- Taskdolist(recvmsg.Id, recvmsg.Addr, taskid, recvmsg.Picdata)
+ for _, taskid := range GetAlltask(imagemsg.Cid) {
+ // time.Sleep(5 * time.Second)
+ fmt.Println("id: ", imagemsg.Cid, " taskid: ", taskid)
+ Taskdolist(imagemsg.Cid, "", taskid, recvmessage)
}
case "web":
- fmt.Println("id: ", recvmsg.Id , " taskid: ", "92496BDF-2BFA-98F2-62E8-96DD9866ABD2")
- Taskdolist(recvmsg.Id, recvmsg.Addr, "92496BDF-2BFA-98F2-62E8-96DD9866ABD2", recvmsg.Picdata)
+ fmt.Println("id: ", imagemsg.Cid , " taskid: ", "92496BDF-2BFA-98F2-62E8-96DD9866ABD2")
+ Taskdolist(imagemsg.Cid,"", "92496BDF-2BFA-98F2-62E8-96DD9866ABD2", recvmessage)
}
}
}
--
Gitblit v1.8.0