From e383e503030119c870eb0bb5efe0a865124b9bcf Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 22 七月 2019 15:48:22 +0800
Subject: [PATCH] ---
---
ruleserver/personTrack.go | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index c2381d1..45ab0f0 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -6,11 +6,8 @@
"ruleprocess/logger"
)
-var TrackPond map[string]*PersonTrack
+var TrackPond = make(map[string]*PersonTrack)
-func init (){
- TrackPond = make(map[string]*PersonTrack)
-}
type PersonTrack struct {
Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
@@ -22,7 +19,8 @@
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛�
func IsSame(msg *protomsg.SdkMessage) {
- logger.Debug("++++++++++++++++++++++++++++杩借釜寮�濮�++++++++++++++++++++++++")
+ logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細",msg.Cid)
+ logger.Debug("---------------------缂撳瓨姹�--------------------------锛�",TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
if len(sdkinfo.Sdkdata) > 1 {
@@ -33,10 +31,15 @@
continue
}
logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細",len(faceParam.Faces))
- if faceParam.Faces != nil && len(faceParam.Faces) == TrackPond[msg.Cid].Yolo { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
+ if faceParam.Faces != nil && TrackPond[msg.Cid] != nil && len(faceParam.Faces) == TrackPond[msg.Cid].Face { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
faceParam.Faces = (faceParam.Faces)[0:0]
+ sdkinfo.Sdkdata,err = proto.Marshal(&faceParam)
+ if err != nil {
+ logger.Error("浜鸿劯搴忓垪鍖栭敊璇�",err)
+ }
+ logger.Info("===================杩借釜涓�斾汉鑴哥殑涓暟",len(faceParam.Faces))
} else {
- TrackPond[msg.Cid].Face = len(faceParam.Faces)
+ TrackPond[msg.Cid] = &PersonTrack{Face:len(faceParam.Faces)}
}
//for i := 0; i < len(faceParam.Faces); {
// if flag := IsInPond(msg.Cid,faceParam.Faces[i]);flag { // 宸茬粡瀛樺湪锛屼粠msg鐨勪汉鑴告暟缁勪腑鍒犻櫎杩欎釜鍏冪礌锛屼笉蹇呬紶鍒颁笅涓�涓幆鑺�
@@ -57,12 +60,21 @@
logger.Info("瑙ｆ瀽yolo鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Error("========鏄綘鎶ョ殑閿欏惂",TrackPond[msg.Cid].Yolo)
- logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細",len(yoloParam.Infos))
- if yoloParam.Infos != nil && len(yoloParam.Infos) == TrackPond[msg.Cid].Yolo { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
+ var yoloNum int = 0
+ for i := 0;i < len(yoloParam.Infos); i++ {
+ if yoloParam.Infos[i].Typ == 0 {
+ yoloNum++
+ }
+ }
+ logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細",yoloNum)
+ if yoloParam.Infos != nil && TrackPond[msg.Cid] != nil && yoloNum == TrackPond[msg.Cid].Yolo { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
yoloParam.Infos = (yoloParam.Infos)[0:0]
+ sdkinfo.Sdkdata,err = proto.Marshal(&yoloParam)
+ if err != nil {
+ logger.Error("yolo搴忓垪鍖栭敊璇�",err)
+ }
} else {
- TrackPond[msg.Cid].Yolo = len(yoloParam.Infos)
+ TrackPond[msg.Cid] = &PersonTrack{Yolo:yoloNum}
}
} else {
continue
--
Gitblit v1.8.0