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 |   78 +++++++++++++++++++++++++++++---------
 1 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/protomsg.proto b/protomsg.proto
index e715277..ec47464 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -63,6 +63,8 @@
 message SdkRun {
     string ipc_id = 1;
     string sdk_type = 2;
+    bool isTriggerByPreSdk = 3;
+    int32 confidence = 4;
 }
 
 
@@ -92,24 +94,39 @@
     repeated Point points = 3;//鐐圭殑闆嗗悎
 }
 
-message CameraRules {
-    string camera_id = 1;
+message CameraInfo {
+    string runServerName = 1;
+    string id = 2;
+    string name = 3;
+    int32 run_type= 4;
+}
+message CameraAndRules {
+    CameraInfo cameraInfo = 1;
     repeated GroupRule rules = 2;
 }
 
 message GroupRule {
-    string group_id = 1;
-    string group_text = 2;
-    int32 alarm_level = 3;
-    repeated Rule rules = 4;
-    string set_type = 5;
+    repeated string cameraIds = 1;
+    string id = 2;
 
-    string template_id = 6;
-    string template_rule = 7;
-    string time_rule_id = 8;
-    string scene_name = 9;
-    string desc = 10;
-    bool enable = 11;
+    string group_text = 3;
+    int32 alarm_level = 4;
+    repeated Rule rules = 5;
+    string set_type = 6;
+
+    string template_id = 7;
+    string template_rule = 8;
+    string time_rule_id = 9;
+    string scene_name = 10;
+    string desc = 11;
+    bool enable = 12;
+}
+
+message GroupRuleSdks {
+    string id = 1;
+    string scene_name = 2;
+    repeated SdkRun sdks = 3;
+    repeated string sdkIds = 4;
 }
 
 message Rule {
@@ -117,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 {
@@ -134,6 +149,10 @@
     repeated TemplateArg rules = 5;
 }
 
+message RuleTemplateList {
+    repeated RuleTemplate list = 1;
+}
+
 message TemplateArg {
     string sdk_id = 1;
     string sdk_arg_alias = 2;
@@ -141,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
@@ -159,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
@@ -233,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