From c2ef56536ce95b2623b5e649c3df88bca14f28c0 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 20 六月 2019 17:49:33 +0800
Subject: [PATCH] 解压缩图片
---
main.go | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/main.go b/main.go
index 64321ca..6b5506e 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,7 @@
"fmt"
"ruleprocess/ruleserver"
"sync"
-
+ "analysis/work"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
"github.com/golang/protobuf/proto"
@@ -39,7 +39,8 @@
} else {
arg := ruleserver.ArgsFromSdk{}
m := paramFormat(msg,&arg)
- arg.MainJudge()
+ fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細",arg)
+ ruleserver.MainJudge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
@@ -50,18 +51,26 @@
// 灏嗗閮ㄤ紶杩涙潵鐨剆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 {
- fmt.Println("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�", err)
- return m
+ panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
arg.CameraId = m.Cid
arg.TaskId = m.Tasklab.Taskid
-
+ bdata,err := UnCompress(m.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
i := protomsg.Image{}
- err = proto.Unmarshal(m.Data, &i)
+ err = proto.Unmarshal(bdata, &i)
arg.ImageWidth = int(i.Width)
arg.ImageHeight = int(i.Height)
// 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
@@ -69,7 +78,7 @@
arg.IsStatic = false
fmt.Println("浠巑ongos涓嬁鍒扮殑鏁版嵁鍖呴暱搴︿负锛�", len(msg))
for _, sdkinfo := range m.Tasklab.Sdkinfos {
- if sdkinfo.Sdktype == "yolo" {
+ if sdkinfo.Sdktype == "Yolo" {
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
--
Gitblit v1.8.0