From 4a28a17fe5afef12d6cdedd745394b0202f92875 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 02 七月 2019 11:50:04 +0800
Subject: [PATCH] add camera alias and snapshot_url
---
protomsg.proto | 36 ++-
protomsg.pb.go | 449 +++++++++++++++++++++++++++----------------------
2 files changed, 270 insertions(+), 215 deletions(-)
diff --git a/protomsg.pb.go b/protomsg.pb.go
index 4b74eef..df30b9f 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -163,23 +163,24 @@
type Camera struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
- Type int32 `protobuf:"varint,3,opt,name=type,proto3" json:"type,omitempty"`
- Addr string `protobuf:"bytes,4,opt,name=addr,proto3" json:"addr,omitempty"`
- Areaid int32 `protobuf:"varint,5,opt,name=areaid,proto3" json:"areaid,omitempty"`
- Longitude float32 `protobuf:"fixed32,6,opt,name=longitude,proto3" json:"longitude,omitempty"`
- Latitude float32 `protobuf:"fixed32,7,opt,name=latitude,proto3" json:"latitude,omitempty"`
- Rtsp string `protobuf:"bytes,8,opt,name=rtsp,proto3" json:"rtsp,omitempty"`
- Ip string `protobuf:"bytes,9,opt,name=ip,proto3" json:"ip,omitempty"`
- Port int32 `protobuf:"varint,10,opt,name=port,proto3" json:"port,omitempty"`
- Username string `protobuf:"bytes,11,opt,name=username,proto3" json:"username,omitempty"`
- Password string `protobuf:"bytes,12,opt,name=password,proto3" json:"password,omitempty"`
- Brand string `protobuf:"bytes,13,opt,name=brand,proto3" json:"brand,omitempty"`
- Reserved string `protobuf:"bytes,14,opt,name=reserved,proto3" json:"reserved,omitempty"`
- IsRunning bool `protobuf:"varint,15,opt,name=is_running,json=isRunning,proto3" json:"is_running,omitempty"`
- RunEnable bool `protobuf:"varint,16,opt,name=run_enable,json=runEnable,proto3" json:"run_enable,omitempty"`
- RunType int32 `protobuf:"varint,17,opt,name=run_type,json=runType,proto3" json:"run_type,omitempty"`
- RunServerId string `protobuf:"bytes,18,opt,name=run_server_id,json=runServerId,proto3" json:"run_server_id,omitempty"`
- SnapshotUrl string `protobuf:"bytes,19,opt,name=snapshot_url,json=snapshotUrl,proto3" json:"snapshot_url,omitempty"`
+ Alias string `protobuf:"bytes,3,opt,name=alias,proto3" json:"alias,omitempty"`
+ SnapshotUrl string `protobuf:"bytes,4,opt,name=snapshot_url,json=snapshotUrl,proto3" json:"snapshot_url,omitempty"`
+ Type int32 `protobuf:"varint,5,opt,name=type,proto3" json:"type,omitempty"`
+ Addr string `protobuf:"bytes,6,opt,name=addr,proto3" json:"addr,omitempty"`
+ Areaid int32 `protobuf:"varint,7,opt,name=areaid,proto3" json:"areaid,omitempty"`
+ Longitude float32 `protobuf:"fixed32,8,opt,name=longitude,proto3" json:"longitude,omitempty"`
+ Latitude float32 `protobuf:"fixed32,9,opt,name=latitude,proto3" json:"latitude,omitempty"`
+ Rtsp string `protobuf:"bytes,10,opt,name=rtsp,proto3" json:"rtsp,omitempty"`
+ Ip string `protobuf:"bytes,11,opt,name=ip,proto3" json:"ip,omitempty"`
+ Port int32 `protobuf:"varint,12,opt,name=port,proto3" json:"port,omitempty"`
+ Username string `protobuf:"bytes,13,opt,name=username,proto3" json:"username,omitempty"`
+ Password string `protobuf:"bytes,14,opt,name=password,proto3" json:"password,omitempty"`
+ Brand string `protobuf:"bytes,15,opt,name=brand,proto3" json:"brand,omitempty"`
+ Reserved string `protobuf:"bytes,16,opt,name=reserved,proto3" json:"reserved,omitempty"`
+ IsRunning bool `protobuf:"varint,17,opt,name=is_running,json=isRunning,proto3" json:"is_running,omitempty"`
+ RunEnable bool `protobuf:"varint,18,opt,name=run_enable,json=runEnable,proto3" json:"run_enable,omitempty"`
+ RunType int32 `protobuf:"varint,19,opt,name=run_type,json=runType,proto3" json:"run_type,omitempty"`
+ RunServerId string `protobuf:"bytes,20,opt,name=run_server_id,json=runServerId,proto3" json:"run_server_id,omitempty"`
}
func (m *Camera) Reset() { *m = Camera{} }
@@ -225,6 +226,20 @@
func (m *Camera) GetName() string {
if m != nil {
return m.Name
+ }
+ return ""
+}
+
+func (m *Camera) GetAlias() string {
+ if m != nil {
+ return m.Alias
+ }
+ return ""
+}
+
+func (m *Camera) GetSnapshotUrl() string {
+ if m != nil {
+ return m.SnapshotUrl
}
return ""
}
@@ -337,13 +352,6 @@
func (m *Camera) GetRunServerId() string {
if m != nil {
return m.RunServerId
- }
- return ""
-}
-
-func (m *Camera) GetSnapshotUrl() string {
- if m != nil {
- return m.SnapshotUrl
}
return ""
}
@@ -1640,103 +1648,104 @@
func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
var fileDescriptor_32de24555f916688 = []byte{
- // 1532 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcd, 0x8e, 0x14, 0xc9,
- 0x11, 0x9e, 0xea, 0xff, 0x8a, 0xfe, 0x99, 0x26, 0xc1, 0x50, 0x06, 0x33, 0x1e, 0x0a, 0x2c, 0x8f,
- 0x90, 0xcd, 0x61, 0xe0, 0x05, 0x1a, 0xc6, 0x58, 0x2d, 0x61, 0x84, 0x6b, 0x1a, 0x7c, 0x73, 0x29,
- 0xbb, 0x33, 0xa7, 0xa7, 0xd4, 0x35, 0x55, 0xad, 0xcc, 0xac, 0x81, 0x79, 0x0a, 0xfb, 0xe8, 0xb3,
- 0x2f, 0x96, 0xdf, 0x64, 0x8f, 0x1c, 0xf7, 0xb6, 0x2b, 0x90, 0x56, 0x2b, 0xad, 0xf6, 0x1d, 0x56,
- 0x11, 0x99, 0x55, 0x5d, 0xdd, 0xb0, 0xbb, 0xdc, 0x22, 0xbe, 0x88, 0xca, 0x8c, 0xfc, 0xe2, 0xcb,
- 0xc8, 0x82, 0xd1, 0x5a, 0xe5, 0x26, 0xbf, 0xd0, 0xcb, 0x47, 0x64, 0xb0, 0x5e, 0xe9, 0xdf, 0x86,
- 0x39, 0xd7, 0xd2, 0xa2, 0xe1, 0x73, 0x68, 0x4d, 0x94, 0xe4, 0x6c, 0x04, 0x8d, 0x44, 0x04, 0xde,
- 0xa1, 0x77, 0xd4, 0x8e, 0x1a, 0x89, 0x60, 0xb7, 0xa1, 0xb7, 0xe6, 0x4a, 0x66, 0x26, 0x11, 0x41,
- 0x83, 0xd0, 0xca, 0x67, 0x0c, 0x5a, 0x19, 0xbf, 0x90, 0x41, 0xf3, 0xd0, 0x3b, 0xf2, 0x23, 0xb2,
- 0xc3, 0xef, 0x9b, 0xd0, 0x79, 0xc6, 0x2f, 0xa4, 0xaa, 0x2f, 0xe5, 0xd3, 0x52, 0x65, 0x7a, 0x63,
- 0x93, 0x8e, 0x98, 0xb9, 0x5a, 0xdb, 0x25, 0xda, 0x11, 0xd9, 0x88, 0x71, 0x21, 0x54, 0xd0, 0xb2,
- 0x79, 0x68, 0xb3, 0x9b, 0xd0, 0xe1, 0x4a, 0xf2, 0x44, 0x04, 0x6d, 0xca, 0x74, 0x1e, 0xfb, 0x1d,
- 0xf8, 0x69, 0x9e, 0x2d, 0x13, 0x53, 0x08, 0x19, 0x74, 0x0e, 0xbd, 0xa3, 0x46, 0xb4, 0x01, 0xb0,
- 0xf8, 0x94, 0x1b, 0x1b, 0xec, 0x52, 0xb0, 0xf2, 0x71, 0x17, 0x65, 0xf4, 0x3a, 0xe8, 0xd9, 0x5d,
- 0xd0, 0xa6, 0x8a, 0xd7, 0x81, 0xef, 0x2a, 0x5e, 0x63, 0xce, 0x3a, 0x57, 0x26, 0x00, 0x5b, 0x1d,
- 0xda, 0xb8, 0x66, 0xa1, 0xa5, 0xa2, 0x93, 0xf4, 0x29, 0xb3, 0xf2, 0x2d, 0x59, 0x5a, 0xbf, 0xcd,
- 0x95, 0x08, 0x06, 0x36, 0x56, 0xfa, 0xec, 0x06, 0xb4, 0xe7, 0x8a, 0x67, 0x22, 0x18, 0x52, 0xc0,
- 0x3a, 0xf8, 0x85, 0x92, 0x5a, 0xaa, 0x4b, 0x29, 0x82, 0x91, 0xfd, 0xa2, 0xf4, 0xd9, 0x5d, 0x80,
- 0x44, 0xc7, 0xaa, 0xc8, 0xb2, 0x24, 0x5b, 0x06, 0xfb, 0x87, 0xde, 0x51, 0x2f, 0xf2, 0x13, 0x1d,
- 0x59, 0x00, 0xc3, 0xaa, 0xc8, 0x62, 0x99, 0xf1, 0x79, 0x2a, 0x83, 0xb1, 0x0d, 0xab, 0x22, 0xfb,
- 0x0b, 0x01, 0xec, 0xb7, 0xd0, 0xc3, 0x30, 0xb1, 0x7b, 0x8d, 0xea, 0xef, 0xaa, 0x22, 0x9b, 0x21,
- 0xc1, 0x21, 0x0c, 0x31, 0x44, 0xdb, 0xa8, 0x38, 0x11, 0x01, 0xa3, 0x9d, 0xfb, 0xaa, 0xc8, 0x4e,
- 0x09, 0x9b, 0x0a, 0x76, 0x0f, 0x06, 0x3a, 0xe3, 0x6b, 0x7d, 0x9e, 0x9b, 0xb8, 0x50, 0x69, 0x70,
- 0xdd, 0xa6, 0x94, 0xd8, 0x6b, 0x95, 0x86, 0x0b, 0xb8, 0x66, 0x3b, 0x3d, 0xc9, 0xc4, 0x8c, 0xeb,
- 0xd5, 0x34, 0x3b, 0xcb, 0xd9, 0x11, 0x74, 0x16, 0x04, 0x52, 0xe3, 0xfb, 0xc7, 0xe3, 0x47, 0x95,
- 0xfc, 0x6c, 0x72, 0xe4, 0xe2, 0xec, 0x01, 0xb4, 0x0d, 0xd7, 0x2b, 0x1d, 0x34, 0x0e, 0x9b, 0x47,
- 0xfd, 0xe3, 0xd1, 0x26, 0x11, 0x17, 0x8b, 0x6c, 0x30, 0xfc, 0xc6, 0x83, 0x16, 0xfa, 0xa8, 0x00,
- 0x44, 0x2a, 0x45, 0x39, 0x0f, 0x19, 0x44, 0xab, 0xa6, 0xac, 0xca, 0x67, 0x77, 0xc0, 0x5f, 0x28,
- 0xc9, 0x8d, 0x8c, 0xb9, 0x71, 0x2a, 0xed, 0x59, 0x60, 0x62, 0x6a, 0xc1, 0xf9, 0x95, 0xd3, 0x9a,
- 0x0b, 0x3e, 0xbd, 0xc2, 0x60, 0xb1, 0x16, 0xee, 0xcb, 0xb6, 0x6b, 0x33, 0x01, 0x13, 0x83, 0xa5,
- 0x38, 0xd6, 0x3b, 0xc4, 0xba, 0xf3, 0x90, 0xf2, 0x44, 0xc7, 0x3c, 0xe5, 0xea, 0x82, 0xe4, 0xd6,
- 0x8b, 0xba, 0x89, 0x9e, 0xa0, 0x8b, 0x21, 0x21, 0xd3, 0xf8, 0x2c, 0xe5, 0x4b, 0x52, 0x5c, 0x2f,
- 0xea, 0x0a, 0x99, 0x3e, 0x4f, 0xf9, 0x32, 0x9c, 0x41, 0x1f, 0x0f, 0x78, 0x2a, 0x2c, 0x81, 0x21,
- 0xb4, 0xb0, 0x7e, 0x47, 0xdf, 0x2e, 0x2b, 0x14, 0x63, 0xf7, 0xa0, 0xa5, 0x45, 0xc5, 0xdc, 0x70,
- 0x93, 0x73, 0x2a, 0x56, 0x11, 0x85, 0xc2, 0xef, 0x1a, 0x00, 0x96, 0x70, 0x62, 0x6f, 0xf7, 0x2e,
- 0xe2, 0xe1, 0x29, 0x1a, 0xbb, 0x7b, 0x8d, 0x87, 0x27, 0x60, 0x2a, 0xd8, 0x2d, 0xe8, 0xe2, 0x36,
- 0x18, 0x6a, 0x6e, 0xb8, 0x9e, 0x0a, 0xf6, 0x67, 0xf0, 0x4d, 0x72, 0x21, 0x63, 0x55, 0xa4, 0x32,
- 0x68, 0xd1, 0xe6, 0xb5, 0xfe, 0x9e, 0xf0, 0xab, 0x67, 0x26, 0x8d, 0x7a, 0x98, 0x12, 0x15, 0xa9,
- 0x24, 0x85, 0x4a, 0xbe, 0x30, 0x36, 0xdf, 0xb2, 0xe8, 0x13, 0x42, 0xe1, 0x7b, 0x30, 0xb0, 0x61,
- 0x21, 0x2f, 0x93, 0x85, 0x25, 0x13, 0x55, 0x88, 0xd8, 0x09, 0x41, 0x5b, 0xb4, 0x75, 0xb7, 0x68,
- 0x63, 0xbf, 0x87, 0xbe, 0xeb, 0x50, 0x8d, 0x54, 0xb0, 0x10, 0x25, 0x6c, 0xba, 0xe4, 0x6f, 0x75,
- 0x89, 0x41, 0x4b, 0xd7, 0x2e, 0x35, 0xda, 0x78, 0xe2, 0x44, 0xc7, 0x67, 0x45, 0x9a, 0xd2, 0x9d,
- 0xee, 0x45, 0x9d, 0x44, 0x3f, 0x2f, 0xd2, 0x94, 0x1d, 0xc2, 0x20, 0x4d, 0xb2, 0x55, 0x5c, 0xf2,
- 0x61, 0x6f, 0x35, 0x20, 0x46, 0x92, 0x17, 0xe1, 0xdf, 0x61, 0xe4, 0x78, 0x4e, 0x2e, 0x24, 0x1e,
- 0xf4, 0x8b, 0xe6, 0xde, 0x9d, 0x3a, 0x93, 0x4e, 0x99, 0x25, 0x6f, 0xe1, 0x4b, 0xe8, 0x58, 0x2e,
- 0xd9, 0x18, 0x9a, 0x82, 0x5f, 0xb9, 0x71, 0x8c, 0x26, 0x3b, 0x06, 0xb0, 0x1f, 0xf2, 0x6c, 0x29,
- 0x9d, 0x00, 0xae, 0xd7, 0x44, 0x82, 0x6b, 0x60, 0x28, 0xa2, 0xf5, 0xc9, 0x0c, 0x1f, 0x83, 0x5f,
- 0xe1, 0x38, 0x87, 0xb4, 0xe1, 0xca, 0xb8, 0x02, 0xad, 0x83, 0x1b, 0xc9, 0xac, 0x54, 0x02, 0x9a,
- 0xe1, 0x1b, 0xe8, 0xbe, 0xca, 0xd3, 0xab, 0x65, 0x9e, 0x7d, 0xd1, 0x81, 0xfe, 0x08, 0x9d, 0x75,
- 0x9e, 0x64, 0x46, 0x07, 0x4d, 0xaa, 0x69, 0x7f, 0x53, 0xd3, 0x2b, 0xc4, 0x23, 0x17, 0x0e, 0x17,
- 0x15, 0x5f, 0x5c, 0xaf, 0x26, 0x6a, 0xa9, 0xb7, 0xb5, 0xe8, 0xed, 0x68, 0xf1, 0x09, 0xf8, 0xc4,
- 0x3d, 0x57, 0xcb, 0x52, 0xef, 0xb7, 0xb6, 0xef, 0xc4, 0x5f, 0x55, 0x5e, 0xac, 0x71, 0x21, 0x7b,
- 0xf1, 0xd1, 0x0a, 0xff, 0x09, 0xc3, 0xad, 0x50, 0x5d, 0xd2, 0xde, 0x96, 0xa4, 0x9f, 0x40, 0x7f,
- 0x89, 0x59, 0xd4, 0x09, 0xfd, 0x29, 0xa1, 0xb4, 0x04, 0x76, 0x25, 0x82, 0x65, 0x69, 0xea, 0xf0,
- 0x7f, 0x1e, 0xf8, 0x55, 0x04, 0x55, 0x6a, 0xd7, 0xa8, 0x56, 0xef, 0x92, 0x3f, 0xa5, 0x19, 0x6e,
- 0x43, 0x46, 0xbe, 0x33, 0x8e, 0x30, 0x9f, 0x90, 0x99, 0x7c, 0x67, 0x50, 0xc4, 0x34, 0x2e, 0xe2,
- 0x54, 0x5e, 0xca, 0xd4, 0xbd, 0x82, 0x40, 0xd0, 0x0b, 0x44, 0x70, 0x48, 0xda, 0xc2, 0x5a, 0xbb,
- 0x43, 0x92, 0x6a, 0xb2, 0x41, 0x2c, 0x40, 0x4b, 0x63, 0x67, 0xbd, 0xbd, 0x66, 0x5d, 0x2d, 0x0d,
- 0xce, 0xfa, 0xf0, 0x87, 0x06, 0xb4, 0xa2, 0xcf, 0xa9, 0xf2, 0x01, 0x8c, 0x1c, 0xeb, 0x25, 0x31,
- 0xb6, 0xba, 0xc1, 0xa2, 0xea, 0xce, 0x74, 0x67, 0x4e, 0x34, 0x77, 0x7a, 0x73, 0x17, 0x60, 0x6d,
- 0x25, 0x82, 0x51, 0x3b, 0x42, 0x7d, 0x87, 0x4c, 0x05, 0xfb, 0x0d, 0x74, 0xb4, 0xa0, 0x95, 0xdb,
- 0x4e, 0x6a, 0x02, 0x97, 0x0c, 0x61, 0x88, 0x30, 0x57, 0xcb, 0x98, 0xa7, 0x09, 0xd7, 0xe5, 0xbd,
- 0xd7, 0x02, 0x7b, 0x37, 0x41, 0x08, 0x87, 0x7a, 0xbe, 0x96, 0x8a, 0x9b, 0x5c, 0xd1, 0xbd, 0xf7,
- 0xa3, 0xca, 0x67, 0xf7, 0x61, 0x58, 0xda, 0xf6, 0xc4, 0xf6, 0x05, 0x1f, 0x94, 0x60, 0xf9, 0xc4,
- 0x95, 0x9b, 0x5c, 0xf2, 0xb4, 0x90, 0xee, 0x51, 0x77, 0x9b, 0xbc, 0x41, 0xe8, 0xb3, 0x83, 0x80,
- 0x9e, 0xc6, 0x54, 0xc6, 0x6f, 0x13, 0x73, 0x1e, 0xaf, 0x55, 0xf9, 0xc4, 0xf7, 0x11, 0xfc, 0x47,
- 0x62, 0xce, 0x5f, 0xa9, 0xed, 0x76, 0x0f, 0xb6, 0xda, 0x1d, 0xfe, 0xbf, 0x01, 0xcd, 0x53, 0xf1,
- 0xe9, 0xb8, 0xc5, 0x06, 0x89, 0x95, 0x2d, 0xb7, 0xe1, 0x1a, 0x24, 0x56, 0x54, 0xa9, 0x0b, 0xd5,
- 0x7e, 0xa4, 0x30, 0xf4, 0x12, 0xef, 0xd4, 0x03, 0x68, 0x91, 0xec, 0x3f, 0x99, 0xb4, 0xa7, 0x74,
- 0x8a, 0x88, 0xa2, 0x78, 0x8c, 0x64, 0x91, 0x67, 0x8e, 0x64, 0xb2, 0xf1, 0x3a, 0xe3, 0xa3, 0x6d,
- 0x99, 0x45, 0x13, 0x95, 0xe6, 0x5e, 0x3b, 0x9c, 0x0b, 0x8e, 0x54, 0xb0, 0x10, 0x0e, 0x87, 0xda,
- 0x3c, 0xa5, 0x04, 0x4b, 0xaa, 0x9b, 0xa7, 0x94, 0xb0, 0xf5, 0x5e, 0xfa, 0x3b, 0xef, 0xe5, 0x66,
- 0xd8, 0xc2, 0xee, 0x93, 0x58, 0x0d, 0xf0, 0xbe, 0xfd, 0x0b, 0x29, 0xdf, 0xbd, 0xff, 0x78, 0xd0,
- 0xb1, 0x07, 0xc1, 0x99, 0x64, 0xa5, 0xe0, 0x66, 0x12, 0x39, 0xbf, 0xfa, 0xbf, 0xe8, 0x6f, 0xfe,
- 0x17, 0x2f, 0x0a, 0x6d, 0x48, 0x80, 0xbd, 0x88, 0x6c, 0xc4, 0x8a, 0x2c, 0x29, 0x9f, 0x6e, 0xb2,
- 0x71, 0x17, 0x3b, 0x35, 0x2d, 0x2d, 0xd6, 0xa9, 0x54, 0xd0, 0xdd, 0xa8, 0x20, 0xfc, 0x97, 0x07,
- 0xfb, 0x27, 0xf3, 0x67, 0xe7, 0x98, 0xf0, 0x37, 0xa9, 0x35, 0x5f, 0x4a, 0xf6, 0x27, 0xfc, 0x5d,
- 0xc1, 0x03, 0x62, 0x8d, 0xa3, 0xe3, 0x9b, 0xf5, 0x21, 0x34, 0x4f, 0xa5, 0x4d, 0x16, 0x91, 0x4d,
- 0x72, 0x02, 0x68, 0x54, 0x02, 0x78, 0x08, 0x1d, 0xbe, 0x30, 0x49, 0x9e, 0x51, 0xe5, 0xa3, 0x63,
- 0x56, 0x7b, 0x36, 0xe7, 0x13, 0x8a, 0x44, 0x2e, 0x83, 0x1a, 0x9a, 0x9d, 0xe5, 0xe5, 0xff, 0x2f,
- 0xda, 0xe1, 0x8f, 0x1e, 0x0c, 0xed, 0xd8, 0xfc, 0xb9, 0xa1, 0xfc, 0x8b, 0x2f, 0xfa, 0x67, 0xfe,
- 0xd4, 0x59, 0x00, 0x5d, 0x77, 0x57, 0xdd, 0x4e, 0xa5, 0x8b, 0x0f, 0xb3, 0x51, 0xc9, 0x72, 0x29,
- 0x55, 0x9c, 0x26, 0x59, 0x39, 0x52, 0xfa, 0x0e, 0x7b, 0x91, 0x64, 0x92, 0xfd, 0x01, 0x46, 0x22,
- 0x51, 0x92, 0x0a, 0xb6, 0x49, 0x96, 0xd4, 0x61, 0x85, 0x52, 0x5a, 0xd9, 0xae, 0x6e, 0xad, 0x5d,
- 0xf7, 0x61, 0x28, 0xe4, 0x99, 0xcc, 0x16, 0x32, 0xd6, 0x86, 0x1b, 0x2b, 0xb5, 0x76, 0x34, 0x70,
- 0xe0, 0x29, 0x62, 0x0f, 0xff, 0xeb, 0xc1, 0xa0, 0xce, 0x2b, 0x1b, 0x40, 0x6f, 0x16, 0x5b, 0x06,
- 0xc6, 0x7b, 0x6c, 0x0c, 0x83, 0xd2, 0xc3, 0x41, 0x35, 0xf6, 0xd8, 0x0d, 0x18, 0xd7, 0x11, 0x1c,
- 0xfa, 0xe3, 0x06, 0x03, 0xe8, 0xcc, 0x62, 0xca, 0x68, 0xb2, 0x21, 0xf8, 0xd6, 0x3e, 0x15, 0xab,
- 0x71, 0x8b, 0x5d, 0x83, 0x61, 0xe5, 0xe2, 0x80, 0x1c, 0xb7, 0x99, 0x0f, 0xed, 0x59, 0x8c, 0xd1,
- 0x0e, 0xbb, 0x0e, 0xfb, 0xe5, 0x72, 0x8e, 0xf0, 0x71, 0x97, 0x8d, 0x00, 0x66, 0xf1, 0xcc, 0xbd,
- 0xd2, 0xe3, 0xde, 0xc3, 0x47, 0xd0, 0x2b, 0x9b, 0x87, 0x3b, 0x4d, 0x33, 0x2d, 0x95, 0x19, 0xef,
- 0xa1, 0xfd, 0x9a, 0xee, 0xcd, 0xd8, 0x43, 0xfb, 0x44, 0xa6, 0xd2, 0xc8, 0x71, 0xe3, 0x69, 0xf0,
- 0xd5, 0x87, 0x03, 0xef, 0xfd, 0x87, 0x03, 0xef, 0xdb, 0x0f, 0x07, 0xde, 0xbf, 0x3f, 0x1e, 0xec,
- 0xbd, 0xff, 0x78, 0xb0, 0xf7, 0xf5, 0xc7, 0x83, 0xbd, 0x79, 0x87, 0xd4, 0xf0, 0xf8, 0xa7, 0x00,
- 0x00, 0x00, 0xff, 0xff, 0xc3, 0xf9, 0xcb, 0x98, 0xac, 0x0d, 0x00, 0x00,
+ // 1548 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x4f, 0x8f, 0xdc, 0x4a,
+ 0x11, 0x5f, 0xcf, 0x5f, 0xbb, 0xe6, 0xcf, 0x4e, 0x3a, 0xe1, 0x3d, 0x93, 0xc7, 0x5b, 0x36, 0x4e,
+ 0x10, 0xab, 0x08, 0x72, 0xd8, 0xe4, 0x0b, 0x4c, 0xb2, 0x04, 0x8d, 0x14, 0xa2, 0xe0, 0x9d, 0x84,
+ 0x1b, 0x56, 0xcf, 0x74, 0xef, 0xac, 0x35, 0x5e, 0x7b, 0xd4, 0xdd, 0xde, 0x64, 0x3f, 0x05, 0x1c,
+ 0x39, 0x73, 0x41, 0x7c, 0x13, 0x8e, 0x39, 0x72, 0x03, 0x25, 0x12, 0x17, 0xc4, 0x57, 0x40, 0xa8,
+ 0xaa, 0xdb, 0x1e, 0xcf, 0x64, 0x79, 0xca, 0xad, 0xea, 0x57, 0xe5, 0x76, 0xf5, 0xaf, 0x7e, 0x5d,
+ 0xdd, 0x30, 0xde, 0xa8, 0xc2, 0x14, 0x57, 0x7a, 0xf5, 0x84, 0x0c, 0xe6, 0x57, 0xfe, 0x7d, 0x58,
+ 0x70, 0x2d, 0x2d, 0x1a, 0xbd, 0x84, 0xce, 0x54, 0x49, 0xce, 0xc6, 0xd0, 0x4a, 0x45, 0xe8, 0x1d,
+ 0x7b, 0x27, 0xdd, 0xb8, 0x95, 0x0a, 0x76, 0x1f, 0xfc, 0x0d, 0x57, 0x32, 0x37, 0xa9, 0x08, 0x5b,
+ 0x84, 0xd6, 0x3e, 0x63, 0xd0, 0xc9, 0xf9, 0x95, 0x0c, 0xdb, 0xc7, 0xde, 0x49, 0x10, 0x93, 0x1d,
+ 0xfd, 0xb7, 0x0d, 0xbd, 0x17, 0xfc, 0x4a, 0xaa, 0xe6, 0x52, 0x01, 0x2d, 0x55, 0xa5, 0xb7, 0xb6,
+ 0xe9, 0xec, 0x1e, 0x74, 0x79, 0x96, 0x72, 0xed, 0xd6, 0xb0, 0x0e, 0x7b, 0x00, 0x43, 0x9d, 0xf3,
+ 0x8d, 0xbe, 0x2c, 0x4c, 0x52, 0xaa, 0x2c, 0xec, 0x50, 0x70, 0x50, 0x61, 0x6f, 0x55, 0x86, 0x8b,
+ 0x99, 0x9b, 0x8d, 0x0c, 0xbb, 0x54, 0x13, 0xd9, 0x88, 0x71, 0x21, 0x54, 0xd8, 0xb3, 0x3f, 0x40,
+ 0x9b, 0x7d, 0x03, 0x3d, 0xae, 0x24, 0x4f, 0x45, 0xd8, 0xa7, 0x4c, 0xe7, 0xb1, 0x9f, 0x40, 0x90,
+ 0x15, 0xf9, 0x2a, 0x35, 0xa5, 0x90, 0xa1, 0x7f, 0xec, 0x9d, 0xb4, 0xe2, 0x2d, 0x80, 0xbb, 0xce,
+ 0xb8, 0xb1, 0xc1, 0x80, 0x82, 0xb5, 0x8f, 0x7f, 0x51, 0x46, 0x6f, 0x42, 0xb0, 0x7f, 0x41, 0x9b,
+ 0xb6, 0xba, 0x09, 0x07, 0x6e, 0xab, 0x1b, 0xcc, 0xd9, 0x14, 0xca, 0x84, 0x43, 0x5b, 0x1d, 0xda,
+ 0xb8, 0x66, 0xa9, 0xa5, 0x22, 0x0a, 0x46, 0x94, 0x59, 0xfb, 0x96, 0x65, 0xad, 0xdf, 0x17, 0x4a,
+ 0x84, 0x63, 0x1b, 0xab, 0x7c, 0xa4, 0x68, 0xa1, 0x78, 0x2e, 0xc2, 0x43, 0x4b, 0x11, 0x39, 0xf8,
+ 0x85, 0x92, 0x5a, 0xaa, 0x6b, 0x29, 0xc2, 0x89, 0xfd, 0xa2, 0xf2, 0xd9, 0xf7, 0x00, 0xa9, 0x4e,
+ 0x54, 0x99, 0xe7, 0x69, 0xbe, 0x0a, 0xef, 0x1c, 0x7b, 0x27, 0x7e, 0x1c, 0xa4, 0x3a, 0xb6, 0x00,
+ 0x86, 0x55, 0x99, 0x27, 0x32, 0xe7, 0x8b, 0x4c, 0x86, 0xcc, 0x86, 0x55, 0x99, 0xff, 0x8a, 0x00,
+ 0xf6, 0x63, 0xf0, 0x31, 0x4c, 0xec, 0xde, 0xa5, 0xfa, 0xfb, 0xaa, 0xcc, 0xe7, 0x48, 0x70, 0x04,
+ 0x23, 0x0c, 0xd1, 0x6f, 0x54, 0x92, 0x8a, 0xf0, 0x9e, 0x6d, 0x8c, 0x2a, 0xf3, 0x73, 0xc2, 0x66,
+ 0x22, 0x5a, 0xc2, 0x1d, 0xdb, 0xff, 0x69, 0x2e, 0xe6, 0x5c, 0xaf, 0x67, 0xf9, 0x45, 0xc1, 0x4e,
+ 0xa0, 0xb7, 0x24, 0x90, 0xe4, 0x30, 0x38, 0x9d, 0x3c, 0xa9, 0x45, 0x69, 0x93, 0x63, 0x17, 0x67,
+ 0x8f, 0xa0, 0x6b, 0xb8, 0x5e, 0xeb, 0xb0, 0x75, 0xdc, 0x3e, 0x19, 0x9c, 0x8e, 0xb7, 0x89, 0xb8,
+ 0x58, 0x6c, 0x83, 0xd1, 0x3f, 0x3c, 0xe8, 0xa0, 0x8f, 0xed, 0x45, 0xa4, 0xd6, 0x99, 0xf3, 0x90,
+ 0x1e, 0xb4, 0x1a, 0x7a, 0xab, 0x7d, 0xf6, 0x1d, 0x04, 0x4b, 0x25, 0xb9, 0x91, 0x09, 0x37, 0x4e,
+ 0x77, 0xbe, 0x05, 0xa6, 0xa6, 0x11, 0x5c, 0xdc, 0x38, 0xdd, 0xb9, 0xe0, 0xf3, 0x1b, 0x0c, 0x96,
+ 0x1b, 0xe1, 0xbe, 0xec, 0xba, 0x1e, 0x12, 0x30, 0x35, 0x58, 0x8a, 0xa3, 0xb4, 0x47, 0x94, 0x3a,
+ 0x0f, 0xf9, 0x4c, 0x75, 0xc2, 0x33, 0xae, 0xae, 0x48, 0x83, 0x7e, 0xdc, 0x4f, 0xf5, 0x14, 0x5d,
+ 0x0c, 0x09, 0x99, 0x25, 0x17, 0x19, 0x5f, 0x91, 0x06, 0xfd, 0xb8, 0x2f, 0x64, 0xf6, 0x32, 0xe3,
+ 0xab, 0x68, 0x0e, 0x03, 0xdc, 0xe0, 0xb9, 0xb0, 0x04, 0x46, 0xd0, 0xc1, 0xfa, 0x1d, 0x7d, 0xfb,
+ 0xac, 0x50, 0x8c, 0x3d, 0x80, 0x8e, 0x16, 0x35, 0x73, 0xa3, 0x6d, 0xce, 0xb9, 0x58, 0xc7, 0x14,
+ 0x8a, 0xfe, 0xd5, 0x02, 0xb0, 0x84, 0x13, 0x7b, 0xfb, 0x27, 0x14, 0x37, 0x4f, 0xd1, 0xc4, 0x9d,
+ 0x76, 0xdc, 0x3c, 0x01, 0x33, 0xc1, 0xbe, 0x85, 0x3e, 0xfe, 0x06, 0x43, 0xed, 0x2d, 0xd7, 0x33,
+ 0xc1, 0x7e, 0x09, 0x81, 0x49, 0xaf, 0x64, 0xa2, 0xca, 0x4c, 0x86, 0x1d, 0xfa, 0x79, 0xa3, 0xbf,
+ 0x67, 0xfc, 0xe6, 0x85, 0xc9, 0x62, 0x1f, 0x53, 0xe2, 0x32, 0x93, 0x24, 0x3f, 0xc9, 0x97, 0xc6,
+ 0xe6, 0x5b, 0x16, 0x03, 0x42, 0x28, 0xfc, 0x00, 0x86, 0x36, 0x2c, 0xe4, 0x75, 0xba, 0x94, 0xee,
+ 0x30, 0x0f, 0x08, 0x3b, 0x23, 0x68, 0x87, 0xb6, 0xfe, 0x0e, 0x6d, 0xec, 0xa7, 0x30, 0x70, 0x1d,
+ 0x6a, 0x90, 0x0a, 0x16, 0xa2, 0x84, 0x6d, 0x97, 0x82, 0x9d, 0x2e, 0x31, 0xe8, 0x68, 0x3c, 0xb1,
+ 0x60, 0x4f, 0x2c, 0xda, 0xb8, 0xe3, 0x54, 0x27, 0x17, 0x65, 0x96, 0xd1, 0xd1, 0xf6, 0xe3, 0x5e,
+ 0xaa, 0x5f, 0x96, 0x59, 0xc6, 0x8e, 0x61, 0x98, 0xa5, 0xf9, 0x3a, 0xa9, 0xf8, 0x18, 0x52, 0x8d,
+ 0x80, 0x18, 0x49, 0x5e, 0x44, 0xbf, 0x85, 0xb1, 0xe3, 0x39, 0xbd, 0x92, 0xb8, 0xd1, 0xaf, 0x9a,
+ 0x86, 0xdf, 0x35, 0x99, 0x74, 0xca, 0xac, 0x78, 0x8b, 0x5e, 0x43, 0xcf, 0x72, 0xc9, 0x26, 0xd0,
+ 0x16, 0xfc, 0xc6, 0x0d, 0x69, 0x34, 0xd9, 0x29, 0x80, 0xfd, 0x90, 0xe7, 0x2b, 0xe9, 0x04, 0x70,
+ 0xb7, 0x21, 0x12, 0x5c, 0x03, 0x43, 0x31, 0xad, 0x4f, 0x66, 0xf4, 0x14, 0x82, 0x1a, 0xc7, 0x21,
+ 0xa3, 0x0d, 0x57, 0xc6, 0x15, 0x68, 0x1d, 0xfc, 0x91, 0xcc, 0x2b, 0x25, 0xa0, 0x19, 0xbd, 0x83,
+ 0xfe, 0x9b, 0x22, 0xbb, 0x59, 0x15, 0xf9, 0x57, 0x6d, 0xe8, 0xe7, 0xd0, 0xdb, 0x14, 0x69, 0x6e,
+ 0x70, 0xbe, 0x63, 0x4d, 0x87, 0xdb, 0x9a, 0xde, 0x20, 0x1e, 0xbb, 0x70, 0xb4, 0xac, 0xf9, 0xe2,
+ 0x7a, 0x3d, 0x55, 0x2b, 0xbd, 0xab, 0x45, 0x6f, 0x4f, 0x8b, 0xcf, 0x20, 0x20, 0xee, 0xb9, 0x5a,
+ 0x55, 0x7a, 0xff, 0x76, 0xf7, 0x4c, 0xfc, 0x5a, 0x15, 0xe5, 0x06, 0x17, 0xb2, 0x07, 0x1f, 0xad,
+ 0xe8, 0xf7, 0x30, 0xda, 0x09, 0x35, 0x25, 0xed, 0xed, 0x48, 0xfa, 0x19, 0x0c, 0x56, 0x98, 0x45,
+ 0x9d, 0xd0, 0x5f, 0x12, 0x4a, 0x4b, 0x60, 0x57, 0x62, 0x58, 0x55, 0xa6, 0x8e, 0xfe, 0xe2, 0x41,
+ 0x50, 0x47, 0x50, 0xa5, 0x76, 0x8d, 0x7a, 0xf5, 0x3e, 0xf9, 0x33, 0x1a, 0xd0, 0x36, 0x64, 0xe4,
+ 0x07, 0xe3, 0x08, 0x0b, 0x08, 0x99, 0xcb, 0x0f, 0x06, 0x45, 0x4c, 0xe3, 0x22, 0xc9, 0xe4, 0xb5,
+ 0xcc, 0x48, 0x08, 0xdd, 0x18, 0x08, 0x7a, 0x85, 0x08, 0x0e, 0x49, 0x5b, 0x58, 0x67, 0x7f, 0x48,
+ 0x52, 0x4d, 0x36, 0x88, 0x05, 0x68, 0x69, 0x92, 0xfa, 0x9a, 0x0c, 0xe2, 0xbe, 0x96, 0x06, 0x07,
+ 0x79, 0xf4, 0xef, 0x16, 0x74, 0xe2, 0xdb, 0x54, 0xf9, 0x08, 0xc6, 0x8e, 0xf5, 0x8a, 0x18, 0x5b,
+ 0xdd, 0x70, 0x59, 0x77, 0x67, 0xb6, 0x37, 0x27, 0xda, 0x7b, 0xbd, 0xf9, 0x1e, 0x60, 0x63, 0x25,
+ 0x82, 0x51, 0x3b, 0x42, 0x03, 0x87, 0xcc, 0x04, 0xfb, 0x11, 0xf4, 0xb4, 0xa0, 0x95, 0xbb, 0x4e,
+ 0x6a, 0x02, 0x97, 0x8c, 0x60, 0x84, 0x30, 0x57, 0xab, 0xc4, 0x3e, 0x08, 0xdc, 0xb9, 0xd7, 0x02,
+ 0x7b, 0x37, 0xa5, 0x67, 0xc1, 0x7d, 0xf0, 0x8b, 0x8d, 0x54, 0xdc, 0x14, 0x8a, 0xce, 0x7d, 0x10,
+ 0xd7, 0x3e, 0x7b, 0x08, 0xa3, 0xca, 0xb6, 0x3b, 0xf6, 0x6d, 0xdd, 0x15, 0x58, 0xdd, 0x5f, 0xd5,
+ 0x4f, 0xae, 0x79, 0x56, 0xda, 0x19, 0x50, 0xff, 0xe4, 0x1d, 0x42, 0xb7, 0x0e, 0x02, 0xba, 0xf7,
+ 0x32, 0x99, 0xbc, 0x4f, 0xcd, 0x65, 0xb2, 0x51, 0xd2, 0xdd, 0xf4, 0x03, 0x04, 0x7f, 0x97, 0x9a,
+ 0xcb, 0x37, 0x6a, 0xb7, 0xdd, 0xc3, 0x9d, 0x76, 0x47, 0x7f, 0x6d, 0x41, 0xfb, 0x5c, 0x7c, 0x39,
+ 0x6e, 0xb1, 0x41, 0x62, 0x6d, 0xcb, 0x6d, 0xb9, 0x06, 0x89, 0x35, 0x55, 0xea, 0x42, 0x8d, 0xe7,
+ 0x15, 0x86, 0x5e, 0xe3, 0x99, 0x7a, 0x04, 0x1d, 0x92, 0xfd, 0x17, 0x93, 0xf6, 0x9c, 0x76, 0x11,
+ 0x53, 0x14, 0xb7, 0x91, 0x2e, 0x8b, 0xdc, 0x91, 0x4c, 0x36, 0x1e, 0x67, 0x7c, 0x4d, 0x59, 0x66,
+ 0xd1, 0x44, 0xa5, 0xb9, 0xdb, 0x0e, 0xe7, 0x82, 0x23, 0x15, 0x2c, 0x84, 0xc3, 0xa1, 0x31, 0x4f,
+ 0x29, 0xc1, 0x92, 0xea, 0xe6, 0x29, 0x25, 0xec, 0xdc, 0x97, 0xc1, 0xde, 0x7d, 0xb9, 0x1d, 0xb6,
+ 0xb0, 0x7f, 0x25, 0xd6, 0x03, 0x7c, 0x60, 0x9f, 0x18, 0xd5, 0xbd, 0xf7, 0x27, 0x0f, 0x7a, 0x76,
+ 0x23, 0xdb, 0xb7, 0xa1, 0xd7, 0x7c, 0x1b, 0xde, 0x36, 0x66, 0xaa, 0xc7, 0xa0, 0x7b, 0x88, 0x56,
+ 0x8f, 0xc1, 0xab, 0x52, 0x1b, 0x12, 0xa0, 0x1f, 0x93, 0x8d, 0x58, 0x99, 0xa7, 0xd5, 0xd5, 0x4d,
+ 0x36, 0xfe, 0xc5, 0x4e, 0x4d, 0x4b, 0x8b, 0x75, 0x6a, 0x15, 0xf4, 0xb7, 0x2a, 0x88, 0xfe, 0xe0,
+ 0xc1, 0xe1, 0xd9, 0xe2, 0xc5, 0x25, 0x26, 0xfc, 0x46, 0x6a, 0xcd, 0x57, 0x92, 0xfd, 0x02, 0x9f,
+ 0x2b, 0xb8, 0x41, 0xac, 0x71, 0x7c, 0xfa, 0x4d, 0x73, 0x08, 0x2d, 0x32, 0x69, 0x93, 0x45, 0x6c,
+ 0x93, 0x9c, 0x00, 0x5a, 0xb5, 0x00, 0x1e, 0x43, 0x8f, 0x2f, 0x4d, 0x5a, 0xe4, 0x54, 0xf9, 0xf8,
+ 0x94, 0x35, 0xae, 0xcd, 0xc5, 0x94, 0x22, 0xb1, 0xcb, 0xa0, 0x86, 0xe6, 0x17, 0x85, 0x3b, 0x50,
+ 0x64, 0x47, 0xff, 0xf1, 0x60, 0x64, 0xc7, 0xe6, 0xff, 0x1b, 0xca, 0x3f, 0x78, 0xa3, 0xdf, 0xf2,
+ 0x7e, 0x67, 0x21, 0xf4, 0xdd, 0x59, 0x75, 0x7f, 0xaa, 0x5c, 0xbc, 0x98, 0x8d, 0x4a, 0x57, 0x2b,
+ 0xa9, 0x92, 0x2c, 0xcd, 0xab, 0x91, 0x32, 0x70, 0xd8, 0xab, 0x34, 0x97, 0xec, 0x67, 0x30, 0x16,
+ 0xa9, 0x92, 0x54, 0xb0, 0x4d, 0xb2, 0xa4, 0x8e, 0x6a, 0x94, 0xd2, 0xaa, 0x76, 0xf5, 0x1b, 0xed,
+ 0x7a, 0x08, 0x23, 0x21, 0x2f, 0x64, 0xbe, 0x94, 0x89, 0x36, 0xdc, 0x58, 0xa9, 0x75, 0xe3, 0xa1,
+ 0x03, 0xcf, 0x11, 0x7b, 0xfc, 0x67, 0x0f, 0x86, 0x4d, 0x5e, 0xd9, 0x10, 0xfc, 0x79, 0x62, 0x19,
+ 0x98, 0x1c, 0xb0, 0x09, 0x0c, 0x2b, 0x0f, 0x07, 0xd5, 0xc4, 0x63, 0xf7, 0x60, 0xd2, 0x44, 0x70,
+ 0xe8, 0x4f, 0x5a, 0x0c, 0xa0, 0x37, 0x4f, 0x28, 0xa3, 0xcd, 0x46, 0x10, 0x58, 0xfb, 0x5c, 0xac,
+ 0x27, 0x1d, 0x76, 0x07, 0x46, 0xb5, 0x8b, 0x03, 0x72, 0xd2, 0x65, 0x01, 0x74, 0xe7, 0x09, 0x46,
+ 0x7b, 0xec, 0x2e, 0x1c, 0x56, 0xcb, 0x39, 0xc2, 0x27, 0x7d, 0x36, 0x06, 0x98, 0x27, 0x73, 0x77,
+ 0x4b, 0x4f, 0xfc, 0xc7, 0x4f, 0xc0, 0xaf, 0x9a, 0x87, 0x7f, 0x9a, 0xe5, 0x5a, 0x2a, 0x33, 0x39,
+ 0x40, 0xfb, 0x2d, 0x9d, 0x9b, 0x89, 0x87, 0xf6, 0x99, 0xcc, 0xa4, 0x91, 0x93, 0xd6, 0xf3, 0xf0,
+ 0x6f, 0x9f, 0x8e, 0xbc, 0x8f, 0x9f, 0x8e, 0xbc, 0x7f, 0x7e, 0x3a, 0xf2, 0xfe, 0xf8, 0xf9, 0xe8,
+ 0xe0, 0xe3, 0xe7, 0xa3, 0x83, 0xbf, 0x7f, 0x3e, 0x3a, 0x58, 0xf4, 0x48, 0x0d, 0x4f, 0xff, 0x17,
+ 0x00, 0x00, 0xff, 0xff, 0x68, 0x88, 0xf6, 0x3b, 0xc2, 0x0d, 0x00, 0x00,
}
func (m *Area) Marshal() (dAtA []byte, err error) {
@@ -1800,77 +1809,93 @@
i = encodeVarintProtomsg(dAtA, i, uint64(len(m.Name)))
i += copy(dAtA[i:], m.Name)
}
+ if len(m.Alias) > 0 {
+ dAtA[i] = 0x1a
+ i++
+ i = encodeVarintProtomsg(dAtA, i, uint64(len(m.Alias)))
+ i += copy(dAtA[i:], m.Alias)
+ }
+ if len(m.SnapshotUrl) > 0 {
+ dAtA[i] = 0x22
+ i++
+ i = encodeVarintProtomsg(dAtA, i, uint64(len(m.SnapshotUrl)))
+ i += copy(dAtA[i:], m.SnapshotUrl)
+ }
if m.Type != 0 {
- dAtA[i] = 0x18
+ dAtA[i] = 0x28
i++
i = encodeVarintProtomsg(dAtA, i, uint64(m.Type))
}
if len(m.Addr) > 0 {
- dAtA[i] = 0x22
+ dAtA[i] = 0x32
i++
i = encodeVarintProtomsg(dAtA, i, uint64(len(m.Addr)))
i += copy(dAtA[i:], m.Addr)
}
if m.Areaid != 0 {
- dAtA[i] = 0x28
+ dAtA[i] = 0x38
i++
i = encodeVarintProtomsg(dAtA, i, uint64(m.Areaid))
}
if m.Longitude != 0 {
- dAtA[i] = 0x35
+ dAtA[i] = 0x45
i++
encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Longitude))))
i += 4
}
if m.Latitude != 0 {
- dAtA[i] = 0x3d
+ dAtA[i] = 0x4d
i++
encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Latitude))))
i += 4
}
if len(m.Rtsp) > 0 {
- dAtA[i] = 0x42
+ dAtA[i] = 0x52
i++
i = encodeVarintProtomsg(dAtA, i, uint64(len(m.Rtsp)))
i += copy(dAtA[i:], m.Rtsp)
}
if len(m.Ip) > 0 {
- dAtA[i] = 0x4a
+ dAtA[i] = 0x5a
i++
i = encodeVarintProtomsg(dAtA, i, uint64(len(m.Ip)))
i += copy(dAtA[i:], m.Ip)
}
if m.Port != 0 {
- dAtA[i] = 0x50
+ dAtA[i] = 0x60
i++
i = encodeVarintProtomsg(dAtA, i, uint64(m.Port))
}
if len(m.Username) > 0 {
- dAtA[i] = 0x5a
+ dAtA[i] = 0x6a
i++
i = encodeVarintProtomsg(dAtA, i, uint64(len(m.Username)))
i += copy(dAtA[i:], m.Username)
}
if len(m.Password) > 0 {
- dAtA[i] = 0x62
+ dAtA[i] = 0x72
i++
i = encodeVarintProtomsg(dAtA, i, uint64(len(m.Password)))
i += copy(dAtA[i:], m.Password)
}
if len(m.Brand) > 0 {
- dAtA[i] = 0x6a
+ dAtA[i] = 0x7a
i++
i = encodeVarintProtomsg(dAtA, i, uint64(len(m.Brand)))
i += copy(dAtA[i:], m.Brand)
}
if len(m.Reserved) > 0 {
- dAtA[i] = 0x72
+ dAtA[i] = 0x82
+ i++
+ dAtA[i] = 0x1
i++
i = encodeVarintProtomsg(dAtA, i, uint64(len(m.Reserved)))
i += copy(dAtA[i:], m.Reserved)
}
if m.IsRunning {
- dAtA[i] = 0x78
+ dAtA[i] = 0x88
+ i++
+ dAtA[i] = 0x1
i++
if m.IsRunning {
dAtA[i] = 1
@@ -1880,7 +1905,7 @@
i++
}
if m.RunEnable {
- dAtA[i] = 0x80
+ dAtA[i] = 0x90
i++
dAtA[i] = 0x1
i++
@@ -1892,27 +1917,19 @@
i++
}
if m.RunType != 0 {
- dAtA[i] = 0x88
+ dAtA[i] = 0x98
i++
dAtA[i] = 0x1
i++
i = encodeVarintProtomsg(dAtA, i, uint64(m.RunType))
}
if len(m.RunServerId) > 0 {
- dAtA[i] = 0x92
+ dAtA[i] = 0xa2
i++
dAtA[i] = 0x1
i++
i = encodeVarintProtomsg(dAtA, i, uint64(len(m.RunServerId)))
i += copy(dAtA[i:], m.RunServerId)
- }
- if len(m.SnapshotUrl) > 0 {
- dAtA[i] = 0x9a
- i++
- dAtA[i] = 0x1
- i++
- i = encodeVarintProtomsg(dAtA, i, uint64(len(m.SnapshotUrl)))
- i += copy(dAtA[i:], m.SnapshotUrl)
}
return i, nil
}
@@ -2846,6 +2863,14 @@
if l > 0 {
n += 1 + l + sovProtomsg(uint64(l))
}
+ l = len(m.Alias)
+ if l > 0 {
+ n += 1 + l + sovProtomsg(uint64(l))
+ }
+ l = len(m.SnapshotUrl)
+ if l > 0 {
+ n += 1 + l + sovProtomsg(uint64(l))
+ }
if m.Type != 0 {
n += 1 + sovProtomsg(uint64(m.Type))
}
@@ -2887,10 +2912,10 @@
}
l = len(m.Reserved)
if l > 0 {
- n += 1 + l + sovProtomsg(uint64(l))
+ n += 2 + l + sovProtomsg(uint64(l))
}
if m.IsRunning {
- n += 2
+ n += 3
}
if m.RunEnable {
n += 3
@@ -2899,10 +2924,6 @@
n += 2 + sovProtomsg(uint64(m.RunType))
}
l = len(m.RunServerId)
- if l > 0 {
- n += 2 + l + sovProtomsg(uint64(l))
- }
- l = len(m.SnapshotUrl)
if l > 0 {
n += 2 + l + sovProtomsg(uint64(l))
}
@@ -3616,6 +3637,70 @@
m.Name = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Alias", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowProtomsg
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ stringLen |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ intStringLen := int(stringLen)
+ if intStringLen < 0 {
+ return ErrInvalidLengthProtomsg
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthProtomsg
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.Alias = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ case 4:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field SnapshotUrl", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowProtomsg
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ stringLen |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ intStringLen := int(stringLen)
+ if intStringLen < 0 {
+ return ErrInvalidLengthProtomsg
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthProtomsg
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.SnapshotUrl = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ case 5:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType)
}
@@ -3634,7 +3719,7 @@
break
}
}
- case 4:
+ case 6:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Addr", wireType)
}
@@ -3666,7 +3751,7 @@
}
m.Addr = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 5:
+ case 7:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Areaid", wireType)
}
@@ -3685,7 +3770,7 @@
break
}
}
- case 6:
+ case 8:
if wireType != 5 {
return fmt.Errorf("proto: wrong wireType = %d for field Longitude", wireType)
}
@@ -3696,7 +3781,7 @@
v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:]))
iNdEx += 4
m.Longitude = float32(math.Float32frombits(v))
- case 7:
+ case 9:
if wireType != 5 {
return fmt.Errorf("proto: wrong wireType = %d for field Latitude", wireType)
}
@@ -3707,7 +3792,7 @@
v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:]))
iNdEx += 4
m.Latitude = float32(math.Float32frombits(v))
- case 8:
+ case 10:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Rtsp", wireType)
}
@@ -3739,7 +3824,7 @@
}
m.Rtsp = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 9:
+ case 11:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Ip", wireType)
}
@@ -3771,7 +3856,7 @@
}
m.Ip = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 10:
+ case 12:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Port", wireType)
}
@@ -3790,7 +3875,7 @@
break
}
}
- case 11:
+ case 13:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Username", wireType)
}
@@ -3822,7 +3907,7 @@
}
m.Username = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 12:
+ case 14:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Password", wireType)
}
@@ -3854,7 +3939,7 @@
}
m.Password = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 13:
+ case 15:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Brand", wireType)
}
@@ -3886,7 +3971,7 @@
}
m.Brand = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 14:
+ case 16:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Reserved", wireType)
}
@@ -3918,7 +4003,7 @@
}
m.Reserved = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 15:
+ case 17:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field IsRunning", wireType)
}
@@ -3938,7 +4023,7 @@
}
}
m.IsRunning = bool(v != 0)
- case 16:
+ case 18:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field RunEnable", wireType)
}
@@ -3958,7 +4043,7 @@
}
}
m.RunEnable = bool(v != 0)
- case 17:
+ case 19:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field RunType", wireType)
}
@@ -3977,7 +4062,7 @@
break
}
}
- case 18:
+ case 20:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field RunServerId", wireType)
}
@@ -4008,38 +4093,6 @@
return io.ErrUnexpectedEOF
}
m.RunServerId = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 19:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field SnapshotUrl", wireType)
- }
- var stringLen uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowProtomsg
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- stringLen |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthProtomsg
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthProtomsg
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.SnapshotUrl = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
diff --git a/protomsg.proto b/protomsg.proto
index 2a25741..8cb17ba 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -16,24 +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;//褰撳墠姝ｅ湪鍝彴鏈嶅姟鍣ㄤ笂鍋氫换鍔�
- string snapshot_url = 19;//鎽勫儚鏈哄簳鍥惧揩鐓�
+ bool is_running = 17;//鏄惁姝ｅ湪鍋氫换鍔★紙0:鍚︼紝1锛氭槸锛�
+ bool run_enable = 18;//鏄惁鍚敤瀹炴椂鎴栬疆璇�(0:鍚︼紝1锛氭槸)
+ int32 run_type = 19;//鍋氫换鍔＄殑绫诲瀷锛�0锛氳疆璇紝1锛氬疄鏃讹級
+ string run_server_id = 20;//褰撳墠姝ｅ湪鍝彴鏈嶅姟鍣ㄤ笂鍋氫换鍔�
+
}
//鎽勫儚鏈虹殑浠诲姟淇℃伅
--
Gitblit v1.8.0