From 912a0a1894caa4666e2bae9c92c99bb261415479 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 29 六月 2019 19:15:04 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 2a6ea9b..bac397a 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -118,7 +118,7 @@
// 浠庣畻娉曟ā鍧楀効鎷挎潵鐨勫涓�甯у浘鍍忓悇涓畻娉曟彁鍙栫殑鏁版嵁闆嗗悎
type SdkDatas struct {
CameraId string
- Sdkdata []SdkData
+ Sdkdata []*SdkData
RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []Arg yolo: []Result
}
@@ -177,7 +177,7 @@
}
// 鎶妔dk浠庢暟鎹抚涓婃彁鍙栫殑鎸夌収鍖哄煙鍒嗙被褰掔疆
-func SdkDataFormat(cameraId string, arg SdkData, cameraPolygons []protomsg.CameraPolygon) {
+func SdkDataFormat(cameraId string, arg *SdkData, cameraPolygons []protomsg.CameraPolygon) {
for _, polygon := range cameraPolygons {
//log.Println("++++++鍦ㄨ繖鍎跨湅涓�涓嬪尯鍩熷晩", polygon)
areaMap := AreaMap{cameraId: cameraId, areaId: polygon.Id, areaJson: polygon.Polygon, triggerLine: polygon.TriggerLine, directionLine: polygon.DirectionLine}
@@ -315,7 +315,7 @@
}
}
if flag {
- fmt.Println("鏈抚鏁版嵁绗﹀悎瑙勫垯")
+ fmt.Println("----------------------------缁堜簬璧板畬涓囬噷闀垮緛")
// 濡傛灉鎴愬姛浜嗘垜搴旇鎵惧埌瑙勫垯涓秹鍙婂埌鐨剆dk锛岃褰曚笅浠栦滑鐨剆dkname
sdkName := ""
for j := 0; j < len(groupRule.Rules); j++ {
@@ -348,7 +348,7 @@
}
// 璁＄畻鍖哄煙鍐呯殑鐩爣鏁伴噺浠ュ強灏嗙浉浼煎害銆佸崰姣斻�佸昂瀵哥瓑鎵撳寘
-func (a *AreaMap) CountAreaObjs(arg SdkData) {
+func (a *AreaMap) CountAreaObjs(arg *SdkData) {
a.targetNum = 0
threshold := 0.0 // 鐩镐技搴�
--
Gitblit v1.8.0