From 728d6b93340548e39a471b96d38d1340198840e4 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 09 七月 2019 17:08:38 +0800
Subject: [PATCH] 给真的yolo的ipcId
---
ruleserver/ruleToformula.go | 8 +++++---
main.go | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/main.go b/main.go
index bcf3c25..e0acdeb 100644
--- a/main.go
+++ b/main.go
@@ -144,7 +144,7 @@
logger.Info("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Info("--------------鐪嬬湅yolo涓湁鍑犱釜鐩爣锛�",len(yoloParam.Infos))
+ //logger.Info("--------------鐪嬬湅yolo涓湁鍑犱釜鐩爣锛�",len(yoloParam.Infos))
for _, info := range yoloParam.Infos {
if info.Typ == 0 {
photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 91ef679..fad176a 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -297,13 +297,15 @@
}
ipcId := sdk.IpcId
sdkName := sdk.SdkName
+
if ipcId == sdkData.IpcId {
+ logger.Info("褰撳墠璧扮殑瑙勫垯鐨勭畻娉曟槸--锛�",sdkName,"---")
for _, areaMap := range sdkData.AreaMapList {
ruleResult := filterRule(groupRule.Rules[j], &areaMap)
if ruleResult.Result != "" {
logger.Info("鏉′欢瑙勫垯缁撴灉锛�", ruleResult.Result)
// 濡傛灉姝ょ粨鏋滀负鐪熶笖褰撳墠杩囩殑鏄痽olo绠楁硶锛屽簲璁颁笅姝よ鍒欐墍瀵瑰簲鐨剆dkName,鍙﹀锛岃繕瑕佸幓閲�
- if ruleResult.Result == "true" && ipcId == "" && !strings.Contains(sdkNames, sdkName) {
+ if ruleResult.Result == "true" && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
sdkNames = sdkName + ","
}
resultSplice = append(resultSplice, &ruleResult)
@@ -328,7 +330,7 @@
ruleResult := transferParameters(groupRule.Rules[j], &areaMap)
if ruleResult.Result != "" {
logger.Info("鏁伴噺瑙勫垯缁撴灉锛�", ruleResult.Result)
- if ruleResult.Result == "true" && ipcId == "" && !strings.Contains(sdkNames, sdkName) {
+ if ruleResult.Result == "true" && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
sdkNames = sdkName + ","
}
resultSplice = append(resultSplice, &ruleResult)
@@ -351,7 +353,7 @@
ruleResult := timeRuleResult(groupRule.Rules[j], &areaMap)
if ruleResult.Result != "" {
logger.Info("鏃堕棿瑙勫垯缁撴灉锛�", ruleResult.Result)
- if ruleResult.Result == "true" && ipcId == "" && !strings.Contains(sdkNames, sdkName) {
+ if ruleResult.Result == "true" && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
sdkNames = sdkName + ","
}
resultSplice = append(resultSplice, &ruleResult)
--
Gitblit v1.8.0