From bcebdcfdc1a41422bf1b6a35c5bfacfb22e5b420 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 17 七月 2019 17:11:26 +0800
Subject: [PATCH] 加入人脸追踪[C

---
 main.go |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/main.go b/main.go
index 43b93b7..c536279 100644
--- a/main.go
+++ b/main.go
@@ -105,7 +105,10 @@
 	if err != nil {
 		panic("瑙f瀽msg鏃跺嚭鐜伴敊璇�")
 	}
+	// 鍏堣繘琛屼竴涓嬭拷韪�
+	ruleserver.IsSame(&m)
 	args.CameraId = m.Cid
+	args.TaskId = m.Tasklab.Taskid
 	// 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
 	bdata, err := util.UnCompress(m.Data)
 	if err != nil {
@@ -139,10 +142,10 @@
 					logger.Info("瑙f瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
 					continue
 				}
-				//logger.Info("--------------鐪嬬湅yolo涓湁鍑犱釜鐩爣锛�",len(yoloParam.Infos))
+				logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細",len(yoloParam.Infos))
 				for _, info := range yoloParam.Infos {
 					if info.Typ == 0 {
-						logger.Debug("-------------yolo鐨勫潗鏍囨湁鍑犱釜",info.RcObj)
+						//logger.Debug("-------------yolo鐨勫潗鏍囨湁鍑犱釜",info.RcObj)
 						photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
 						arg.Photo = append(arg.Photo, photoMap)
 					}
@@ -176,9 +179,9 @@
 					logger.Info("瑙f瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
 					continue
 				}
-				logger.Info("--------------鐪嬬湅浜鸿劯妫�娴嬩腑鏈夊嚑涓洰鏍囷細",len(faceParam.Faces))
+				logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細",len(faceParam.Faces))
 				for _, info := range faceParam.Faces {
-					logger.Info("_______________________________________________绗竴娆$湅鐩镐技鍊硷細",info.Pos.FAngle.Confidence*100)
+					//logger.Info("_______________________________________________绗竴娆$湅鐩镐技鍊硷細",info.Pos.FAngle.Confidence*100)
 					photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.FAngle.Confidence*100), IsYolo:false,ThftRes:*(info.Result),Feature:info.Feats}
 					arg.Photo = append(arg.Photo, photoMap)
 				}

--
Gitblit v1.8.0