From 596fe167e4bdba16b68ad9951bec0f2b077e0122 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 13 十二月 2019 11:47:30 +0800
Subject: [PATCH] ---
---
ruleserver/personTrack.go | 319 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 253 insertions(+), 66 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 4a6404a..6e8bb9a 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -3,60 +3,68 @@
import (
"basic.com/pubsub/protomsg.git"
"github.com/golang/protobuf/proto"
- "ruleprocess/logger"
+ "basic.com/valib/logger.git"
+ "ruleprocess/structure"
+ "sync"
)
var TrackPond = make(map[string]*PersonTrack)
+var lock = sync.RWMutex{}
type PersonTrack struct {
- Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
- Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
+ Faces []*Face // 浜鸿劯鐨勬暟缁�
+ Cars []*Car // 杞﹁締鐨勬暟缁�
+ Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
+}
+type Face struct {
+ Id uint64
+ Score float32
}
-// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛� 鏀逛负鐩存帴妫�鏌ユ暟閲忔槸鍚︿竴鑷�
-func IsSame(msg *protomsg.SdkMessage) {
- logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid)
- logger.Debug("---------------------缂撳瓨姹�--------------------------锛�", TrackPond)
+type Car struct {
+ Id string // 杞︾墝
+ Score float32
+}
+
+var num int = 25
+
+// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴革級
+func FaceIsSame(msg *protomsg.SdkMessage) {
+ //logger.Debug("+++++++++++++++++++++浜鸿劯杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
if len(sdkinfo.Sdkdata) > 1 {
- faceParam := protomsg.ParamFacePos{}
- err := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
- if err != nil {
- logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- 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)
- if err != nil {
- logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
- }
- logger.Info("===================杩借釜涓�斾汉鑴哥殑涓暟", len(faceParam.Faces))
+ num = 25
+ FaceIsInPond(msg.Cid, sdkinfo)
+ } else {
+ if num > 0 { // 杩炵画num娆℃病鏈夋暟鎹墠绠楁槸娌℃湁鏁版嵁锛屼笉鐒跺彧绠椾綔涓㈠抚
+ //logger.Info("鎴戣涓轰綘鍙槸涓㈠抚浜�,姝ゆ椂鐨刵um鍊间负锛�", num)
+ num--
} else {
if TrackPond[msg.Cid] != nil {
- logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑浜鸿劯涓暟锛�", len(faceParam.Faces))
- TrackPond[msg.Cid].Face = len(faceParam.Faces)
+ //logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid])
+ lock.Lock()
+ TrackPond[msg.Cid].Faces = nil
+ lock.Unlock()
} else {
- logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑浜鸿劯涓暟锛�", len(faceParam.Faces))
- TrackPond[msg.Cid] = &PersonTrack{Face: len(faceParam.Faces)}
+ lock.Lock()
+ TrackPond[msg.Cid] = &PersonTrack{Faces: nil}
+ lock.Unlock()
+ //logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
}
+ logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁浜鸿劯锛岃閲嶇疆涓虹┖")
+ continue
}
- } else {
- if TrackPond[msg.Cid] != nil {
- TrackPond[msg.Cid].Face = 0
- } else {
- TrackPond[msg.Cid] = &PersonTrack{Face: 0}
- }
- logger.Info("娌℃湁浜鸿劯锛岃閲嶇疆涓�0")
- continue
}
}
+ }
+ //logger.Debug("--------------------------------浜鸿劯杩借釜缁撴潫--------------------------------------")
+}
+
+// 杩借釜浜轰綋锛屾鏌ユ暟閲忔槸鍚︿竴鑷�
+func BodyIsSame(args *structure.SdkDatas,msg *protomsg.SdkMessage) bool{
+ //logger.Debug("+++++++++++++++++++++浜轰綋杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
+ for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "Yolo" {
if len(sdkinfo.Sdkdata) > 1 {
yoloParam := protomsg.ParamYoloObj{}
@@ -71,26 +79,30 @@
yoloNum++
}
}
- if TrackPond[msg.Cid] != nil {
- logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細", TrackPond[msg.Cid].Yolo)
- } else {
- 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鏁版嵁")
+ delete(args.RuleResult,"yolo")
+ //logger.Info("娓呴櫎yolo鏍囩锛�",args.RuleResult["yolo"])
+ //logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁锛屼汉浣撹拷韪粨鏉�")
+ return true
} else {
if TrackPond[msg.Cid] != nil {
- logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
+ //logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
TrackPond[msg.Cid].Yolo = yoloNum
} else {
- logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
+ //logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
}
+ return false
}
} else {
if TrackPond[msg.Cid] != nil {
@@ -98,36 +110,211 @@
} else {
TrackPond[msg.Cid] = &PersonTrack{Yolo: 0}
}
- logger.Info("娌℃湁yolo锛岃閲嶇疆涓�0")
+ logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁yolo锛岃閲嶇疆涓�0")
continue
}
}
}
- logger.Debug("---------------------------------------杩借釜缁撴潫--------------------------------------")
+ //logger.Debug("---------------------------------浜轰綋杩借釜缁撴潫--------------------------------------")
+ return false
}
-//// 鍒ゆ柇涓�涓汉鑴竔d鍦ㄤ笉鍦ㄨ拷韪睜涓�
-//func FaceIsInPond(cameraId string,face *protomsg.ResultFaceDetect) bool{
-// if TrackPond[cameraId].Face > 0 {
-// for key,val := range TrackPond {
-// if key == cameraId {
-// faceFlag := false
-// for faceId := range val.Face {
-// if face.Pos.FaceID == uint64(faceId) { // 姝や汉鑴稿凡鍦ㄦ睜瀛愪腑锛屼笉闇�瑕佸畠鍒颁笅涓�涓幆鑺備簡
-// faceFlag = true
-// return true
-// }
+func TrackOrNot(label map[string]interface{}) bool {
+ if label["yolo"] != nil && len(label["yolo"].([]structure.Result)) > 0 {
+ for _, res := range label["yolo"].([]structure.Result) {
+ if res.TimeLabel == "10" {
+ return true
+ }
+ }
+ }
+ return false
+}
+
+// 杩囨护鎺夐偅浜涘凡鍦ㄧ紦瀛樹腑涓斿垎鍊兼洿浣庣殑浜鸿劯锛屾洿鏂扮紦瀛橈紙娌℃湁鐨勫姞涓婏紝鍒嗗�兼洿鏂颁负鏇撮珮鐨勶紝澶氱殑鍒犻櫎锛�
+func FaceIsInPond(cameraId string, sdkinfor *protomsg.SdkmsgWithTask) {
+ if TrackPond[cameraId] != nil {
+ //logger.Info("----椹墠鐐細", TrackPond[cameraId], "=====", len(TrackPond[cameraId].Faces))
+ //for _, face := range TrackPond[cameraId].Faces {
+ // logger.Info("缂撳瓨涓瓨鍌ㄧ殑face鏁版嵁锛�", face.Id, face.Score)
+ //}
+ faceParam := protomsg.ParamFacePos{}
+ err := proto.Unmarshal(sdkinfor.Sdkdata, &faceParam)
+ if err != nil {
+ logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ }
+ //logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
+ //for _, face := range faceParam.Faces {
+ // logger.Info("鏂版潵鐨勭殑face鏁版嵁锛�", face.Pos.FaceID, face.Pos.FAngle.Confidence)
+ //}
+ var facesTemp []protomsg.ResultFaceDetect
+ for _, face := range faceParam.Faces {
+ facesTemp = append(facesTemp, *face) // 鍏堟妸鏁版嵁杞瓨涓�浠斤紝涓嶇劧涓�浼氬効鏁版嵁鍒犲噺涔嬪悗鎵句笉鍒板師濮嬫暟鎹紝涓嶈兘璁╃紦瀛樻暟鎹洿鏂颁簡
+ }
+ for i := 0; i < len(faceParam.Faces); {
+ faceFlag := false
+ for _, val := range TrackPond[cameraId].Faces {
+ if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence <= val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿浣庯紝鏄鎶涘純鐨勬暟鎹�
+ faceFlag = true
+ //return "true"
+ //logger.Info("鍒嗗�间负锛�", faceParam.Faces[i].Pos.FAngle.Confidence, "--缂撳瓨鐨勫垎鍊间负锛�", val.Score, "姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿浣庯紝鏄琚姏寮冪殑鏁版嵁")
+ faceParam.Faces = append(faceParam.Faces[:i], faceParam.Faces[i+1:]...)
+ break
+ }
+ if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence > val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿楂橈紝鏇存柊缂撳瓨
+ faceFlag = true
+ //logger.Info("鍒嗗�肩敱", val.Score, "鏇存柊涓猴細", faceParam.Faces[i].Pos.FAngle.Confidence, "姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿楂橈紝鏄琚紶閫掍笅鍘荤殑鏁版嵁")
+ lock.Lock()
+ val.Score = faceParam.Faces[i].Pos.FAngle.Confidence
+ lock.Unlock()
+ }
+ }
+ if !faceFlag { // 姝や汉鑴镐笉鍦ㄦ睜瀛愪腑
+ logger.Info("姝や汉鑴镐笉鍦ㄦ睜瀛愪腑锛屽線姹犲瓙涓坊鍔犳暟鎹洿鏂扮紦瀛�")
+ TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces, &Face{faceParam.Faces[i].Pos.FaceID, faceParam.Faces[i].Pos.FAngle.Confidence})
+ i++
+ }
+ }
+ //logger.Info("鍙嶅簭鍒楀寲閲嶆柊瑁呴厤涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
+ //logger.Info("涓存椂瀛樺偍鐨勬柊鏉ユ暟鎹細")
+ //for _, temp := range facesTemp {
+ // logger.Info("涓存椂瀛樺偍鐨勬柊鏉ョ殑鐨刦ace鏁版嵁锛�", temp.Pos.FaceID, temp.Pos.FAngle.Confidence)
+ //}
+ sdkinfor.Sdkdata, err = proto.Marshal(&faceParam)
+ if err != nil {
+ logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
+ }
+ // 鍙嶅悜寰幆 锛岀湅閭ｄ簺缂撳瓨鏈夎�屾暟鎹病鏈夌殑灏卞垹闄ゆ暟鎹洿鏂扮紦瀛�
+ for i := 0; i < len(TrackPond[cameraId].Faces); {
+ flag := false
+ for _, temp := range facesTemp {
+ if TrackPond[cameraId].Faces[i].Id == temp.Pos.FaceID {
+ flag = true
+ }
+ }
+ if flag {
+ i++
+ } else {
+ // 姝ゆ暟鎹湪缂撳瓨涓絾涓嶅湪鏉ョ殑鏁版嵁甯т腑锛屽垹闄ゆ鏁版嵁鏇存柊缂撳瓨
+ //logger.Info("鍒犻櫎姹犲瓙涓殑鏁版嵁鏇存柊缂撳瓨")
+ lock.Lock()
+ TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces[:i], TrackPond[cameraId].Faces[i+1:]...)
+ lock.Unlock()
+ }
+ }
+ } else {
+ lock.Lock()
+ TrackPond[cameraId] = &PersonTrack{Faces: nil}
+ lock.Unlock()
+ }
+}
+
+// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴革級
+func CarIsSame(msg *protomsg.SdkMessage) {
+ //logger.Debug("+++++++++++++++++++++杞﹁締杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
+ for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
+ if sdkinfo.Sdktype == "Plate" { // 浜鸿劯妫�娴�
+ if len(sdkinfo.Sdkdata) > 1 {
+ num = 25
+ FaceIsInPond(msg.Cid, sdkinfo)
+ } else {
+ if num > 0 { // 杩炵画num娆℃病鏈夋暟鎹墠绠楁槸娌℃湁鏁版嵁锛屼笉鐒跺彧绠椾綔涓㈠抚
+ //logger.Info("鎴戣涓轰綘鍙槸涓㈠抚浜�,姝ゆ椂鐨刵um鍊间负锛�", num)
+ num--
+ } else {
+ if TrackPond[msg.Cid] != nil {
+ //logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid])
+ lock.Lock()
+ TrackPond[msg.Cid].Cars = nil
+ lock.Unlock()
+ } else {
+ lock.Lock()
+ TrackPond[msg.Cid] = &PersonTrack{Cars: nil}
+ lock.Unlock()
+ //logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
+ }
+ //logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁杞﹁締锛岃閲嶇疆涓虹┖")
+ continue
+ }
+ }
+ }
+ }
+ //logger.Debug("--------------------------------杞﹁締杩借釜缁撴潫--------------------------------------")
+}
+
+
+//func CarIsInPond(cameraId string, sdkinfor *protomsg.SdkmsgWithTask) {
+// if TrackPond[cameraId] != nil {
+// logger.Info("----椹墠鐐細", TrackPond[cameraId], "=====", len(TrackPond[cameraId].Cars))
+// for _, car := range TrackPond[cameraId].Cars {
+// logger.Info("缂撳瓨涓瓨鍌ㄧ殑face鏁版嵁锛�", car.Id, car.Score)
+// }
+// carParam := protomsg.PlateIDResult{}
+// err := proto.Unmarshal(sdkinfor.Sdkdata, &carParam)
+// if err != nil {
+// logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+// }
+// logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(carParam.Result))
+// for _, res := range carParam.Result {
+// logger.Info("鏂版潵鐨勭殑car鏁版嵁锛�", res.License, res.FvdConf)
+// }
+// var facesTemp []protomsg.ResultFaceDetect
+// for _, face := range faceParam.Faces {
+// facesTemp = append(facesTemp, *face) // 鍏堟妸鏁版嵁杞瓨涓�浠斤紝涓嶇劧涓�浼氬効鏁版嵁鍒犲噺涔嬪悗鎵句笉鍒板師濮嬫暟鎹紝涓嶈兘璁╃紦瀛樻暟鎹洿鏂颁簡
+// }
+// for i := 0; i < len(faceParam.Faces); {
+// faceFlag := false
+// for _, val := range TrackPond[cameraId].Faces {
+// if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence <= val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿浣庯紝鏄鎶涘純鐨勬暟鎹�
+// faceFlag = true
+// //return "true"
+// logger.Info("鍒嗗�间负锛�", faceParam.Faces[i].Pos.FAngle.Confidence, "--缂撳瓨鐨勫垎鍊间负锛�", val.Score, "姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿浣庯紝鏄琚姏寮冪殑鏁版嵁")
+// faceParam.Faces = append(faceParam.Faces[:i], faceParam.Faces[i+1:]...)
+// break
// }
-// if !faceFlag { // 姝や汉鑴镐笉鍦ㄦ睜瀛愪腑
-// val.Face = append(val.Face,face.Pos.FaceID)
-// return false
+// if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence > val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿楂橈紝鏇存柊缂撳瓨
+// faceFlag = true
+// logger.Info("鍒嗗�肩敱", val.Score, "鏇存柊涓猴細", faceParam.Faces[i].Pos.FAngle.Confidence, "姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿楂橈紝鏄琚紶閫掍笅鍘荤殑鏁版嵁")
+// lock.Lock()
+// val.Score = faceParam.Faces[i].Pos.FAngle.Confidence
+// lock.Unlock()
// }
-// }else {
-// return false
+// }
+// if !faceFlag { // 姝や汉鑴镐笉鍦ㄦ睜瀛愪腑
+// logger.Info("姝や汉鑴镐笉鍦ㄦ睜瀛愪腑锛屽線姹犲瓙涓坊鍔犳暟鎹洿鏂扮紦瀛�")
+// TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces, &Face{faceParam.Faces[i].Pos.FaceID, faceParam.Faces[i].Pos.FAngle.Confidence})
+// i++
+// }
+// }
+// logger.Info("鍙嶅簭鍒楀寲閲嶆柊瑁呴厤涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
+// logger.Info("涓存椂瀛樺偍鐨勬柊鏉ユ暟鎹細")
+// for _, temp := range facesTemp {
+// logger.Info("涓存椂瀛樺偍鐨勬柊鏉ョ殑鐨刦ace鏁版嵁锛�", temp.Pos.FaceID, temp.Pos.FAngle.Confidence)
+// }
+// sdkinfor.Sdkdata, err = proto.Marshal(&faceParam)
+// if err != nil {
+// logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
+// }
+// // 鍙嶅悜寰幆 锛岀湅閭ｄ簺缂撳瓨鏈夎�屾暟鎹病鏈夌殑灏卞垹闄ゆ暟鎹洿鏂扮紦瀛�
+// for i := 0; i < len(TrackPond[cameraId].Faces); {
+// flag := false
+// for _, temp := range facesTemp {
+// if TrackPond[cameraId].Faces[i].Id == temp.Pos.FaceID {
+// flag = true
+// }
+// }
+// if flag {
+// i++
+// } else {
+// // 姝ゆ暟鎹湪缂撳瓨涓絾涓嶅湪鏉ョ殑鏁版嵁甯т腑锛屽垹闄ゆ鏁版嵁鏇存柊缂撳瓨
+// logger.Info("鍒犻櫎姹犲瓙涓殑鏁版嵁鏇存柊缂撳瓨")
+// lock.Lock()
+// TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces[:i], TrackPond[cameraId].Faces[i+1:]...)
+// lock.Unlock()
// }
// }
// } else {
-// return false
+// lock.Lock()
+// TrackPond[cameraId] = &PersonTrack{Faces: nil}
+// lock.Unlock()
// }
-// return false
-//}
+//}
\ No newline at end of file
--
Gitblit v1.8.0