From 5716d3cb83a460940cc3f5a3408408a3ca88b354 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 23 五月 2019 15:58:03 +0800
Subject: [PATCH] add CameraAndTaskInfo struct

---
 protomsg.proto |    6 +
 protomsg.pb.go |  277 ++++++++++++++++++++++++++++++++----------------------
 2 files changed, 170 insertions(+), 113 deletions(-)

diff --git a/protomsg.pb.go b/protomsg.pb.go
index 6115a59..6b698a8 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -386,6 +386,54 @@
 	return ""
 }
 
+//鎽勫儚鏈虹殑浠诲姟淇℃伅
+type CameraAndTaskInfo struct {
+	Camera               *Camera  `protobuf:"bytes,1,opt,name=camera,proto3" json:"camera,omitempty"`
+	Tasks                []*Task  `protobuf:"bytes,2,rep,name=tasks,proto3" json:"tasks,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CameraAndTaskInfo) Reset()         { *m = CameraAndTaskInfo{} }
+func (m *CameraAndTaskInfo) String() string { return proto.CompactTextString(m) }
+func (*CameraAndTaskInfo) ProtoMessage()    {}
+func (*CameraAndTaskInfo) Descriptor() ([]byte, []int) {
+	return fileDescriptor_32de24555f916688, []int{5}
+}
+
+func (m *CameraAndTaskInfo) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CameraAndTaskInfo.Unmarshal(m, b)
+}
+func (m *CameraAndTaskInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CameraAndTaskInfo.Marshal(b, m, deterministic)
+}
+func (m *CameraAndTaskInfo) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CameraAndTaskInfo.Merge(m, src)
+}
+func (m *CameraAndTaskInfo) XXX_Size() int {
+	return xxx_messageInfo_CameraAndTaskInfo.Size(m)
+}
+func (m *CameraAndTaskInfo) XXX_DiscardUnknown() {
+	xxx_messageInfo_CameraAndTaskInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CameraAndTaskInfo proto.InternalMessageInfo
+
+func (m *CameraAndTaskInfo) GetCamera() *Camera {
+	if m != nil {
+		return m.Camera
+	}
+	return nil
+}
+
+func (m *CameraAndTaskInfo) GetTasks() []*Task {
+	if m != nil {
+		return m.Tasks
+	}
+	return nil
+}
+
 //Task缁撴瀯浣�
 type Task struct {
 	Taskid               string   `protobuf:"bytes,1,opt,name=taskid,proto3" json:"taskid,omitempty"`
@@ -405,7 +453,7 @@
 func (m *Task) String() string { return proto.CompactTextString(m) }
 func (*Task) ProtoMessage()    {}
 func (*Task) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{5}
+	return fileDescriptor_32de24555f916688, []int{6}
 }
 
 func (m *Task) XXX_Unmarshal(b []byte) error {
@@ -494,7 +542,7 @@
 func (m *TaskSdkInfo) String() string { return proto.CompactTextString(m) }
 func (*TaskSdkInfo) ProtoMessage()    {}
 func (*TaskSdkInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{6}
+	return fileDescriptor_32de24555f916688, []int{7}
 }
 
 func (m *TaskSdkInfo) XXX_Unmarshal(b []byte) error {
@@ -552,7 +600,7 @@
 func (m *CameraTask) String() string { return proto.CompactTextString(m) }
 func (*CameraTask) ProtoMessage()    {}
 func (*CameraTask) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{7}
+	return fileDescriptor_32de24555f916688, []int{8}
 }
 
 func (m *CameraTask) XXX_Unmarshal(b []byte) error {
@@ -670,7 +718,7 @@
 func (m *DayCtl) String() string { return proto.CompactTextString(m) }
 func (*DayCtl) ProtoMessage()    {}
 func (*DayCtl) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{8}
+	return fileDescriptor_32de24555f916688, []int{9}
 }
 
 func (m *DayCtl) XXX_Unmarshal(b []byte) error {
@@ -718,7 +766,7 @@
 func (m *TimeRange) String() string { return proto.CompactTextString(m) }
 func (*TimeRange) ProtoMessage()    {}
 func (*TimeRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{9}
+	return fileDescriptor_32de24555f916688, []int{10}
 }
 
 func (m *TimeRange) XXX_Unmarshal(b []byte) error {
@@ -767,7 +815,7 @@
 func (m *Polygon) String() string { return proto.CompactTextString(m) }
 func (*Polygon) ProtoMessage()    {}
 func (*Polygon) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{10}
+	return fileDescriptor_32de24555f916688, []int{11}
 }
 
 func (m *Polygon) XXX_Unmarshal(b []byte) error {
@@ -831,7 +879,7 @@
 func (m *CameraTaskArgs) String() string { return proto.CompactTextString(m) }
 func (*CameraTaskArgs) ProtoMessage()    {}
 func (*CameraTaskArgs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{11}
+	return fileDescriptor_32de24555f916688, []int{12}
 }
 
 func (m *CameraTaskArgs) XXX_Unmarshal(b []byte) error {
@@ -958,7 +1006,7 @@
 func (m *Sdk) String() string { return proto.CompactTextString(m) }
 func (*Sdk) ProtoMessage()    {}
 func (*Sdk) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{12}
+	return fileDescriptor_32de24555f916688, []int{13}
 }
 
 func (m *Sdk) XXX_Unmarshal(b []byte) error {
@@ -1073,7 +1121,7 @@
 func (m *SdkArg) String() string { return proto.CompactTextString(m) }
 func (*SdkArg) ProtoMessage()    {}
 func (*SdkArg) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{13}
+	return fileDescriptor_32de24555f916688, []int{14}
 }
 
 func (m *SdkArg) XXX_Unmarshal(b []byte) error {
@@ -1149,7 +1197,7 @@
 func (m *Point) String() string { return proto.CompactTextString(m) }
 func (*Point) ProtoMessage()    {}
 func (*Point) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{14}
+	return fileDescriptor_32de24555f916688, []int{15}
 }
 
 func (m *Point) XXX_Unmarshal(b []byte) error {
@@ -1198,7 +1246,7 @@
 func (m *Rect) String() string { return proto.CompactTextString(m) }
 func (*Rect) ProtoMessage()    {}
 func (*Rect) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{15}
+	return fileDescriptor_32de24555f916688, []int{16}
 }
 
 func (m *Rect) XXX_Unmarshal(b []byte) error {
@@ -1261,7 +1309,7 @@
 func (m *FaceAngle) String() string { return proto.CompactTextString(m) }
 func (*FaceAngle) ProtoMessage()    {}
 func (*FaceAngle) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{16}
+	return fileDescriptor_32de24555f916688, []int{17}
 }
 
 func (m *FaceAngle) XXX_Unmarshal(b []byte) error {
@@ -1325,7 +1373,7 @@
 func (m *ThftResult) String() string { return proto.CompactTextString(m) }
 func (*ThftResult) ProtoMessage()    {}
 func (*ThftResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{17}
+	return fileDescriptor_32de24555f916688, []int{18}
 }
 
 func (m *ThftResult) XXX_Unmarshal(b []byte) error {
@@ -1399,7 +1447,7 @@
 func (m *FacePos) String() string { return proto.CompactTextString(m) }
 func (*FacePos) ProtoMessage()    {}
 func (*FacePos) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{18}
+	return fileDescriptor_32de24555f916688, []int{19}
 }
 
 func (m *FacePos) XXX_Unmarshal(b []byte) error {
@@ -1495,7 +1543,7 @@
 func (m *FaceInfo) String() string { return proto.CompactTextString(m) }
 func (*FaceInfo) ProtoMessage()    {}
 func (*FaceInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{19}
+	return fileDescriptor_32de24555f916688, []int{20}
 }
 
 func (m *FaceInfo) XXX_Unmarshal(b []byte) error {
@@ -1592,7 +1640,7 @@
 func (m *ObjInfo) String() string { return proto.CompactTextString(m) }
 func (*ObjInfo) ProtoMessage()    {}
 func (*ObjInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{20}
+	return fileDescriptor_32de24555f916688, []int{21}
 }
 
 func (m *ObjInfo) XXX_Unmarshal(b []byte) error {
@@ -1647,7 +1695,7 @@
 func (m *ParamFaceProperty) String() string { return proto.CompactTextString(m) }
 func (*ParamFaceProperty) ProtoMessage()    {}
 func (*ParamFaceProperty) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{21}
+	return fileDescriptor_32de24555f916688, []int{22}
 }
 
 func (m *ParamFaceProperty) XXX_Unmarshal(b []byte) error {
@@ -1695,7 +1743,7 @@
 func (m *ParamFaceCompare) String() string { return proto.CompactTextString(m) }
 func (*ParamFaceCompare) ProtoMessage()    {}
 func (*ParamFaceCompare) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{22}
+	return fileDescriptor_32de24555f916688, []int{23}
 }
 
 func (m *ParamFaceCompare) XXX_Unmarshal(b []byte) error {
@@ -1736,6 +1784,7 @@
 	proto.RegisterType((*Image)(nil), "protomsg.Image")
 	proto.RegisterType((*Area)(nil), "protomsg.Area")
 	proto.RegisterType((*Camera)(nil), "protomsg.Camera")
+	proto.RegisterType((*CameraAndTaskInfo)(nil), "protomsg.CameraAndTaskInfo")
 	proto.RegisterType((*Task)(nil), "protomsg.Task")
 	proto.RegisterType((*TaskSdkInfo)(nil), "protomsg.TaskSdkInfo")
 	proto.RegisterType((*CameraTask)(nil), "protomsg.CameraTask")
@@ -1759,99 +1808,101 @@
 func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
 
 var fileDescriptor_32de24555f916688 = []byte{
-	// 1498 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xcd, 0x6e, 0xdc, 0x46,
-	0x12, 0xc6, 0xfc, 0x93, 0x35, 0x23, 0xad, 0xcd, 0xf5, 0xee, 0xd2, 0xde, 0x3f, 0x99, 0x16, 0x76,
-	0xb5, 0x58, 0xc4, 0x41, 0xe4, 0x7b, 0x00, 0xc5, 0x8a, 0x82, 0x01, 0x6c, 0x59, 0x69, 0x29, 0x0e,
-	0x90, 0x1c, 0x06, 0x3d, 0xec, 0x1e, 0x0e, 0x3d, 0x1c, 0x92, 0xe9, 0x6e, 0x5a, 0xe2, 0x3d, 0x6f,
-	0x93, 0x17, 0xc9, 0x21, 0xef, 0x90, 0x53, 0x2e, 0x79, 0x81, 0x5c, 0x83, 0xaa, 0x6e, 0x72, 0x66,
-	0x2c, 0x19, 0x08, 0x90, 0x6b, 0x6e, 0xf5, 0xc7, 0xea, 0xaa, 0xaf, 0x7e, 0xba, 0x09, 0xfb, 0xa5,
-	0x2a, 0x4c, 0xb1, 0xd6, 0xc9, 0x53, 0x22, 0x02, 0xaf, 0xe1, 0xa3, 0xcf, 0xc1, 0xbf, 0xe2, 0x7a,
-	0xf5, 0x82, 0xcf, 0x65, 0x16, 0xfc, 0x15, 0x86, 0x86, 0xeb, 0x55, 0x2a, 0xc2, 0xce, 0x41, 0xe7,
-	0xc8, 0x67, 0x8e, 0x43, 0xb9, 0x16, 0xab, 0x54, 0xe8, 0xb0, 0x7b, 0xd0, 0x43, 0xb9, 0xe5, 0x82,
-	0x07, 0x30, 0x48, 0x73, 0x21, 0x6f, 0xc2, 0xde, 0x41, 0xe7, 0x68, 0xc0, 0x2c, 0x13, 0x71, 0x80,
-	0x4b, 0xb1, 0x7a, 0x29, 0xb5, 0xe6, 0x89, 0x0c, 0xee, 0x41, 0x2f, 0x6e, 0x1d, 0x22, 0x19, 0x7c,
-	0x00, 0x23, 0xf4, 0x9b, 0xf1, 0x79, 0xd8, 0x3d, 0xe8, 0x1c, 0x8d, 0x8f, 0xff, 0xfc, 0xb4, 0x0d,
-	0xaf, 0x8d, 0x85, 0x35, 0x36, 0x41, 0x00, 0x7d, 0xc1, 0x0d, 0xa7, 0x33, 0x26, 0x8c, 0xe8, 0x68,
-	0x0a, 0x83, 0xe9, 0x1a, 0xbd, 0x3f, 0x80, 0xc1, 0x75, 0x2a, 0xcc, 0x92, 0xfc, 0x0f, 0x98, 0x65,
-	0x30, 0xde, 0xa5, 0x4c, 0x93, 0xa5, 0xa1, 0x03, 0x06, 0xcc, 0x71, 0x77, 0xba, 0x3a, 0x83, 0xfe,
-	0x89, 0x92, 0x3c, 0xd8, 0x87, 0xae, 0x0b, 0x73, 0xc0, 0xba, 0xa9, 0x08, 0x1e, 0x81, 0x57, 0x72,
-	0x25, 0x73, 0x93, 0x0a, 0xe7, 0xa5, 0xe5, 0xd1, 0x4f, 0xce, 0xd7, 0x92, 0xfc, 0xf8, 0x8c, 0xe8,
-	0xe8, 0xfb, 0x2e, 0x0c, 0x9f, 0xf3, 0xb5, 0x54, 0xdb, 0xae, 0x7c, 0x72, 0xd5, 0x98, 0x77, 0x37,
-	0xe6, 0x28, 0x33, 0x75, 0x29, 0x1d, 0x72, 0x44, 0xa3, 0x8c, 0x0b, 0xa1, 0xc2, 0xbe, 0xb5, 0x43,
-	0x1a, 0x53, 0xe1, 0x4a, 0xf2, 0x54, 0x84, 0x03, 0x9b, 0x8a, 0xe5, 0x82, 0x7f, 0x80, 0x9f, 0x15,
-	0x79, 0x92, 0x9a, 0x4a, 0xc8, 0x70, 0x78, 0xd0, 0x39, 0xea, 0xb2, 0x8d, 0x00, 0x83, 0xcf, 0xb8,
-	0xb1, 0xca, 0x11, 0x29, 0x5b, 0x1e, 0x4f, 0x51, 0x46, 0x97, 0xa1, 0x67, 0x4f, 0x41, 0x9a, 0x22,
-	0x2e, 0x43, 0xdf, 0x45, 0x5c, 0xa2, 0x4d, 0x59, 0x28, 0x13, 0x82, 0x8d, 0x0e, 0x69, 0xf4, 0x59,
-	0x69, 0xa9, 0x28, 0x93, 0x31, 0x59, 0xb6, 0xbc, 0x05, 0x4b, 0xeb, 0xeb, 0x42, 0x89, 0x70, 0x62,
-	0x75, 0x0d, 0x8f, 0x25, 0x9a, 0x2b, 0x9e, 0x8b, 0x70, 0x8f, 0x14, 0x96, 0xc1, 0x2f, 0x94, 0xd4,
-	0x52, 0xbd, 0x95, 0x22, 0xdc, 0xb7, 0x5f, 0x34, 0x7c, 0xf4, 0x63, 0x07, 0xfa, 0xd8, 0x08, 0xef,
-	0xed, 0xc7, 0x47, 0xe0, 0x21, 0xb5, 0x05, 0x6a, 0xcb, 0x07, 0x7f, 0x07, 0x3f, 0x56, 0x92, 0x1b,
-	0x39, 0xe3, 0xc6, 0x15, 0xc8, 0xb3, 0x82, 0x13, 0xb3, 0xa5, 0x9c, 0xd7, 0x0e, 0x66, 0xa7, 0xfc,
-	0xa4, 0x46, 0x65, 0x55, 0x0a, 0xf7, 0xe5, 0xc0, 0x65, 0x48, 0x82, 0x13, 0x83, 0xa1, 0xc8, 0x9c,
-	0xcf, 0x33, 0x0b, 0xb6, 0xc7, 0x1c, 0x17, 0x3c, 0x04, 0x2f, 0xd5, 0x33, 0x9e, 0x71, 0xb5, 0x26,
-	0xa4, 0x3d, 0x36, 0x4a, 0xf5, 0x09, 0xb2, 0xa8, 0x12, 0x32, 0x9b, 0x2d, 0x32, 0x9e, 0x10, 0xd8,
-	0x1e, 0x1b, 0x09, 0x99, 0x9d, 0x65, 0x3c, 0x89, 0xae, 0x60, 0x8c, 0x09, 0x5e, 0x8a, 0xd5, 0x34,
-	0x5f, 0x14, 0x41, 0x04, 0x7d, 0x8c, 0x9f, 0xb2, 0x1c, 0x1f, 0xef, 0xef, 0x8e, 0x03, 0x23, 0x5d,
-	0xf0, 0x18, 0xfa, 0x5a, 0xac, 0xec, 0x04, 0x8e, 0x8f, 0xf7, 0x36, 0x36, 0x97, 0x62, 0xc5, 0x48,
-	0x15, 0xfd, 0xdc, 0x05, 0xb0, 0x2d, 0x48, 0xe8, 0xbd, 0xdb, 0x86, 0xff, 0x04, 0x88, 0x49, 0x3b,
-	0xb3, 0x93, 0x8c, 0x72, 0xdf, 0x4a, 0xa6, 0x42, 0x07, 0x7f, 0xb3, 0x63, 0x39, 0x4b, 0x85, 0x83,
-	0x8d, 0xd0, 0x9e, 0xe2, 0xbc, 0xfa, 0x26, 0x5d, 0xcb, 0x99, 0xaa, 0x32, 0x19, 0xf6, 0xe9, 0xf8,
-	0x7b, 0x9b, 0xe3, 0x4f, 0x79, 0xfd, 0xdc, 0x64, 0xcc, 0x43, 0x13, 0x56, 0x65, 0x12, 0x8f, 0x51,
-	0x92, 0xc7, 0xc6, 0xda, 0x5b, 0x1c, 0x7d, 0x92, 0x90, 0xfa, 0x31, 0x4c, 0xac, 0x5a, 0xc8, 0xb7,
-	0x69, 0x6c, 0xe1, 0xf4, 0xd9, 0x98, 0x64, 0xa7, 0x24, 0xda, 0x01, 0x6e, 0xb4, 0x03, 0x5c, 0xf0,
-	0x6f, 0x18, 0xbb, 0x1a, 0x6d, 0xc1, 0x0a, 0x56, 0x44, 0x06, 0x9b, 0x3a, 0xf9, 0x3b, 0x75, 0x0a,
-	0xa0, 0xaf, 0xb7, 0x3a, 0x1a, 0x69, 0xcc, 0x38, 0xd5, 0xb3, 0x45, 0x95, 0x65, 0xd4, 0xd0, 0x1e,
-	0x1b, 0xa6, 0xfa, 0xac, 0xca, 0xb2, 0x20, 0x82, 0xbd, 0x2c, 0xcd, 0x57, 0xb3, 0x44, 0x15, 0x55,
-	0x89, 0x80, 0xd8, 0x9e, 0x1e, 0xa3, 0xf0, 0x33, 0x94, 0x4d, 0x45, 0x74, 0x0e, 0x43, 0x9b, 0x3a,
-	0x6e, 0x38, 0xc1, 0x6b, 0xb7, 0x3a, 0x90, 0x0c, 0x8e, 0x01, 0x2c, 0x62, 0x3c, 0x4f, 0xa4, 0xab,
-	0xd8, 0xf6, 0x92, 0x43, 0xa8, 0x50, 0xc5, 0x08, 0x58, 0x22, 0xa3, 0x67, 0xe0, 0xb7, 0x72, 0x9c,
-	0x19, 0x6d, 0xb8, 0x32, 0xae, 0x7a, 0x96, 0xc1, 0x83, 0x64, 0x2e, 0x5c, 0xe5, 0x90, 0x8c, 0x5e,
-	0xc3, 0xe8, 0xa2, 0xc8, 0xea, 0xa4, 0xc8, 0x7f, 0xd3, 0xd2, 0xf9, 0x2f, 0x0c, 0xcb, 0x22, 0xcd,
-	0x8d, 0x76, 0x65, 0xfc, 0xd3, 0x26, 0xa6, 0x0b, 0x94, 0x33, 0xa7, 0x8e, 0x7e, 0xe9, 0xc2, 0xfe,
-	0xa6, 0x93, 0x4e, 0x54, 0xa2, 0x6f, 0xf9, 0x3f, 0x84, 0x7d, 0xd7, 0x4d, 0x4d, 0xd7, 0xd8, 0x93,
-	0x26, 0x71, 0xfb, 0xdd, 0x54, 0xd0, 0xc0, 0x35, 0x3d, 0xd7, 0x4e, 0xa3, 0x6b, 0x39, 0xec, 0x94,
-	0xd2, 0x46, 0x8f, 0x5a, 0x3b, 0x8e, 0xbe, 0x93, 0x4c, 0x45, 0xf0, 0x17, 0xba, 0x75, 0x66, 0x6e,
-	0xf5, 0x21, 0x0a, 0x02, 0x5d, 0x46, 0xb0, 0x87, 0x62, 0xae, 0x92, 0x19, 0xcf, 0x52, 0xae, 0x9b,
-	0x0e, 0xd2, 0x02, 0x03, 0x3d, 0x41, 0x11, 0x2e, 0x88, 0xa2, 0x94, 0x8a, 0x9b, 0x42, 0x51, 0x07,
-	0xf9, 0xac, 0xe5, 0x83, 0x27, 0xb0, 0xd7, 0xd0, 0x33, 0x5a, 0xc1, 0x76, 0x11, 0x4e, 0x1a, 0xe1,
-	0x15, 0xae, 0xe2, 0xad, 0x43, 0xde, 0xf2, 0xac, 0x92, 0x6e, 0x37, 0xba, 0x43, 0x5e, 0xa3, 0xe8,
-	0xce, 0x96, 0x3a, 0x84, 0x7d, 0x6c, 0xfb, 0xd9, 0x75, 0x6a, 0x96, 0xb3, 0x5c, 0xde, 0x18, 0xb7,
-	0x2a, 0x27, 0x28, 0xfd, 0x32, 0x35, 0xcb, 0x73, 0x79, 0x63, 0xb0, 0xc1, 0xdf, 0x69, 0xad, 0x51,
-	0xe2, 0xda, 0xea, 0xbb, 0x2e, 0xf4, 0x2e, 0xc5, 0xed, 0xe1, 0x7d, 0x08, 0x1e, 0x06, 0x44, 0x01,
-	0x5b, 0xa0, 0x47, 0x5a, 0xac, 0x28, 0x56, 0xa7, 0xda, 0xba, 0x91, 0x50, 0x75, 0x8e, 0x05, 0x3f,
-	0x84, 0x3e, 0x57, 0x89, 0xbe, 0x3d, 0xb5, 0x97, 0x94, 0x07, 0x23, 0x2d, 0x26, 0x92, 0xc6, 0x45,
-	0xee, 0x60, 0x26, 0x1a, 0x7b, 0xad, 0x52, 0x99, 0xc3, 0x16, 0x49, 0x1c, 0x3d, 0xb7, 0x3b, 0xb1,
-	0x69, 0x1d, 0xac, 0x60, 0x45, 0xd8, 0xb9, 0x5b, 0xb3, 0x49, 0x06, 0x16, 0x56, 0x37, 0x9b, 0x64,
-	0xb0, 0xb3, 0x7d, 0xfd, 0x77, 0xb6, 0x6f, 0x08, 0x23, 0x3b, 0xaa, 0x82, 0x00, 0xf5, 0x59, 0xc3,
-	0xee, 0xac, 0x03, 0x8b, 0x66, 0xbb, 0x47, 0xbf, 0xed, 0xc0, 0xd0, 0xa6, 0x82, 0x23, 0x63, 0xdb,
-	0xc1, 0xa2, 0x63, 0x99, 0xbb, 0x6e, 0xea, 0xf6, 0xea, 0x75, 0xd7, 0x6c, 0x73, 0xf5, 0xae, 0x2b,
-	0x6d, 0xd7, 0xbe, 0xc7, 0x88, 0x46, 0x8f, 0x76, 0x80, 0x2d, 0x08, 0x96, 0x69, 0xab, 0x3e, 0xda,
-	0x54, 0x3d, 0x7a, 0x02, 0x03, 0x9a, 0x9f, 0x60, 0x02, 0x9d, 0x1b, 0xb7, 0x08, 0x3a, 0x37, 0xc8,
-	0xd5, 0xee, 0xed, 0xd0, 0xa9, 0xa3, 0xaf, 0xa0, 0xcf, 0x64, 0x4c, 0x8f, 0x90, 0x4c, 0x2e, 0x8c,
-	0x33, 0x23, 0x1a, 0xd1, 0x36, 0x45, 0xe9, 0x6c, 0x91, 0xa4, 0xc3, 0xe9, 0x05, 0xe3, 0x9e, 0x56,
-	0xc4, 0xe0, 0x76, 0x9b, 0x17, 0xc6, 0x14, 0x6b, 0x0a, 0x7e, 0xc0, 0x1c, 0x17, 0x25, 0xe0, 0x9f,
-	0xf1, 0x58, 0x9e, 0xe4, 0x49, 0x46, 0x2f, 0xae, 0x9a, 0x5f, 0x37, 0xfb, 0xa8, 0xe6, 0xd7, 0xe8,
-	0xac, 0x4c, 0x4d, 0xbc, 0x74, 0x07, 0x58, 0x86, 0x1e, 0x02, 0x45, 0x96, 0x35, 0x4f, 0x10, 0xa4,
-	0x83, 0x7f, 0x01, 0xc4, 0x45, 0xbe, 0x48, 0x85, 0xcc, 0x63, 0x8b, 0x50, 0x97, 0x6d, 0x49, 0xa2,
-	0x1b, 0x80, 0xab, 0xe5, 0xc2, 0x30, 0xa9, 0xab, 0x8c, 0xc2, 0x49, 0x64, 0x2e, 0xa4, 0x72, 0x87,
-	0x39, 0x0e, 0x23, 0xe0, 0x89, 0x6c, 0xd2, 0xe1, 0x16, 0x35, 0xc5, 0xe3, 0xf6, 0xb9, 0x83, 0x34,
-	0x25, 0x23, 0x79, 0x65, 0xea, 0x36, 0x19, 0xe2, 0x68, 0xf9, 0xad, 0x53, 0x77, 0x77, 0x0c, 0x98,
-	0x65, 0xa2, 0x1f, 0xba, 0x30, 0xc2, 0x1c, 0x2f, 0x0a, 0x1d, 0xfc, 0x07, 0x86, 0x2a, 0x46, 0xe6,
-	0xf6, 0x8d, 0x89, 0x10, 0x33, 0xa7, 0xc5, 0x9b, 0xab, 0x34, 0x2f, 0xe4, 0xc2, 0x7c, 0x5a, 0x4b,
-	0xf7, 0xd6, 0xbc, 0xb5, 0xf2, 0x36, 0x16, 0xc1, 0x87, 0x00, 0xa5, 0x61, 0x08, 0x34, 0xda, 0xf7,
-	0xee, 0xb6, 0xdf, 0x32, 0x09, 0xfe, 0x07, 0xa3, 0xd2, 0xbc, 0x2c, 0x2a, 0xb3, 0xa4, 0x14, 0xee,
-	0xb0, 0x6e, 0xf4, 0xb4, 0x7a, 0xcd, 0x79, 0xa1, 0x6d, 0x56, 0x77, 0xae, 0x5e, 0x52, 0x07, 0xff,
-	0x87, 0xe1, 0x82, 0xea, 0x48, 0x6d, 0xb7, 0x73, 0x6f, 0xb4, 0x25, 0x66, 0xce, 0x04, 0x87, 0xe6,
-	0x9b, 0x8a, 0x67, 0xa9, 0xa9, 0x5d, 0x3f, 0x36, 0x2c, 0x16, 0x72, 0xc1, 0xe3, 0x94, 0x67, 0xa7,
-	0xf8, 0xe0, 0xf5, 0xe8, 0xc1, 0xbb, 0x25, 0x89, 0x7e, 0xea, 0x82, 0x87, 0xfe, 0xe8, 0xfd, 0xf1,
-	0x07, 0x9e, 0xbf, 0x17, 0x4f, 0x6c, 0xe6, 0x05, 0xc2, 0x79, 0x4a, 0x8b, 0xad, 0xc7, 0x1c, 0x17,
-	0x7d, 0x01, 0xa3, 0x57, 0xf3, 0x37, 0x84, 0xf2, 0x21, 0x0c, 0x54, 0xfc, 0x6a, 0xfe, 0xe6, 0x3d,
-	0x20, 0x5b, 0x25, 0xad, 0x82, 0x7a, 0xb3, 0x0a, 0x6a, 0xfb, 0x18, 0x57, 0xc5, 0x9c, 0x00, 0xec,
-	0x32, 0xa2, 0xa3, 0xaf, 0xe1, 0xfe, 0x05, 0x57, 0x7c, 0x4d, 0x13, 0xa1, 0xf0, 0xea, 0x32, 0x75,
-	0xf0, 0x04, 0x7a, 0x65, 0xa1, 0x9d, 0xfb, 0xfb, 0xbb, 0x79, 0x5e, 0x14, 0x9a, 0xa1, 0x36, 0x78,
-	0x0c, 0xbd, 0x74, 0x9d, 0xdc, 0xae, 0x1e, 0xfd, 0x4f, 0x31, 0xd4, 0x45, 0x1f, 0xc3, 0xbd, 0xd6,
-	0xf9, 0xf3, 0x62, 0x8d, 0xbf, 0x3d, 0x38, 0x94, 0x0b, 0xc9, 0xcd, 0x47, 0xe4, 0x7d, 0xc2, 0x2c,
-	0xd3, 0x48, 0x8f, 0xc9, 0x9d, 0x93, 0x1e, 0xcf, 0x87, 0xe4, 0xf4, 0xd9, 0xaf, 0x01, 0x00, 0x00,
-	0xff, 0xff, 0x51, 0x1c, 0x0a, 0x10, 0x76, 0x0e, 0x00, 0x00,
+	// 1530 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xcd, 0x6e, 0x23, 0xc5,
+	0x13, 0x97, 0xbf, 0x3d, 0x65, 0x27, 0xff, 0xdd, 0xfe, 0x2f, 0xe0, 0x5d, 0xbe, 0xb2, 0xb3, 0x11,
+	0x04, 0x21, 0x16, 0x91, 0xbd, 0x23, 0x99, 0x0d, 0x41, 0x96, 0x76, 0xb3, 0xa1, 0x13, 0x16, 0x09,
+	0x0e, 0x56, 0x7b, 0xba, 0x3d, 0x9e, 0xcd, 0x78, 0x66, 0xe8, 0x6e, 0x6f, 0x32, 0x77, 0xde, 0x86,
+	0x17, 0xe1, 0xc0, 0x3b, 0x70, 0xe2, 0xc2, 0x0b, 0x70, 0x45, 0x55, 0xdd, 0x33, 0xb6, 0x93, 0xac,
+	0x84, 0xc4, 0x95, 0x5b, 0xfd, 0xaa, 0xca, 0xd5, 0xd5, 0xbf, 0xfa, 0x98, 0x36, 0xec, 0x16, 0x3a,
+	0xb7, 0xf9, 0xd2, 0xc4, 0x8f, 0x49, 0x60, 0xfd, 0x0a, 0x87, 0xdf, 0x42, 0x70, 0x2e, 0xcc, 0xc5,
+	0x33, 0x31, 0x53, 0x29, 0x7b, 0x1b, 0xba, 0x56, 0x98, 0x8b, 0x44, 0x8e, 0x1a, 0x7b, 0x8d, 0x83,
+	0x80, 0x7b, 0x84, 0x7a, 0x23, 0x2f, 0x12, 0x69, 0x46, 0xcd, 0xbd, 0x16, 0xea, 0x1d, 0x62, 0xf7,
+	0xa0, 0x93, 0x64, 0x52, 0x5d, 0x8d, 0x5a, 0x7b, 0x8d, 0x83, 0x0e, 0x77, 0x20, 0x14, 0x00, 0x67,
+	0xf2, 0xe2, 0xb9, 0x32, 0x46, 0xc4, 0x8a, 0xdd, 0x81, 0x56, 0x54, 0x07, 0x44, 0x91, 0x7d, 0x06,
+	0x3d, 0x8c, 0x9b, 0x8a, 0xd9, 0xa8, 0xb9, 0xd7, 0x38, 0x18, 0x1c, 0xfe, 0xff, 0x71, 0x9d, 0x5e,
+	0x9d, 0x0b, 0xaf, 0x7c, 0x18, 0x83, 0xb6, 0x14, 0x56, 0xd0, 0x19, 0x43, 0x4e, 0x72, 0x38, 0x81,
+	0xce, 0x64, 0x89, 0xd1, 0xef, 0x41, 0xe7, 0x32, 0x91, 0x76, 0x41, 0xf1, 0x3b, 0xdc, 0x01, 0xcc,
+	0x77, 0xa1, 0x92, 0x78, 0x61, 0xe9, 0x80, 0x0e, 0xf7, 0xe8, 0xd6, 0x50, 0xc7, 0xd0, 0x1e, 0x6b,
+	0x25, 0xd8, 0x2e, 0x34, 0x7d, 0x9a, 0x1d, 0xde, 0x4c, 0x24, 0x7b, 0x00, 0xfd, 0x42, 0x68, 0x95,
+	0xd9, 0x44, 0xfa, 0x28, 0x35, 0xc6, 0x38, 0x99, 0x58, 0x2a, 0x8a, 0x13, 0x70, 0x92, 0xc3, 0x5f,
+	0x9b, 0xd0, 0x7d, 0x2a, 0x96, 0x4a, 0x6f, 0x86, 0x0a, 0x28, 0x54, 0xe5, 0xde, 0x5c, 0xbb, 0xa3,
+	0xce, 0x96, 0x85, 0xf2, 0xcc, 0x91, 0x8c, 0x3a, 0x21, 0xa5, 0x1e, 0xb5, 0x9d, 0x1f, 0xca, 0x78,
+	0x15, 0xa1, 0x95, 0x48, 0xe4, 0xa8, 0xe3, 0xae, 0xe2, 0x10, 0x7b, 0x0f, 0x82, 0x34, 0xcf, 0xe2,
+	0xc4, 0xae, 0xa4, 0x1a, 0x75, 0xf7, 0x1a, 0x07, 0x4d, 0xbe, 0x56, 0x60, 0xf2, 0xa9, 0xb0, 0xce,
+	0xd8, 0x23, 0x63, 0x8d, 0xf1, 0x14, 0x6d, 0x4d, 0x31, 0xea, 0xbb, 0x53, 0x50, 0xa6, 0x8c, 0x8b,
+	0x51, 0xe0, 0x33, 0x2e, 0xd0, 0xa7, 0xc8, 0xb5, 0x1d, 0x81, 0xcb, 0x0e, 0x65, 0x8c, 0xb9, 0x32,
+	0x4a, 0xd3, 0x4d, 0x06, 0xe4, 0x59, 0x63, 0x47, 0x96, 0x31, 0x97, 0xb9, 0x96, 0xa3, 0xa1, 0xb3,
+	0x55, 0x18, 0x4b, 0x34, 0xd3, 0x22, 0x93, 0xa3, 0x1d, 0x32, 0x38, 0x80, 0xbf, 0xd0, 0xca, 0x28,
+	0xfd, 0x5a, 0xc9, 0xd1, 0xae, 0xfb, 0x45, 0x85, 0xc3, 0x08, 0xee, 0x3a, 0x26, 0xc7, 0x99, 0xc4,
+	0x86, 0x98, 0x64, 0xf3, 0x9c, 0x1d, 0x40, 0x37, 0x22, 0x25, 0x11, 0x3b, 0x38, 0xbc, 0xb3, 0x6e,
+	0x1a, 0xe7, 0xcc, 0xbd, 0x9d, 0xed, 0x43, 0x07, 0x7b, 0xc7, 0x35, 0xeb, 0xe0, 0x70, 0x77, 0xbb,
+	0xbb, 0xb8, 0x33, 0x86, 0xbf, 0x37, 0xa0, 0x8d, 0xf8, 0x8d, 0x4d, 0xff, 0x00, 0xfa, 0x28, 0x6d,
+	0x54, 0xae, 0xc6, 0xec, 0x5d, 0x08, 0x22, 0xad, 0x84, 0x55, 0x53, 0x61, 0x7d, 0x17, 0xf4, 0x9d,
+	0x62, 0x6c, 0x37, 0x8c, 0xb3, 0xd2, 0xd7, 0xd2, 0x1b, 0xbf, 0x2a, 0xd1, 0xb8, 0x2a, 0xa4, 0xff,
+	0x65, 0xc7, 0xd3, 0x48, 0x8a, 0xb1, 0xc5, 0x54, 0x54, 0x26, 0x66, 0xa9, 0xab, 0x68, 0x9f, 0x7b,
+	0xc4, 0xee, 0x43, 0x3f, 0x31, 0x53, 0x91, 0x0a, 0xbd, 0xa4, 0x72, 0xf6, 0x79, 0x2f, 0x31, 0x63,
+	0x84, 0x68, 0x92, 0x2a, 0x9d, 0xce, 0x53, 0x11, 0x53, 0x45, 0xfb, 0xbc, 0x27, 0x55, 0x7a, 0x9c,
+	0x8a, 0x38, 0x3c, 0x87, 0x01, 0x5e, 0xf0, 0x4c, 0x3a, 0x02, 0x43, 0x68, 0x63, 0xfe, 0x9e, 0xbe,
+	0xeb, 0xac, 0x90, 0x8d, 0x3d, 0x84, 0xb6, 0x91, 0x35, 0x73, 0x3b, 0x6b, 0x9f, 0x33, 0x79, 0xc1,
+	0xc9, 0x14, 0xfe, 0xd9, 0x04, 0x70, 0x84, 0x13, 0x7b, 0xd7, 0x7b, 0xfd, 0x7d, 0x00, 0x57, 0x86,
+	0xa9, 0x5b, 0x17, 0xa8, 0x0f, 0x9c, 0x66, 0x22, 0x0d, 0x7b, 0xc7, 0xcd, 0xfe, 0x34, 0x91, 0x9e,
+	0x36, 0x62, 0x7b, 0x82, 0x4b, 0x21, 0xb0, 0xc9, 0x52, 0x4d, 0xf5, 0x2a, 0x55, 0xa3, 0x36, 0x1d,
+	0xbf, 0x51, 0xe1, 0x23, 0x51, 0x3e, 0xb5, 0x29, 0xef, 0xa3, 0x0b, 0x5f, 0xa5, 0x0a, 0x8f, 0xd1,
+	0x4a, 0x44, 0xd6, 0xf9, 0x3b, 0x1e, 0x03, 0xd2, 0x90, 0xf9, 0x21, 0x0c, 0x9d, 0x59, 0xaa, 0xd7,
+	0x49, 0xe4, 0xe8, 0x0c, 0xf8, 0x80, 0x74, 0x47, 0xa4, 0xda, 0x22, 0xae, 0xb7, 0x45, 0x1c, 0xfb,
+	0x10, 0x06, 0xbe, 0x46, 0x1b, 0xb4, 0x82, 0x53, 0x91, 0xc3, 0xba, 0x4e, 0xc1, 0x56, 0x9d, 0x18,
+	0xb4, 0xcd, 0xc6, 0xd8, 0xa0, 0x8c, 0x37, 0x4e, 0xcc, 0x74, 0xbe, 0x4a, 0x53, 0x9a, 0x9a, 0x3e,
+	0xef, 0x26, 0xe6, 0x78, 0x95, 0xa6, 0x2c, 0x84, 0x9d, 0x34, 0xc9, 0x2e, 0xa6, 0xb1, 0xce, 0x57,
+	0x05, 0x12, 0xe2, 0x06, 0x67, 0x80, 0xca, 0x6f, 0x50, 0x37, 0x91, 0xe1, 0x09, 0x74, 0xdd, 0xd5,
+	0x71, 0x8d, 0x4a, 0x51, 0xfa, 0xfd, 0x84, 0x22, 0x3b, 0x04, 0x70, 0x8c, 0x89, 0x2c, 0x56, 0xbe,
+	0x62, 0x9b, 0x9b, 0x14, 0xa9, 0x42, 0x13, 0x27, 0x62, 0x49, 0x0c, 0x9f, 0x40, 0x50, 0xeb, 0x71,
+	0x30, 0x8d, 0x15, 0xda, 0xfa, 0xea, 0x39, 0x80, 0x07, 0xa9, 0x4c, 0xfa, 0xca, 0xa1, 0x18, 0xbe,
+	0x84, 0xde, 0x69, 0x9e, 0x96, 0x71, 0x9e, 0xfd, 0xa3, 0xcd, 0xf6, 0x31, 0x74, 0x8b, 0x3c, 0xc9,
+	0xac, 0xf1, 0x65, 0xfc, 0xdf, 0x3a, 0xa7, 0x53, 0xd4, 0x73, 0x6f, 0x0e, 0xff, 0x6a, 0xc2, 0xee,
+	0xba, 0x93, 0xc6, 0x3a, 0x36, 0x37, 0xe2, 0xef, 0xc3, 0xae, 0xef, 0xa6, 0xaa, 0x6b, 0xdc, 0x49,
+	0xc3, 0xa8, 0xfe, 0xdd, 0x44, 0xd2, 0xc0, 0x55, 0x3d, 0x57, 0x4f, 0xa3, 0x6f, 0x39, 0xec, 0x94,
+	0xc2, 0x65, 0x8f, 0x56, 0x37, 0x8e, 0x81, 0xd7, 0x4c, 0x24, 0x7b, 0x8b, 0x3e, 0x6d, 0x53, 0xbf,
+	0x5f, 0x91, 0x05, 0x89, 0x21, 0x43, 0xd8, 0x41, 0xb5, 0xd0, 0xf1, 0x54, 0xa4, 0x89, 0x30, 0x55,
+	0x07, 0x19, 0x89, 0x89, 0x8e, 0x51, 0x85, 0x0b, 0x22, 0x2f, 0x94, 0x16, 0x36, 0xd7, 0xd4, 0x41,
+	0x01, 0xaf, 0x31, 0x7b, 0x04, 0x3b, 0x95, 0x3c, 0xa5, 0x3d, 0xef, 0xb6, 0xed, 0xb0, 0x52, 0x9e,
+	0xe3, 0xbe, 0xdf, 0x38, 0xe4, 0xb5, 0x48, 0x57, 0xca, 0x2f, 0x60, 0x7f, 0xc8, 0x4b, 0x54, 0xdd,
+	0xda, 0x52, 0xfb, 0xb0, 0x8b, 0x6d, 0x3f, 0xbd, 0x4c, 0xec, 0x62, 0x9a, 0xa9, 0x2b, 0xeb, 0xf7,
+	0xf1, 0x10, 0xb5, 0xdf, 0x27, 0x76, 0x71, 0xa2, 0xae, 0x2c, 0x36, 0xf8, 0xb5, 0xd6, 0xea, 0xc5,
+	0xbe, 0xad, 0x7e, 0x69, 0x42, 0xeb, 0x4c, 0xde, 0x1c, 0xde, 0xfb, 0xd0, 0xc7, 0x84, 0x28, 0x61,
+	0x47, 0x74, 0xcf, 0xc8, 0x0b, 0xca, 0xd5, 0x9b, 0x36, 0x3e, 0x7b, 0x68, 0x3a, 0xc1, 0x82, 0xef,
+	0x43, 0x5b, 0xe8, 0xd8, 0xdc, 0x9c, 0xda, 0x33, 0xba, 0x07, 0x27, 0x2b, 0x5e, 0x24, 0x89, 0xf2,
+	0xcc, 0xd3, 0x4c, 0x32, 0xf6, 0xda, 0x4a, 0xa7, 0x9e, 0x5b, 0x14, 0x71, 0xf4, 0xfc, 0xee, 0xc4,
+	0xa6, 0xf5, 0xb4, 0x82, 0x53, 0x61, 0xe7, 0x6e, 0xcc, 0x26, 0x39, 0x38, 0x5a, 0xfd, 0x6c, 0x92,
+	0xc3, 0xd6, 0xf6, 0x0d, 0xae, 0x6d, 0xdf, 0x11, 0xf4, 0xdc, 0xa8, 0x4a, 0x22, 0x34, 0xe0, 0x15,
+	0xdc, 0x5a, 0x07, 0x8e, 0xcd, 0x7a, 0x8f, 0xfe, 0xdc, 0x80, 0xae, 0xbb, 0x0a, 0x8e, 0x8c, 0x6b,
+	0x07, 0xc7, 0x8e, 0x03, 0xb7, 0x3d, 0x07, 0xea, 0xef, 0xbb, 0xff, 0x96, 0x57, 0xdf, 0xf7, 0xe5,
+	0xca, 0xb8, 0xb5, 0xdf, 0xe7, 0x24, 0x63, 0x44, 0x37, 0xc0, 0x8e, 0x04, 0x07, 0xea, 0xaa, 0xf7,
+	0xd6, 0x55, 0x0f, 0x1f, 0x41, 0x87, 0xe6, 0x87, 0x0d, 0xa1, 0x71, 0xe5, 0x17, 0x41, 0xe3, 0x0a,
+	0x51, 0xe9, 0x1f, 0x28, 0x8d, 0x32, 0xfc, 0x01, 0xda, 0x5c, 0x45, 0xf4, 0xd2, 0x49, 0xd5, 0xdc,
+	0x7a, 0x37, 0x92, 0x91, 0x6d, 0x9b, 0x17, 0xde, 0x17, 0x45, 0x3a, 0x9c, 0x9e, 0x49, 0xfe, 0xfd,
+	0x46, 0x00, 0xb7, 0xdb, 0x2c, 0xb7, 0x36, 0x5f, 0x52, 0xf2, 0x1d, 0xee, 0x51, 0x18, 0x43, 0x70,
+	0x2c, 0x22, 0x35, 0xce, 0xe2, 0x94, 0x9e, 0x75, 0xa5, 0xb8, 0xac, 0xf6, 0x51, 0x29, 0x2e, 0x31,
+	0x58, 0x91, 0xd8, 0x68, 0xe1, 0x0f, 0x70, 0x80, 0x5e, 0x1b, 0x79, 0x9a, 0x56, 0xef, 0x1c, 0x94,
+	0xd9, 0x07, 0x00, 0x51, 0x9e, 0xcd, 0x13, 0xa9, 0xb2, 0xc8, 0x31, 0xd4, 0xe4, 0x1b, 0x9a, 0xf0,
+	0x0a, 0xe0, 0x7c, 0x31, 0xb7, 0x5c, 0x99, 0x55, 0x4a, 0xe9, 0xc4, 0x2a, 0x93, 0x4a, 0xfb, 0xc3,
+	0x3c, 0xc2, 0x0c, 0x44, 0xac, 0xaa, 0xeb, 0x08, 0xc7, 0x9a, 0x16, 0x51, 0xfd, 0xa6, 0x42, 0x99,
+	0x2e, 0xa3, 0xc4, 0xca, 0x96, 0xf5, 0x65, 0x08, 0xd1, 0xf2, 0x5b, 0x26, 0xfe, 0xdb, 0xd1, 0xe1,
+	0x0e, 0x84, 0xbf, 0x35, 0xa1, 0x87, 0x77, 0x3c, 0xcd, 0x0d, 0xfb, 0x08, 0xba, 0x3a, 0x42, 0x70,
+	0xf3, 0x8b, 0x89, 0x14, 0x73, 0x6f, 0xc5, 0x2f, 0x57, 0x61, 0x9f, 0xa9, 0xb9, 0xfd, 0xba, 0x54,
+	0xfe, 0x41, 0x7b, 0x63, 0xe5, 0xad, 0x3d, 0xd8, 0xe7, 0x00, 0x85, 0xe5, 0x48, 0x34, 0xfa, 0xb7,
+	0x6e, 0xf7, 0xdf, 0x70, 0x61, 0x9f, 0x40, 0xaf, 0xb0, 0xcf, 0xf3, 0x95, 0x5d, 0xd0, 0x15, 0x6e,
+	0xf1, 0xae, 0xec, 0xb4, 0x7a, 0xed, 0x49, 0x6e, 0xdc, 0xad, 0x6e, 0x5d, 0xbd, 0x64, 0x66, 0x9f,
+	0x42, 0x77, 0x4e, 0x75, 0xa4, 0xb6, 0xdb, 0xfa, 0x6e, 0xd4, 0x25, 0xe6, 0xde, 0x05, 0x87, 0xe6,
+	0xa7, 0x95, 0x48, 0x13, 0x5b, 0xfa, 0x7e, 0xac, 0x20, 0x16, 0x72, 0x2e, 0xa2, 0x44, 0xa4, 0x47,
+	0xf8, 0xaa, 0xee, 0xd3, 0xab, 0x7a, 0x43, 0x13, 0xfe, 0xd1, 0x84, 0x3e, 0xc6, 0xa3, 0xf7, 0xc7,
+	0x7f, 0x7c, 0xfe, 0x5b, 0x3e, 0xb1, 0x99, 0xe7, 0x48, 0xe7, 0x11, 0x2d, 0xb6, 0x16, 0xf7, 0x28,
+	0xfc, 0x0e, 0x7a, 0x2f, 0x66, 0xaf, 0x88, 0xe5, 0x7d, 0xe8, 0xe8, 0xe8, 0xc5, 0xec, 0xd5, 0x1b,
+	0x48, 0x76, 0x46, 0x5a, 0x05, 0xe5, 0x7a, 0x15, 0x94, 0xee, 0xc5, 0xaf, 0xf3, 0x19, 0x11, 0xd8,
+	0xe4, 0x24, 0x87, 0x3f, 0xc2, 0xdd, 0x53, 0xa1, 0xc5, 0x92, 0x26, 0x42, 0xe3, 0xa7, 0xcb, 0x96,
+	0xec, 0x11, 0xb4, 0x8a, 0xdc, 0xf8, 0xf0, 0x77, 0xb7, 0xef, 0x79, 0x9a, 0x1b, 0x8e, 0x56, 0xf6,
+	0x10, 0x5a, 0xc9, 0x32, 0xbe, 0x59, 0x3d, 0xfa, 0xd3, 0xc6, 0xd1, 0x16, 0x7e, 0x09, 0x77, 0xea,
+	0xe0, 0x4f, 0xf3, 0x25, 0xfe, 0xb7, 0xc2, 0xa1, 0x9c, 0x2b, 0x61, 0xbf, 0xa0, 0xe8, 0x43, 0xee,
+	0x40, 0xa5, 0x3d, 0xa4, 0x70, 0x5e, 0x7b, 0x38, 0xeb, 0x52, 0xd0, 0x27, 0x7f, 0x07, 0x00, 0x00,
+	0xff, 0xff, 0xb1, 0x6b, 0x98, 0xe0, 0xdb, 0x0e, 0x00, 0x00,
 }
diff --git a/protomsg.proto b/protomsg.proto
index 692d8a9..e8bfaa9 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -45,6 +45,12 @@
     string reserved = 14;
 }
 
+//鎽勫儚鏈虹殑浠诲姟淇℃伅
+message CameraAndTaskInfo {
+    Camera camera = 1;//鎽勫儚鏈轰俊鎭�
+    repeated Task tasks = 2;//浠诲姟鍒楄〃
+}
+
 //Task缁撴瀯浣�
 message Task {
     string taskid = 1;

--
Gitblit v1.8.0