From 05eb392fbf5c8e6b5cfd615e1dc56bf1ff7cdc64 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 19 十二月 2019 14:04:17 +0800
Subject: [PATCH] add targetlocation
---
EsClient.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/EsClient.go b/EsClient.go
index 582ee03..0d608a9 100644
--- a/EsClient.go
+++ b/EsClient.go
@@ -74,7 +74,26 @@
continue
}
if m["attachTarget"] != nil {
- multiInfo.AttachFeature, ok = m["attachTarget"].(map[string]interface{})["feature"].(string)
+ multiInfo.AttachFeature, ok = m["attachTarget"].(map[string]interface{})["feature"].(string)
+ }
+ if m["targetLocation"] != nil {
+ targetLocation := m["targetLocation"].(map[string]interface{})
+ topLeft := targetLocation["topLeft"].(map[string]interface{})
+ tx := topLeft["x"].(float64)
+ ty := topLeft["y"].(float64)
+ bottomRight := targetLocation["bottomRight"].(map[string]interface{})
+ bx := bottomRight["x"].(float64)
+ by := bottomRight["y"].(float64)
+ multiInfo.TargetLocation = &protomsg.TargetLocation{
+ TopLeft: &protomsg.Location{
+ X: tx,
+ Y: ty,
+ },
+ BottomRight: &protomsg.Location{
+ X: bx,
+ Y: by,
+ },
+ }
}
}
}
@@ -85,16 +104,35 @@
multiInfo.EsInfo = &tmpinfo
multiInfo.CameraId, ok = source["cameraId"].(string)
//fmt.Println(source["cameraId"])
- leis := make([]*protomsg.LinkEsInfo,0)
- if source["linkTagInfo"] != nil{
- for _,v := range source["linkTagInfo"].([]interface{}) {
+ leis := make([]*protomsg.LinkEsInfo, 0)
+ if source["linkTagInfo"] != nil {
+ for _, v := range source["linkTagInfo"].([]interface{}) {
var lei protomsg.LinkEsInfo
mi := v.(map[string]interface{})
lei.CameraId, ok = mi["cameraId"].(string)
if mi["targetInfo"] != nil {
- for _,val := range mi["targetInfo"].([]interface{}){
+ for _, val := range mi["targetInfo"].([]interface{}) {
fmi := val.(map[string]interface{})
- lei.Feature,ok = fmi["feature"].(string)
+ lei.Feature, ok = fmi["feature"].(string)
+ if fmi["targetLocation"] != nil {
+ targetLocation := fmi["targetLocation"].(map[string]interface{})
+ topLeft := targetLocation["topLeft"].(map[string]interface{})
+ tx := topLeft["x"].(float64)
+ ty := topLeft["y"].(float64)
+ bottomRight := targetLocation["bottomRight"].(map[string]interface{})
+ bx := bottomRight["x"].(float64)
+ by := bottomRight["y"].(float64)
+ multiInfo.TargetLocation = &protomsg.TargetLocation{
+ TopLeft: &protomsg.Location{
+ X: tx,
+ Y: ty,
+ },
+ BottomRight: &protomsg.Location{
+ X: bx,
+ Y: by,
+ },
+ }
+ }
lei.AttachFeature, ok = fmi["attachTarget"].(map[string]interface{})["feature"].(string)
}
}
@@ -133,7 +171,7 @@
tmpinfo.SdkName, ok = source["sdkName"].(string)
if source["picMaxUrl"] != nil {
- for _,v := range source["picMaxUrl"].([]interface{}) {
+ for _, v := range source["picMaxUrl"].([]interface{}) {
tmpinfo.PicMaxUrl = append(tmpinfo.PicMaxUrl, v.(string))
}
}
@@ -232,7 +270,7 @@
lti.TaskName, ok = lm["taskName"].(string)
lti.SdkName, ok = lm["sdkName"].(string)
if lm["picMaxUrl"] != nil {
- for _,v := range lm["picMaxUrl"].([]interface{}) {
+ for _, v := range lm["picMaxUrl"].([]interface{}) {
lti.PicMaxUrl = append(lti.PicMaxUrl, v.(string))
}
}
--
Gitblit v1.8.0