From f0513d7f1b644337a2f78a66dea50495f0f1a61e Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期五, 05 七月 2019 14:12:59 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.1.14:29418/pubsub/protomsg
---
protomsg.proto | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/protomsg.proto b/protomsg.proto
index e41d556..f6c76f3 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -16,23 +16,26 @@
message Camera {
string id = 1;
string name = 2;
- int32 type = 3;
- string addr = 4;
- int32 areaid = 5;
- float longitude = 6;
- float latitude = 7;
- string rtsp = 8;
- string ip = 9;
- int32 port = 10;
- string username = 11;
- string password = 12;
- string brand = 13;
- string reserved = 14;
+ string alias = 3;
+ string snapshot_url = 4;//鎽勫儚鏈哄簳鍥惧揩鐓�
+ int32 type = 5;
+ string addr = 6;
+ int32 areaid = 7;
+ float longitude = 8;
+ float latitude = 9;
+ string rtsp = 10;
+ string ip = 11;
+ int32 port = 12;
+ string username = 13;
+ string password = 14;
+ string brand = 15;
+ string reserved = 16;
- bool is_running = 15;//鏄惁姝ｅ湪鍋氫换鍔★紙0:鍚︼紝1锛氭槸锛�
- bool run_enable = 16;//鏄惁鍚敤瀹炴椂鎴栬疆璇�(0:鍚︼紝1锛氭槸)
- int32 run_type = 17;//鍋氫换鍔＄殑绫诲瀷锛�0锛氳疆璇紝1锛氬疄鏃讹級
- string run_server_id = 18;//褰撳墠姝ｅ湪鍝彴鏈嶅姟鍣ㄤ笂鍋氫换鍔�
+ bool is_running = 17;//鏄惁姝ｅ湪鍋氫换鍔★紙0:鍚︼紝1锛氭槸锛�
+ bool run_enable = 18;//鏄惁鍚敤瀹炴椂鎴栬疆璇�(0:鍚︼紝1锛氭槸)
+ int32 run_type = 19;//鍋氫换鍔＄殑绫诲瀷锛�0锛氳疆璇紝1锛氬疄鏃讹級
+ string run_server_id = 20;//褰撳墠姝ｅ湪鍝彴鏈嶅姟鍣ㄤ笂鍋氫换鍔�
+
}
//鎽勫儚鏈虹殑浠诲姟淇℃伅
@@ -115,6 +118,7 @@
string group_text = 2;
int32 alarm_level = 3;
repeated Rule rules = 4;
+ string set_type = 5;
}
message Rule {
@@ -169,6 +173,7 @@
T_Sdk = 6;//sdk鍙樺寲
T_CameraPolygon = 7;//鎽勫儚鏈哄杈瑰舰鍙樺寲
T_TimeRule = 8;//鏃堕棿瑙勫垯鍙樺寲
+ T_Server = 9;//鏈嶅姟鍣ㄤ俊鎭彉鍖�
}
enum DbAction {
--
Gitblit v1.8.0