From 19aa932d862868db661856d03de8a7845ae20f30 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 14 七月 2020 11:27:39 +0800
Subject: [PATCH] sdk add ruleSo
---
protomsg.proto | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/protomsg.proto b/protomsg.proto
index 4965131..ec47464 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -63,7 +63,8 @@
message SdkRun {
string ipc_id = 1;
string sdk_type = 2;
- bool isSourceImg = 3;
+ bool isTriggerByPreSdk = 3;
+ int32 confidence = 4;
}
@@ -125,6 +126,7 @@
string id = 1;
string scene_name = 2;
repeated SdkRun sdks = 3;
+ repeated string sdkIds = 4;
}
message Rule {
@@ -132,13 +134,11 @@
string camera_id =2;
string polygon_id =3;
string sdk_id = 4;
- string sdk_arg_alias = 5;
- string operator = 6;
- string operator_type = 7;
- string sdk_arg_value = 8;
+ repeated SdkSetBase sdk_set = 5;
+ string rule_with_pre = 6;
+ bool is_save_anyhow = 7; //rule_with_pre鏄Е鍙戞椂锛屾槸鍚︽棤璁鸿瑙﹀彂鐨勬潯浠舵弧涓嶆弧瓒筹紝閮戒繚鐣欐暟鎹�
+ string group_id =8;
int32 sort = 9;
- string rule_with_pre = 10;
- string group_id =11;
}
message RuleTemplate {
@@ -149,6 +149,10 @@
repeated TemplateArg rules = 5;
}
+message RuleTemplateList {
+ repeated RuleTemplate list = 1;
+}
+
message TemplateArg {
string sdk_id = 1;
string sdk_arg_alias = 2;
@@ -156,6 +160,14 @@
string sdk_arg_value = 4;
string sort = 5;
string rule_with_pre = 6;
+}
+
+message SdkSetBase {
+ string sdk_arg_alias = 1;
+ string operator = 2;
+ string operator_type = 3;
+ string sdk_arg_value = 4;
+ int32 sort = 5;
}
//Sdk struct
@@ -174,6 +186,9 @@
int32 del_flag = 12;//鏄惁鍒犻櫎
string iconBlob = 13; //鍥剧墖浜岃繘鍒�
string version = 14; //鐗堟湰
+ bool enTrack = 15; //鏄惁寮�鍚窡韪�
+ string argDef = 16; //榛樿鍙傛暟
+ string ruleSo = 17; //瑙勫垯鐢╯o
}
//SdkArg struct
@@ -248,6 +263,16 @@
int32 type = 7;
}
+message Voice {
+ string id = 1;
+ string name = 2;
+ string path = 3;
+}
+
+message VoiceList {
+ repeated Voice list = 1;
+}
+
message CompareArgs {
repeated string tableIds = 1;
float compareThreshold = 2;
--
Gitblit v1.8.0