From 9c8bcb851f82123660c7b05b00a526c4283ba4cf Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 16 十一月 2019 14:28:28 +0800
Subject: [PATCH] 接收车牌数据，修改目标结构
---
go.sum | 2 ++
go.mod | 2 +-
main.go | 42 ++++++++++++++++++++++++------------------
structure/rule.go | 3 +--
4 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/go.mod b/go.mod
index 2f8feff..21da1ca 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@
basic.com/dbapi.git v0.0.0-20191025084729-a04db890e7b5
basic.com/fileserver/WeedFSClient.git v0.0.0-20191105073656-98059e699477
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48
- basic.com/pubsub/protomsg.git v0.0.0-20191105082616-7a5fc5da9c09
+ basic.com/pubsub/protomsg.git v0.0.0-20191115030536-80cf78e0ebea
basic.com/valib/deliver.git v0.0.0-20190927081905-2d390df9ede3
basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28
basic.com/valib/logger.git v0.0.0-20190928113028-4907b08c4159
diff --git a/go.sum b/go.sum
index e94eaee..134a0c6 100644
--- a/go.sum
+++ b/go.sum
@@ -14,6 +14,8 @@
basic.com/pubsub/protomsg.git v0.0.0-20191105075705-11a3749018a7/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/protomsg.git v0.0.0-20191105082616-7a5fc5da9c09 h1:wktnrfZLxcSEnmu/ptMdn4GF5UiHcUdRSlWQ0EllJxY=
basic.com/pubsub/protomsg.git v0.0.0-20191105082616-7a5fc5da9c09/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20191115030536-80cf78e0ebea h1:HARRdW2p9asDLBMmJWpt1ECv3GDGCJN5ELb/RhCXUqQ=
+basic.com/pubsub/protomsg.git v0.0.0-20191115030536-80cf78e0ebea/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/sdkcompare.git v0.0.0-20190715013640-f536a4647d00 h1:sK+Tx7rvM9J2WnNIwrzMDjZSylWiKNfQO0prUBfKsDk=
basic.com/pubsub/sdkcompare.git v0.0.0-20190715013640-f536a4647d00/go.mod h1:8by33F9E1w17Pw/rDgJGJXAo122w0wDENG14hiMS+RE=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051 h1:9flC2o3kasaM2Y6I+mY+mxmve/pyAY/UzGQZLT3lFHM=
diff --git a/main.go b/main.go
index f7c05c9..3038438 100644
--- a/main.go
+++ b/main.go
@@ -159,17 +159,8 @@
arg.TaskId = m.Tasklab.Taskid
arg.IpcId = sdkinfo.Ipcid
arg.IsYolo = true
- //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
logger.Info("-----杩借釜涔嬪悗sdkinfo.Sdkdata鐨勯暱搴︿负锛�----", len(sdkinfo.Sdkdata))
if len(sdkinfo.Sdkdata) > 1 {
// 澶т簬1鎵嶆湁鏁版嵁
@@ -200,17 +191,8 @@
arg.TaskId = m.Tasklab.Taskid
arg.IpcId = sdkinfo.Ipcid
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 {
faceParam := protomsg.ParamFacePos{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
@@ -229,6 +211,30 @@
continue
}
}
+ if sdkinfo.Sdktype == "Plate" { // 杞︾墝璇嗗埆
+ arg := structure.SdkData{}
+ arg.TaskId = m.Tasklab.Taskid
+ arg.IpcId = sdkinfo.Ipcid
+ arg.IsYolo = false
+ arg.ImageWidth = int(i.Width)
+ arg.ImageHeight = int(i.Height)
+ if len(sdkinfo.Sdkdata) > 1 {
+ plateIDResult := protomsg.PlateIDResult {}
+ err = proto.Unmarshal(sdkinfo.Sdkdata, &plateIDResult )
+ if err != nil {
+ logger.Info("瑙ｆ瀽杞︾墝鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ continue
+ }
+ for _, info := range plateIDResult.Result {
+ logger.Info("鎺ユ敹杞︾墝鏁版嵁锛�",)
+ photoMap := structure.PhotoMap{Rects: rectFormat(info.RcLocation), IsYolo: false, Car:info}
+ arg.Photo = append(arg.Photo, photoMap)
+ }
+ args.Sdkdata = append(args.Sdkdata, &arg)
+ } else {
+ continue
+ }
+ }
}
return m
}
diff --git a/structure/rule.go b/structure/rule.go
index cd6cd74..0ac2187 100644
--- a/structure/rule.go
+++ b/structure/rule.go
@@ -48,6 +48,7 @@
IsYolo bool // 鏄惁鏄痽olo鏁版嵁
ThftRes protomsg.ThftResult
Feature []byte
+ Car *protomsg.PlateID
}
// 姣忎釜绠楁硶瀵逛簬褰撳墠甯х敾闈㈣嚜宸辨彁鍙栫殑鏁版嵁
@@ -56,8 +57,6 @@
IpcId string
IsYolo bool
Photo []PhotoMap // yolo绠楁硶缁撴瀯锛屼篃鍙互瀛樹汉鑴哥殑鏁版嵁锛屾瘯绔熶汉鑴镐腑鑳界敤瑙勫垯鏉ユ祴鐨勮繕鏄偅浜涘弬鏁�
- KeepRight bool // 鏄惁闈犲彸琛� 绠楁硶鍒ゆ柇鐨勪笌涓婁竴甯у浘鍍忕殑姣旇緝缁撴灉
- IsStatic bool // 鏄惁闈欐
ImageWidth int // 鎽勫儚鏈烘媿鎽勭殑鍥惧儚瀹� 鍍忕礌
ImageHeight int // 鎽勫儚鏈烘媿鎽勭殑鍥惧儚楂� 鍍忕礌
AreaMapList []*AreaMap // 鏈瑂dk鎻愬彇鐨勬暟鎹寜鐓у尯鍩熷垝鍒嗗悗鐨勬暟鎹泦鍚�
--
Gitblit v1.8.0