From b871bc358a94e255e38e122dc86f16fb48361232 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 28 六月 2019 11:09:46 +0800
Subject: [PATCH] test

---
 service/FaceSdkService.go |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 9cd7b96..fcfb269 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -21,7 +21,7 @@
 	Url_Service_PUSH = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Push_Ext
 	Url_Service_PULL = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Pull_Ext
 )
-var imgPushChan chan protomsg.Recvmsg
+var imgPushChan chan []byte
 var client_push deliver.Deliver
 var client_pull deliver.Deliver
 
@@ -29,6 +29,7 @@
 	InitService()
 
 	i := readImgFile()
+
 	fmt.Printf("width:%d,height:%d,data.length:%d,timestamp:%s,id:%d\n",i.Width,i.Height,len(i.Data),i.Timestamp,i.Id)
 	if b, err := proto.Marshal(&i);err !=nil{
 		fmt.Println("protoImage marshal err")
@@ -45,11 +46,7 @@
 		}
 		bc = bc[:n]
 		for {
-			PushImgMsg(protomsg.Recvmsg{
-				Id:uuid.NewV4().String(),
-				Addr:"",
-				Picdata:bc,
-			})
+			PushImgMsg(bc)
 			fmt.Println("pushed img")
 			time.Sleep(5*time.Second)
 		}
@@ -85,11 +82,12 @@
 		Data: data,
 		Id: timeUnix,
 	}
+	i.Cid = uuid.NewV4().String()//鏁版嵁鍞竴id
 	fmt.Println("gocv read img completed")
 	return i
 }
 
-func PushImgMsg(is protomsg.Recvmsg){
+func PushImgMsg(is []byte){
 	imgPushChan <- is
 }
 
@@ -98,7 +96,7 @@
 
 func InitService(){
 	fmt.Println("service init!")
-	imgPushChan = make(chan protomsg.Recvmsg)
+	imgPushChan = make(chan []byte)
 	resultMap = make(map[string]protomsg.SdkMessage,0)
 	client_push = deliver.NewClient(deliver.PushPull, Url_Service_PUSH)
 	client_pull = deliver.NewClient(deliver.PushPull, Url_Service_PULL)
@@ -114,10 +112,9 @@
 func thSend(){
 	for {
 		select {
-		case is := <- imgPushChan:
+		case d := <- imgPushChan:
 			fmt.Println("imgPushChan in")
-			b, _ := proto.Marshal(&is)
-			err := client_push.Send(b)
+			err := client_push.Send(d)
 			if err !=nil {
 				fmt.Println("img Send err:",err)
 			}
@@ -154,11 +151,9 @@
 									fmt.Println("FacePos:",face.Pos)
 									fmt.Println("ThftResult:",face.Result)
 								}
-
 							}
 						}
 						if swt.Sdktype == "FaceExtract"{
-
 							fmt.Println("sdkData.len:",len(swt.Sdkdata))
 							var pff protomsg.ParamFaceFeature
 							if err := proto.Unmarshal(swt.Sdkdata, &pff);err !=nil{

--
Gitblit v1.8.0