From 88e467b44140cfd4cac253b0672cda954f7ac922 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 01 七月 2019 17:03:51 +0800
Subject: [PATCH] 改方法名
---
main.go | 70 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 10 deletions(-)
diff --git a/main.go b/main.go
index 64a80a7..2518815 100644
--- a/main.go
+++ b/main.go
@@ -2,6 +2,7 @@
import (
"fmt"
+ "log"
"ruleprocess/insertdata"
"ruleprocess/ruleserver"
"ruleprocess/util"
@@ -9,15 +10,19 @@
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
"github.com/golang/protobuf/proto"
- "sync"
)
func main() {
- wg := sync.WaitGroup{}
- wg.Add(1)
- go ruleserver.TimeTicker()
- nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
- wg.Wait()
+ //wg := sync.WaitGroup{}
+ //wg.Add(1)
+ //go ruleserver.TimeTicker()
+ //nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
+ //wg.Wait()
+ resp,err := util.DrawPolygonOnImage()
+ if err != nil {
+ log.Println("鐢绘鎴栬�呬笂浼犳湁闂")
+ }
+ log.Println(resp["fileUrl"].(string))
}
func nReciever(url string, m deliver.Mode, count int) {
c := deliver.NewServer(m, url)
@@ -42,7 +47,7 @@
arg := ruleserver.SdkDatas{}
m := paramFormat(msg, &arg)
fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
- ruleserver.Judge(arg)
+ ruleserver.Judge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
//fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
@@ -79,6 +84,14 @@
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
args.CameraId = m.Cid
+ // 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
+ bdata, err := util.UnCompress(m.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
if sdkinfo.Sdktype == "Yolo" {
arg := ruleserver.SdkData{}
@@ -152,9 +165,46 @@
continue
}
}
- //if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
-
- //}
+ if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
+ arg := ruleserver.SdkData{}
+ arg.TaskId = m.Tasklab.Taskid
+ arg.SdkId = sdkinfo.Sdkid
+ arg.SdkName = sdkinfo.SdkName
+ arg.IsYolo = false
+ bdata, err := util.UnCompress(m.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ arg.ImageWidth = int(i.Width)
+ arg.ImageHeight = int(i.Height)
+ // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
+ arg.KeepRight = false
+ arg.IsStatic = false
+ if len(sdkinfo.Sdkdata) > 1 {
+ fmt.Println("----------------------------------------------------",m.Caddr)
+ faceParam := protomsg.ParamFaceFeature{}
+ err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ if err != nil {
+ fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ continue
+ }
+ for _, extComp := range faceParam.ExtComp {
+ baseinfos := protomsg.Binfos{}
+ err1 := proto.Unmarshal(extComp.Comp, &baseinfos)
+ if err1 != nil {
+ fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ continue
+ }
+ photoMap := ruleserver.PhotoMap{Rects: rectFormat(extComp.Pos.Pos.RcFace), Score: float64(extComp.Pos.Pos.Quality)*100, IsYolo:false,ThftRes:*(extComp.Pos.Result),Liker:baseinfos.Infos}
+ arg.Photo = append(arg.Photo, photoMap)
+ }
+ args.Sdkdata = append(args.Sdkdata,&arg)
+ } else {
+ continue
+ }
+ }
}
return m
--
Gitblit v1.8.0