From 0b9b9fc5ec6c42cc22e69df7ae587a481143030b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 25 六月 2019 11:42:36 +0800
Subject: [PATCH] ---
---
main.go | 76 ++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/main.go b/main.go
index 8d6a0ea..e148dff 100644
--- a/main.go
+++ b/main.go
@@ -2,13 +2,14 @@
import (
"fmt"
- "ruleprocess/ruleserver"
"ruleprocess/insertdata"
+ "ruleprocess/ruleserver"
+ "ruleprocess/util"
- "sync"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
"github.com/golang/protobuf/proto"
+ "sync"
)
func main() {
@@ -39,8 +40,8 @@
continue
} else {
arg := ruleserver.ArgsFromSdk{}
- m := paramFormat(msg,&arg)
- fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細",arg)
+ m := paramFormat(msg, &arg)
+ fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
ruleserver.MainJudge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
@@ -54,10 +55,10 @@
}
// 灏嗗閮ㄤ紶杩涙潵鐨剆dk鏁版嵁鍖呰В鎴� ArgsFromSdk
-func paramFormat(msg []byte,arg *ruleserver.ArgsFromSdk) protomsg.SdkMessage {
+func paramFormat(msg []byte, arg *ruleserver.ArgsFromSdk) protomsg.SdkMessage {
defer func() {
- if err := recover();err != nil{
- fmt.Println("瑙ｅ寘杩囩▼鐨勯敊璇�",err.(string))
+ if err := recover(); err != nil {
+ fmt.Println("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
}
}()
@@ -69,7 +70,7 @@
}
arg.CameraId = m.Cid
arg.TaskId = m.Tasklab.Taskid
- bdata,err := UnCompress(m.Data)
+ bdata, err := util.UnCompress(m.Data)
if err != nil {
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
@@ -80,33 +81,46 @@
// 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
arg.KeepRight = false
arg.IsStatic = false
- fmt.Println("浠巑ongos涓嬁鍒扮殑鏁版嵁鍖呴暱搴︿负锛�", len(msg))
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
if sdkinfo.Sdktype == "Yolo" {
- yoloParam := protomsg.ParamYoloObj{}
- err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
- if err != nil {
- fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- //continue
- }
- for _, info := range yoloParam.Infos {
- photoMap := ruleserver.PhotoMap{Rects:rectFormat(info.RcObj), Score: float64(info.Prob)}
- arg.Photo = append(arg.Photo, photoMap)
+ if len(sdkinfo.Sdkdata) > 1 {
+ // 澶т簬1鎵嶆湁鏁版嵁
+ fmt.Println("----------------------------------------------------",m.Caddr)
+ yoloParam := protomsg.ParamYoloObj{}
+ err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
+ if err != nil {
+ fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ //continue
+ }
+ for _, info := range yoloParam.Infos {
+ 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" { // 浜鸿劯妫�娴�
- 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{}, Score: float64(info.Pos.Quality)}
- arg.Photo = append(arg.Photo, photoMap)
- }
- }
+ //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" { // 浜鸿劯鎻愬彇
//}
@@ -118,7 +132,7 @@
// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
rect := ruleserver.Rect{}
- fmt.Println("鐪嬩竴涓嬩紶鍏ョ殑鐭╁舰鏁版嵁锛�",rcobj.Left,rcobj.Top,rcobj.Right,rcobj.Bottom)
+ fmt.Println("鐪嬩竴涓嬩紶鍏ョ殑鐭╁舰鏁版嵁锛�", rcobj.Left, rcobj.Top, rcobj.Right, rcobj.Bottom)
rect.X = float64(rcobj.Left)
rect.Y = float64(rcobj.Top)
rect.Width = float64(rcobj.Right - rcobj.Left)
--
Gitblit v1.8.0