From 0f84e961cb5a86c8527ac5918548891ba38c1cff Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期一, 29 七月 2019 10:52:39 +0800 Subject: [PATCH] --- --- ruleserver/personTrack.go | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go index c642a44..ba12678 100644 --- a/ruleserver/personTrack.go +++ b/ruleserver/personTrack.go @@ -16,7 +16,7 @@ Id uint64 Score float32 } - +var num int = 5 // 妫�鏌ユ槸鍚﹀墠鍚庝袱娆$殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛� 鏀逛负鐩存帴妫�鏌ユ暟閲忔槸鍚︿竴鑷� func IsSame(msg *protomsg.SdkMessage) { logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid) @@ -25,21 +25,28 @@ if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴� logger.Info("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata)) if len(sdkinfo.Sdkdata) > 1 { + num = 5 FaceIsInPond(msg.Cid, sdkinfo) } else { - if TrackPond[msg.Cid] != nil { - logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid]) - TrackPond[msg.Cid].Faces = nil + if num > 0 { // 杩炵画num娆℃病鏈夋暟鎹墠绠楁槸娌℃湁鏁版嵁锛屼笉鐒跺彧绠椾綔涓㈠抚 + logger.Info("鎴戣涓轰綘鍙槸涓㈠抚浜�") + num-- } else { - TrackPond[msg.Cid] = &PersonTrack{Faces: nil} - logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid]) + if TrackPond[msg.Cid] != nil { + logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid]) + TrackPond[msg.Cid].Faces = nil + } else { + TrackPond[msg.Cid] = &PersonTrack{Faces: nil} + logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid]) + } + logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁浜鸿劯锛岃閲嶇疆涓虹┖") + continue } - logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁浜鸿劯锛岃閲嶇疆涓虹┖") - continue } } if sdkinfo.Sdktype == "Yolo" { if len(sdkinfo.Sdkdata) > 1 { + num = 5 yoloParam := protomsg.ParamYoloObj{} err := proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam) if err != nil { @@ -74,13 +81,18 @@ } } } else { - if TrackPond[msg.Cid] != nil { - TrackPond[msg.Cid].Yolo = 0 + if num > 0 { + logger.Info("鎴戣涓轰綘鍙槸涓㈠抚浜�") + num-- } else { - TrackPond[msg.Cid] = &PersonTrack{Yolo: 0} + if TrackPond[msg.Cid] != nil { + TrackPond[msg.Cid].Yolo = 0 + } else { + TrackPond[msg.Cid] = &PersonTrack{Yolo: 0} + } + logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁yolo锛岃閲嶇疆涓�0") + continue } - logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁yolo锛岃閲嶇疆涓�0") - continue } } } -- Gitblit v1.8.0