From e0c4bae41fac4213f8bb2cf771969b1cd9cf93c2 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 29 六月 2019 19:11:47 +0800
Subject: [PATCH] 改为指针传递
---
main.go | 80 +--------------------------------------
1 files changed, 3 insertions(+), 77 deletions(-)
diff --git a/main.go b/main.go
index 030d6de..64a80a7 100644
--- a/main.go
+++ b/main.go
@@ -42,7 +42,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)
@@ -53,80 +53,6 @@
}
}
}
-
-// 灏嗗閮ㄤ紶杩涙潵鐨剆dk鏁版嵁鍖呰В鎴� ArgsFromSdk
-//func paramFormat(msg []byte, arg *ruleserver.ArgsFromSdk) protomsg.SdkMessage {
-// defer func() {
-// if err := recover(); err != nil {
-// fmt.Println("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
-// }
-//
-// }()
-// // 鍙嶅簭鍒楀寲鏁版嵁寰楀埌sdk鍏ュ弬
-// m := protomsg.SdkMessage{}
-// err := proto.Unmarshal(msg, &m)
-// if err != nil {
-// panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
-// }
-// arg.CameraId = m.Cid
-// arg.TaskId = m.Tasklab.Taskid
-// 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
-// for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
-// if sdkinfo.Sdktype == "Yolo" {
-// 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,IsYolo:true}
-// arg.Photo = append(arg.Photo, photoMap)
-// }
-// }
-// } else {
-// continue
-// }
-//
-// }
-// if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
-// 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: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality), IsYolo:false,ThftRes:*(info.Result)}
-// arg.Photo = append(arg.Photo, photoMap)
-// }
-// } else {
-// continue
-// }
-// }
-// //if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
-//
-// //}
-//
-// }
-// return m
-//}
// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
@@ -186,7 +112,7 @@
arg.Photo = append(arg.Photo, photoMap)
}
}
- args.Sdkdata = append(args.Sdkdata,arg)
+ args.Sdkdata = append(args.Sdkdata,&arg)
} else {
continue
}
@@ -221,7 +147,7 @@
photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality)*100, IsYolo:false,ThftRes:*(info.Result)}
arg.Photo = append(arg.Photo, photoMap)
}
- args.Sdkdata = append(args.Sdkdata,arg)
+ args.Sdkdata = append(args.Sdkdata,&arg)
} else {
continue
}
--
Gitblit v1.8.0