From 6e8ebf781ac457b7ec77f7e4c9ade4c3d36002bc Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 18:42:05 +0800
Subject: [PATCH] merge master
---
ruleserver/personTrack.go | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 74bcf8c..7ddfee7 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -2,8 +2,8 @@
import (
"basic.com/pubsub/protomsg.git"
- "ruleprocess/logger"
"github.com/golang/protobuf/proto"
+ "basic.com/valib/logger.git"
"ruleprocess/structure"
"sync"
)
@@ -97,7 +97,6 @@
logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
}
- logger.Debug("---------------------------------浜轰綋杩借釜缁撴潫--------------------------------------")
return false
}
} else {
@@ -114,6 +113,7 @@
logger.Debug("---------------------------------浜轰綋杩借釜缁撴潫--------------------------------------")
return false
}
+
func TrackOrNot(label map[string]interface{}) bool {
if label["yolo"] != nil && len(label["yolo"].([]structure.Result)) > 0 {
for _, res := range label["yolo"].([]structure.Result) {
@@ -145,7 +145,6 @@
for _, face := range faceParam.Faces {
facesTemp = append(facesTemp, *face) // 鍏堟妸鏁版嵁杞瓨涓�浠斤紝涓嶇劧涓�浼氬効鏁版嵁鍒犲噺涔嬪悗鎵句笉鍒板師濮嬫暟鎹紝涓嶈兘璁╃紦瀛樻暟鎹洿鏂颁簡
}
-
for i := 0; i < len(faceParam.Faces); {
faceFlag := false
for _, val := range TrackPond[cameraId].Faces {
@@ -171,7 +170,6 @@
}
}
logger.Info("鍙嶅簭鍒楀寲閲嶆柊瑁呴厤涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
-
logger.Info("涓存椂瀛樺偍鐨勬柊鏉ユ暟鎹細")
for _, temp := range facesTemp {
logger.Info("涓存椂瀛樺偍鐨勬柊鏉ョ殑鐨刦ace鏁版嵁锛�", temp.Pos.FaceID, temp.Pos.FAngle.Confidence)
--
Gitblit v1.8.0