From 3fc92c3ead67b494fa4c99cdcc5edb31bdd40d69 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 12 九月 2019 13:49:28 +0800
Subject: [PATCH] label重大更新
---
ruleserver/personTrack.go | 11 ++++++++---
ruleserver/readyDataForRule.go | 12 ++++++++----
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 0cb12da..19bec0c 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -17,7 +17,7 @@
Score float32
}
-var num int = 5
+var num int = 25
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴革級
func FaceIsSame(msg *protomsg.SdkMessage) {
logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
@@ -25,7 +25,7 @@
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
logger.Info("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
if len(sdkinfo.Sdkdata) > 1 {
- num = 5
+ num = 25
FaceIsInPond(msg.Cid, sdkinfo)
} else {
if num > 0 { // 杩炵画num娆℃病鏈夋暟鎹墠绠楁槸娌℃湁鏁版嵁锛屼笉鐒跺彧绠椾綔涓㈠抚
@@ -124,7 +124,12 @@
logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
}
logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
- var facesTemp = faceParam.Faces // 鍏堟妸鏁版嵁杞瓨涓�浠斤紝涓嶇劧涓�浼氬効鏁版嵁鍒犲噺涔嬪悗鎵句笉鍒板師濮嬫暟鎹紝涓嶈兘璁╃紦瀛樻暟鎹洿鏂颁簡
+
+ 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 {
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index e4430c7..c5a65df 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -82,10 +82,14 @@
}
}
logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------","鎽勫儚鏈篿d:",cameraId,"浠诲姟id",taskId)
- for _,ruleGroup := range taskGroup.GroupRules{
- logger.Info(ruleGroup.GroupText)
+ if taskGroup == nil {
+ return nil
+ } else {
+ for _,ruleGroup := range taskGroup.GroupRules{
+ logger.Info(ruleGroup.GroupText)
+ }
+ return taskGroup
}
- return taskGroup
}
// 鏍规嵁鎽勫儚鏈篿d鎷垮埌鎽勫儚鏈烘墍鏈夊尯鍩�
@@ -293,7 +297,7 @@
func (a *AreaMap) CountAreaObjs(arg *SdkData) {
a.targetNum = 0
- threshold := 0.0 // 鐩镐技搴�
+ threshold := 0.5 // 鐩镐技搴�
intersectionper := 0.2 // 鍗犳瘮
size := 0.0 // 灏哄
--
Gitblit v1.8.0