From be4a50e68b8fd45472008b1df1c0e9b526a068df Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 27 七月 2019 12:42:14 +0800
Subject: [PATCH] 三合一
---
ruleserver/personTrack.go | 61 ++++++++++++++++--------------
1 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index ab4d4ce..77a1dc7 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -9,10 +9,8 @@
var TrackPond = make(map[string]*PersonTrack)
type PersonTrack struct {
- Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
- FaceN int // 娣诲姞瀹归敊锛屽垵濮嬪�间负5锛岃繛缁�5娆′笉瀵规墠绠椾笉瀵�
- Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
- YoloN int // 娣诲姞瀹归敊锛屽垵濮嬪�间负5锛岃繛缁�5娆′笉瀵规墠绠椾笉瀵�
+ Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
+ Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
}
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛� 鏀逛负鐩存帴妫�鏌ユ暟閲忔槸鍚︿竴鑷�
@@ -28,7 +26,11 @@
logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
+ if TrackPond[msg.Cid] != nil {
+ logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces), "鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細", TrackPond[msg.Cid].Face)
+ } else {
+ logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces), "杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
+ }
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)
@@ -38,25 +40,20 @@
logger.Info("===================杩借釜涓�斾汉鑴哥殑涓暟", len(faceParam.Faces))
} else {
if TrackPond[msg.Cid] != nil {
- if TrackPond[msg.Cid].FaceN > 0 {
- TrackPond[msg.Cid].FaceN--
- }
- if TrackPond[msg.Cid].FaceN == 0 { //姝ゆ椂杩炵画浜旀涓嶅
- TrackPond[msg.Cid].Face = len(faceParam.Faces)
- TrackPond[msg.Cid].FaceN = 5
- }
+ logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑浜鸿劯涓暟锛�", len(faceParam.Faces))
+ TrackPond[msg.Cid].Face = len(faceParam.Faces)
} else {
- TrackPond[msg.Cid] = &PersonTrack{Face: len(faceParam.Faces),FaceN:5}
+ logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑浜鸿劯涓暟锛�", 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鐨勪汉鑴告暟缁勪腑鍒犻櫎杩欎釜鍏冪礌锛屼笉蹇呬紶鍒颁笅涓�涓幆鑺�
- // faceParam.Faces = append(faceParam.Faces[:i], faceParam.Faces[i+1:]...)
- // } else {
- // i++
- // }
- //}
} else {
+ if TrackPond[msg.Cid] != nil {
+ TrackPond[msg.Cid].Face = 0
+ } else {
+ TrackPond[msg.Cid] = &PersonTrack{Face: 0}
+ }
+ logger.Info("鎽勫儚鏈�:"+msg.Cid+"-娌℃湁浜鸿劯锛岃閲嶇疆涓�0")
continue
}
}
@@ -74,28 +71,34 @@
yoloNum++
}
}
- logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum)
+ if TrackPond[msg.Cid] != nil {
+ logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細", TrackPond[msg.Cid].Yolo)
+ } else {
+ 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)
}
+ logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
} else {
if TrackPond[msg.Cid] != nil {
+ logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
TrackPond[msg.Cid].Yolo = yoloNum
- if TrackPond[msg.Cid].YoloN > 0 {
- TrackPond[msg.Cid].YoloN--
- }
- if TrackPond[msg.Cid].YoloN == 0 { //姝ゆ椂杩炵画浜旀涓嶅
- TrackPond[msg.Cid].Yolo = yoloNum
- TrackPond[msg.Cid].YoloN = 5
- }
} else {
- TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum,YoloN:5}
+ logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
+ TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
}
}
} else {
+ if TrackPond[msg.Cid] != nil {
+ TrackPond[msg.Cid].Yolo = 0
+ } else {
+ TrackPond[msg.Cid] = &PersonTrack{Yolo: 0}
+ }
+ logger.Info("鎽勫儚鏈�:"+msg.Cid+"-娌℃湁yolo锛岃閲嶇疆涓�0")
continue
}
}
--
Gitblit v1.8.0