From fd04fb054dd9bdfafd04c24bdab43b5cd2b09b2e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 25 六月 2019 14:47:26 +0800
Subject: [PATCH] 非报警数据不存
---
main.go | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/main.go b/main.go
index e6375c9..e148dff 100644
--- a/main.go
+++ b/main.go
@@ -81,12 +81,11 @@
// 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
arg.KeepRight = false
arg.IsStatic = false
- fmt.Println("浠巑ongos涓嬁鍒扮殑鏁版嵁鍖呴暱搴︿负锛�", len(msg))
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
if sdkinfo.Sdktype == "Yolo" {
- fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
if len(sdkinfo.Sdkdata) > 1 {
// 澶т簬1鎵嶆湁鏁版嵁
+ fmt.Println("----------------------------------------------------",m.Caddr)
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
@@ -94,31 +93,34 @@
//continue
}
for _, info := range yoloParam.Infos {
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)}
- arg.Photo = append(arg.Photo, photoMap)
+ if info.Typ == 0 {
+ photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100}
+ arg.Photo = append(arg.Photo, photoMap)
+ }
}
} else {
continue
}
}
- if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
- fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
- if len(sdkinfo.Sdkdata) > 1 {
- faceParam := protomsg.ParamFacePos{}
- err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
- if err != nil {
- fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- for _, info := range faceParam.Faces {
- photoMap := ruleserver.PhotoMap{Rects: ruleserver.Rect{-1, -1, -1, -1}, Score: float64(info.Pos.Quality)}
- arg.Photo = append(arg.Photo, photoMap)
- }
- } else {
- continue
- }
- }
+ //if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
+ // fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
+ // if len(sdkinfo.Sdkdata) > 1 {
+ // fmt.Println("----------------------------------------------------",m.Caddr)
+ // faceParam := protomsg.ParamFacePos{}
+ // err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ // if err != nil {
+ // fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ // continue
+ // }
+ // for _, info := range faceParam.Faces {
+ // photoMap := ruleserver.PhotoMap{Rects: ruleserver.Rect{-1, -1, -1, -1}, Score: float64(info.Pos.Quality)}
+ // arg.Photo = append(arg.Photo, photoMap)
+ // }
+ // } else {
+ // continue
+ // }
+ //}
//if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
//}
--
Gitblit v1.8.0