From 0ebe78959ed7ccfd6d71c9317c6771d88a240c0b Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 14 六月 2019 10:32:23 +0800
Subject: [PATCH] fix GroupRule

---
 protomsg.proto |    9 +
 protomsg.pb.go |  393 +++++++++++++++++++++++++++++++------------------------
 2 files changed, 228 insertions(+), 174 deletions(-)

diff --git a/protomsg.pb.go b/protomsg.pb.go
index 1c17763..60d4563 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -1031,11 +1031,11 @@
 }
 
 type TaskGroupArgs struct {
-	TaskId               string      `protobuf:"bytes,1,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"`
-	GroupArgs            []*TaskArgs `protobuf:"bytes,2,rep,name=group_args,json=groupArgs,proto3" json:"group_args,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}    `json:"-"`
-	XXX_unrecognized     []byte      `json:"-"`
-	XXX_sizecache        int32       `json:"-"`
+	TaskId               string       `protobuf:"bytes,1,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"`
+	GroupRules           []*GroupRule `protobuf:"bytes,2,rep,name=group_rules,json=groupRules,proto3" json:"group_rules,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
 }
 
 func (m *TaskGroupArgs) Reset()         { *m = TaskGroupArgs{} }
@@ -1070,14 +1070,61 @@
 	return ""
 }
 
-func (m *TaskGroupArgs) GetGroupArgs() []*TaskArgs {
+func (m *TaskGroupArgs) GetGroupRules() []*GroupRule {
 	if m != nil {
-		return m.GroupArgs
+		return m.GroupRules
 	}
 	return nil
 }
 
-type TaskArgs struct {
+type GroupRule struct {
+	GroupId              string       `protobuf:"bytes,1,opt,name=group_id,json=groupId,proto3" json:"group_id,omitempty"`
+	Rules                []*GroupRule `protobuf:"bytes,2,rep,name=rules,proto3" json:"rules,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
+func (m *GroupRule) Reset()         { *m = GroupRule{} }
+func (m *GroupRule) String() string { return proto.CompactTextString(m) }
+func (*GroupRule) ProtoMessage()    {}
+func (*GroupRule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_32de24555f916688, []int{15}
+}
+
+func (m *GroupRule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_GroupRule.Unmarshal(m, b)
+}
+func (m *GroupRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_GroupRule.Marshal(b, m, deterministic)
+}
+func (m *GroupRule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_GroupRule.Merge(m, src)
+}
+func (m *GroupRule) XXX_Size() int {
+	return xxx_messageInfo_GroupRule.Size(m)
+}
+func (m *GroupRule) XXX_DiscardUnknown() {
+	xxx_messageInfo_GroupRule.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_GroupRule proto.InternalMessageInfo
+
+func (m *GroupRule) GetGroupId() string {
+	if m != nil {
+		return m.GroupId
+	}
+	return ""
+}
+
+func (m *GroupRule) GetRules() []*GroupRule {
+	if m != nil {
+		return m.Rules
+	}
+	return nil
+}
+
+type Rule struct {
 	Id                   string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	CameraTaskId         string   `protobuf:"bytes,2,opt,name=camera_task_id,json=cameraTaskId,proto3" json:"camera_task_id,omitempty"`
 	CameraId             string   `protobuf:"bytes,3,opt,name=camera_id,json=cameraId,proto3" json:"camera_id,omitempty"`
@@ -1095,109 +1142,109 @@
 	XXX_sizecache        int32    `json:"-"`
 }
 
-func (m *TaskArgs) Reset()         { *m = TaskArgs{} }
-func (m *TaskArgs) String() string { return proto.CompactTextString(m) }
-func (*TaskArgs) ProtoMessage()    {}
-func (*TaskArgs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{15}
+func (m *Rule) Reset()         { *m = Rule{} }
+func (m *Rule) String() string { return proto.CompactTextString(m) }
+func (*Rule) ProtoMessage()    {}
+func (*Rule) Descriptor() ([]byte, []int) {
+	return fileDescriptor_32de24555f916688, []int{16}
 }
 
-func (m *TaskArgs) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_TaskArgs.Unmarshal(m, b)
+func (m *Rule) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Rule.Unmarshal(m, b)
 }
-func (m *TaskArgs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_TaskArgs.Marshal(b, m, deterministic)
+func (m *Rule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Rule.Marshal(b, m, deterministic)
 }
-func (m *TaskArgs) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TaskArgs.Merge(m, src)
+func (m *Rule) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Rule.Merge(m, src)
 }
-func (m *TaskArgs) XXX_Size() int {
-	return xxx_messageInfo_TaskArgs.Size(m)
+func (m *Rule) XXX_Size() int {
+	return xxx_messageInfo_Rule.Size(m)
 }
-func (m *TaskArgs) XXX_DiscardUnknown() {
-	xxx_messageInfo_TaskArgs.DiscardUnknown(m)
+func (m *Rule) XXX_DiscardUnknown() {
+	xxx_messageInfo_Rule.DiscardUnknown(m)
 }
 
-var xxx_messageInfo_TaskArgs proto.InternalMessageInfo
+var xxx_messageInfo_Rule proto.InternalMessageInfo
 
-func (m *TaskArgs) GetId() string {
+func (m *Rule) GetId() string {
 	if m != nil {
 		return m.Id
 	}
 	return ""
 }
 
-func (m *TaskArgs) GetCameraTaskId() string {
+func (m *Rule) GetCameraTaskId() string {
 	if m != nil {
 		return m.CameraTaskId
 	}
 	return ""
 }
 
-func (m *TaskArgs) GetCameraId() string {
+func (m *Rule) GetCameraId() string {
 	if m != nil {
 		return m.CameraId
 	}
 	return ""
 }
 
-func (m *TaskArgs) GetPolygonId() string {
+func (m *Rule) GetPolygonId() string {
 	if m != nil {
 		return m.PolygonId
 	}
 	return ""
 }
 
-func (m *TaskArgs) GetSdkId() string {
+func (m *Rule) GetSdkId() string {
 	if m != nil {
 		return m.SdkId
 	}
 	return ""
 }
 
-func (m *TaskArgs) GetSdkArgAlias() string {
+func (m *Rule) GetSdkArgAlias() string {
 	if m != nil {
 		return m.SdkArgAlias
 	}
 	return ""
 }
 
-func (m *TaskArgs) GetOperator() string {
+func (m *Rule) GetOperator() string {
 	if m != nil {
 		return m.Operator
 	}
 	return ""
 }
 
-func (m *TaskArgs) GetOperatorType() string {
+func (m *Rule) GetOperatorType() string {
 	if m != nil {
 		return m.OperatorType
 	}
 	return ""
 }
 
-func (m *TaskArgs) GetSdkArgValue() string {
+func (m *Rule) GetSdkArgValue() string {
 	if m != nil {
 		return m.SdkArgValue
 	}
 	return ""
 }
 
-func (m *TaskArgs) GetSort() int32 {
+func (m *Rule) GetSort() int32 {
 	if m != nil {
 		return m.Sort
 	}
 	return 0
 }
 
-func (m *TaskArgs) GetRuleWithPre() string {
+func (m *Rule) GetRuleWithPre() string {
 	if m != nil {
 		return m.RuleWithPre
 	}
 	return ""
 }
 
-func (m *TaskArgs) GetGroupId() string {
+func (m *Rule) GetGroupId() string {
 	if m != nil {
 		return m.GroupId
 	}
@@ -1226,7 +1273,7 @@
 func (m *Sdk) String() string { return proto.CompactTextString(m) }
 func (*Sdk) ProtoMessage()    {}
 func (*Sdk) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{16}
+	return fileDescriptor_32de24555f916688, []int{17}
 }
 
 func (m *Sdk) XXX_Unmarshal(b []byte) error {
@@ -1341,7 +1388,7 @@
 func (m *SdkArg) String() string { return proto.CompactTextString(m) }
 func (*SdkArg) ProtoMessage()    {}
 func (*SdkArg) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{17}
+	return fileDescriptor_32de24555f916688, []int{18}
 }
 
 func (m *SdkArg) XXX_Unmarshal(b []byte) error {
@@ -1417,7 +1464,7 @@
 func (m *Point) String() string { return proto.CompactTextString(m) }
 func (*Point) ProtoMessage()    {}
 func (*Point) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{18}
+	return fileDescriptor_32de24555f916688, []int{19}
 }
 
 func (m *Point) XXX_Unmarshal(b []byte) error {
@@ -1466,7 +1513,7 @@
 func (m *Rect) String() string { return proto.CompactTextString(m) }
 func (*Rect) ProtoMessage()    {}
 func (*Rect) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{19}
+	return fileDescriptor_32de24555f916688, []int{20}
 }
 
 func (m *Rect) XXX_Unmarshal(b []byte) error {
@@ -1529,7 +1576,7 @@
 func (m *FaceAngle) String() string { return proto.CompactTextString(m) }
 func (*FaceAngle) ProtoMessage()    {}
 func (*FaceAngle) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{20}
+	return fileDescriptor_32de24555f916688, []int{21}
 }
 
 func (m *FaceAngle) XXX_Unmarshal(b []byte) error {
@@ -1593,7 +1640,7 @@
 func (m *ThftResult) String() string { return proto.CompactTextString(m) }
 func (*ThftResult) ProtoMessage()    {}
 func (*ThftResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{21}
+	return fileDescriptor_32de24555f916688, []int{22}
 }
 
 func (m *ThftResult) XXX_Unmarshal(b []byte) error {
@@ -1667,7 +1714,7 @@
 func (m *FacePos) String() string { return proto.CompactTextString(m) }
 func (*FacePos) ProtoMessage()    {}
 func (*FacePos) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{22}
+	return fileDescriptor_32de24555f916688, []int{23}
 }
 
 func (m *FacePos) XXX_Unmarshal(b []byte) error {
@@ -1763,7 +1810,7 @@
 func (m *FaceInfo) String() string { return proto.CompactTextString(m) }
 func (*FaceInfo) ProtoMessage()    {}
 func (*FaceInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{23}
+	return fileDescriptor_32de24555f916688, []int{24}
 }
 
 func (m *FaceInfo) XXX_Unmarshal(b []byte) error {
@@ -1860,7 +1907,7 @@
 func (m *ObjInfo) String() string { return proto.CompactTextString(m) }
 func (*ObjInfo) ProtoMessage()    {}
 func (*ObjInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{24}
+	return fileDescriptor_32de24555f916688, []int{25}
 }
 
 func (m *ObjInfo) XXX_Unmarshal(b []byte) error {
@@ -1915,7 +1962,7 @@
 func (m *ParamFacePos) String() string { return proto.CompactTextString(m) }
 func (*ParamFacePos) ProtoMessage()    {}
 func (*ParamFacePos) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{25}
+	return fileDescriptor_32de24555f916688, []int{26}
 }
 
 func (m *ParamFacePos) XXX_Unmarshal(b []byte) error {
@@ -1963,7 +2010,7 @@
 func (m *ParamFaceCompare) String() string { return proto.CompactTextString(m) }
 func (*ParamFaceCompare) ProtoMessage()    {}
 func (*ParamFaceCompare) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{26}
+	return fileDescriptor_32de24555f916688, []int{27}
 }
 
 func (m *ParamFaceCompare) XXX_Unmarshal(b []byte) error {
@@ -2011,7 +2058,7 @@
 func (m *ParamFaceProperty) String() string { return proto.CompactTextString(m) }
 func (*ParamFaceProperty) ProtoMessage()    {}
 func (*ParamFaceProperty) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{27}
+	return fileDescriptor_32de24555f916688, []int{28}
 }
 
 func (m *ParamFaceProperty) XXX_Unmarshal(b []byte) error {
@@ -2059,7 +2106,7 @@
 func (m *ParamYoloObj) String() string { return proto.CompactTextString(m) }
 func (*ParamYoloObj) ProtoMessage()    {}
 func (*ParamYoloObj) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{28}
+	return fileDescriptor_32de24555f916688, []int{29}
 }
 
 func (m *ParamYoloObj) XXX_Unmarshal(b []byte) error {
@@ -2109,7 +2156,7 @@
 func (m *DbChangeMessage) String() string { return proto.CompactTextString(m) }
 func (*DbChangeMessage) ProtoMessage()    {}
 func (*DbChangeMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{29}
+	return fileDescriptor_32de24555f916688, []int{30}
 }
 
 func (m *DbChangeMessage) XXX_Unmarshal(b []byte) error {
@@ -2176,7 +2223,7 @@
 func (m *CameraPolygon) String() string { return proto.CompactTextString(m) }
 func (*CameraPolygon) ProtoMessage()    {}
 func (*CameraPolygon) Descriptor() ([]byte, []int) {
-	return fileDescriptor_32de24555f916688, []int{30}
+	return fileDescriptor_32de24555f916688, []int{31}
 }
 
 func (m *CameraPolygon) XXX_Unmarshal(b []byte) error {
@@ -2271,7 +2318,8 @@
 	proto.RegisterType((*Polygon)(nil), "protomsg.Polygon")
 	proto.RegisterType((*CameraTaskArgs)(nil), "protomsg.CameraTaskArgs")
 	proto.RegisterType((*TaskGroupArgs)(nil), "protomsg.TaskGroupArgs")
-	proto.RegisterType((*TaskArgs)(nil), "protomsg.TaskArgs")
+	proto.RegisterType((*GroupRule)(nil), "protomsg.GroupRule")
+	proto.RegisterType((*Rule)(nil), "protomsg.Rule")
 	proto.RegisterType((*Sdk)(nil), "protomsg.Sdk")
 	proto.RegisterType((*SdkArg)(nil), "protomsg.SdkArg")
 	proto.RegisterType((*Point)(nil), "protomsg.Point")
@@ -2292,125 +2340,126 @@
 func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
 
 var fileDescriptor_32de24555f916688 = []byte{
-	// 1909 bytes of a gzipped FileDescriptorProto
+	// 1931 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x5f, 0x93, 0x1b, 0x47,
-	0x11, 0x8f, 0x56, 0xff, 0x76, 0x5b, 0xd2, 0x45, 0x1e, 0x4c, 0xa2, 0x24, 0x04, 0xce, 0x6b, 0x43,
-	0x0e, 0x13, 0x4c, 0xe5, 0xc2, 0x33, 0x55, 0x87, 0x0f, 0x53, 0xaa, 0x72, 0x9c, 0xcb, 0xdc, 0xc5,
-	0x14, 0xe1, 0x61, 0x6b, 0xb4, 0x33, 0x5a, 0xad, 0xb5, 0xda, 0x5d, 0x66, 0x47, 0x3e, 0xeb, 0x81,
-	0x37, 0xde, 0xf9, 0x20, 0x7c, 0x11, 0x1e, 0xf8, 0x0e, 0x3c, 0xf1, 0x42, 0x15, 0xc5, 0x57, 0xa0,
-	0xba, 0x67, 0x76, 0xb5, 0xba, 0x3b, 0x57, 0xb9, 0x8a, 0x57, 0xde, 0xfa, 0x9f, 0x7a, 0xba, 0x7f,
-	0x3d, 0xd3, 0xdd, 0x2b, 0x38, 0x2a, 0x75, 0x61, 0x8a, 0x4d, 0x95, 0x3c, 0x21, 0x82, 0xf9, 0x35,
-	0x1f, 0x7e, 0x03, 0xc1, 0x95, 0xa8, 0xd6, 0xcf, 0xc5, 0x42, 0x65, 0xec, 0x03, 0x18, 0x18, 0x51,
-	0xad, 0x53, 0x39, 0xeb, 0x1c, 0x77, 0x4e, 0x02, 0xee, 0x38, 0x94, 0x57, 0x72, 0x9d, 0xca, 0x6a,
-	0xe6, 0x1d, 0x77, 0x51, 0x6e, 0x39, 0x76, 0x1f, 0xfa, 0x69, 0x2e, 0xd5, 0x9b, 0x59, 0xf7, 0xb8,
-	0x73, 0xd2, 0xe7, 0x96, 0x09, 0x05, 0xc0, 0xa5, 0x5c, 0x7f, 0xa5, 0xaa, 0x4a, 0x24, 0x8a, 0x4d,
-	0xa1, 0x1b, 0x37, 0x0e, 0x91, 0x64, 0x3f, 0x87, 0x21, 0xfa, 0xcd, 0xc4, 0x62, 0xe6, 0x1d, 0x77,
-	0x4e, 0x46, 0xa7, 0xdf, 0x7b, 0xd2, 0x84, 0xd7, 0xc4, 0xc2, 0x6b, 0x1b, 0xc6, 0xa0, 0x27, 0x85,
-	0x11, 0x74, 0xc6, 0x98, 0x13, 0x1d, 0xce, 0xa1, 0x3f, 0xdf, 0xa0, 0xf7, 0xfb, 0xd0, 0xbf, 0x4e,
-	0xa5, 0x59, 0x91, 0xff, 0x3e, 0xb7, 0x0c, 0xc6, 0xbb, 0x52, 0x69, 0xb2, 0x32, 0x74, 0x40, 0x9f,
-	0x3b, 0xee, 0x4e, 0x57, 0xcf, 0xa0, 0x77, 0xa6, 0x95, 0x60, 0x47, 0xe0, 0xb9, 0x30, 0xfb, 0xdc,
-	0x4b, 0x25, 0xfb, 0x18, 0xfc, 0x52, 0x68, 0x95, 0x9b, 0x54, 0x3a, 0x2f, 0x0d, 0x8f, 0x7e, 0x72,
-	0xb1, 0x51, 0xe4, 0x27, 0xe0, 0x44, 0x87, 0x7f, 0xf3, 0x60, 0xf0, 0x54, 0x6c, 0x94, 0x6e, 0xbb,
-	0x0a, 0xc8, 0x55, 0x6d, 0xee, 0xed, 0xcd, 0x51, 0x66, 0x76, 0xa5, 0x72, 0xc8, 0x11, 0x8d, 0x32,
-	0x21, 0xa5, 0x9e, 0xf5, 0xac, 0x1d, 0xd2, 0x98, 0x8a, 0xd0, 0x4a, 0xa4, 0x72, 0xd6, 0xb7, 0xa9,
-	0x58, 0x8e, 0xfd, 0x00, 0x82, 0xac, 0xc8, 0x93, 0xd4, 0x6c, 0xa5, 0x9a, 0x0d, 0x8e, 0x3b, 0x27,
-	0x1e, 0xdf, 0x0b, 0x30, 0xf8, 0x4c, 0x18, 0xab, 0x1c, 0x92, 0xb2, 0xe1, 0xf1, 0x14, 0x6d, 0xaa,
-	0x72, 0xe6, 0xdb, 0x53, 0x90, 0xa6, 0x88, 0xcb, 0x59, 0xe0, 0x22, 0x2e, 0xd1, 0xa6, 0x2c, 0xb4,
-	0x99, 0x81, 0x8d, 0x0e, 0x69, 0xf4, 0xb9, 0xad, 0x94, 0xa6, 0x4c, 0x46, 0x64, 0xd9, 0xf0, 0x16,
-	0xac, 0xaa, 0xba, 0x2e, 0xb4, 0x9c, 0x8d, 0xad, 0xae, 0xe6, 0xb1, 0x44, 0x0b, 0x2d, 0x72, 0x39,
-	0x9b, 0x90, 0xc2, 0x32, 0xf8, 0x0b, 0xad, 0x2a, 0xa5, 0x5f, 0x2b, 0x39, 0x3b, 0xb2, 0xbf, 0xa8,
-	0xf9, 0x30, 0x86, 0x7b, 0x16, 0xc9, 0xb3, 0x5c, 0xe2, 0x85, 0x98, 0xe7, 0xcb, 0x82, 0x9d, 0xc0,
-	0x20, 0x26, 0x21, 0x01, 0x3b, 0x3a, 0x9d, 0xee, 0x2f, 0x8d, 0x35, 0xe6, 0x4e, 0xcf, 0x1e, 0x41,
-	0x1f, 0xef, 0x8e, 0xbd, 0xac, 0xa3, 0xd3, 0xa3, 0xc3, 0xdb, 0xc5, 0xad, 0x32, 0xfc, 0x47, 0x07,
-	0x7a, 0xc8, 0xbf, 0xf5, 0xd2, 0x7f, 0x0c, 0x3e, 0x52, 0xad, 0xca, 0x35, 0x3c, 0xfb, 0x04, 0x82,
-	0x58, 0x2b, 0x61, 0x54, 0x24, 0x8c, 0xbb, 0x05, 0xbe, 0x15, 0x9c, 0x99, 0x96, 0x72, 0xb1, 0x73,
-	0xb5, 0x74, 0xca, 0x5f, 0xef, 0x50, 0xb9, 0x2d, 0xa5, 0xfb, 0x65, 0xdf, 0xc1, 0x48, 0x82, 0x33,
-	0x83, 0xa1, 0xa8, 0x5c, 0x2c, 0x32, 0x5b, 0x51, 0x9f, 0x3b, 0x8e, 0x7d, 0x04, 0x7e, 0x5a, 0x45,
-	0x22, 0x13, 0x7a, 0x43, 0xe5, 0xf4, 0xf9, 0x30, 0xad, 0xce, 0x90, 0x45, 0x95, 0x54, 0x59, 0xb4,
-	0xcc, 0x44, 0x42, 0x15, 0xf5, 0xf9, 0x50, 0xaa, 0xec, 0x59, 0x26, 0x92, 0xf0, 0x0a, 0x46, 0x98,
-	0xe0, 0xa5, 0xb4, 0x00, 0x86, 0xd0, 0xc3, 0xf8, 0x1d, 0x7c, 0x37, 0x51, 0x21, 0x1d, 0x7b, 0x00,
-	0xbd, 0x4a, 0x36, 0xc8, 0x4d, 0xf6, 0x36, 0x97, 0x72, 0xcd, 0x49, 0x15, 0xfe, 0xcb, 0x03, 0xb0,
-	0x80, 0x13, 0x7a, 0x37, 0xef, 0xfa, 0xa7, 0x00, 0xb6, 0x0c, 0x91, 0x6d, 0x17, 0x28, 0x0f, 0xac,
-	0x64, 0x2e, 0x2b, 0xf6, 0xa1, 0x7d, 0xfb, 0x51, 0x2a, 0x1d, 0x6c, 0x84, 0xf6, 0x1c, 0x9b, 0x42,
-	0x60, 0xd2, 0x8d, 0x8a, 0xf4, 0x36, 0x53, 0xb3, 0x1e, 0x1d, 0xdf, 0xaa, 0xf0, 0xb9, 0xd8, 0x3d,
-	0x35, 0x19, 0xf7, 0xd1, 0x84, 0x6f, 0x33, 0x85, 0xc7, 0x68, 0x25, 0x62, 0x63, 0xed, 0x2d, 0x8e,
-	0x01, 0x49, 0x48, 0xfd, 0x00, 0xc6, 0x56, 0x2d, 0xd5, 0xeb, 0x34, 0xb6, 0x70, 0x06, 0x7c, 0x44,
-	0xb2, 0x73, 0x12, 0x1d, 0x00, 0x37, 0x3c, 0x00, 0x8e, 0xfd, 0x08, 0x46, 0xae, 0x46, 0x2d, 0x58,
-	0xc1, 0x8a, 0xc8, 0x60, 0x5f, 0xa7, 0xe0, 0xa0, 0x4e, 0x0c, 0x7a, 0x55, 0xeb, 0xd9, 0x20, 0x8d,
-	0x19, 0xa7, 0x55, 0xb4, 0xdc, 0x66, 0x19, 0xbd, 0x1a, 0x9f, 0x0f, 0xd2, 0xea, 0xd9, 0x36, 0xcb,
-	0x58, 0x08, 0x93, 0x2c, 0xcd, 0xd7, 0x51, 0xa2, 0x8b, 0x6d, 0x89, 0x80, 0xd8, 0x87, 0x33, 0x42,
-	0xe1, 0x6f, 0x51, 0x36, 0x97, 0xe1, 0x37, 0x70, 0xe4, 0xb0, 0x4e, 0x37, 0x0a, 0x53, 0x7d, 0xa7,
-	0xde, 0xf2, 0x49, 0x1b, 0x4b, 0x77, 0x3b, 0x6b, 0xe4, 0xc2, 0x17, 0x30, 0xb0, 0x68, 0x62, 0x67,
-	0x96, 0x62, 0xe7, 0x5a, 0x1e, 0x92, 0xec, 0x14, 0xc0, 0xfe, 0x50, 0xe4, 0x89, 0x72, 0x97, 0xa0,
-	0xdd, 0x9c, 0xd1, 0x07, 0xaa, 0x38, 0xf9, 0x27, 0x32, 0xfc, 0x12, 0x82, 0x46, 0x8e, 0x6f, 0xbd,
-	0x32, 0x42, 0x1b, 0x17, 0xa0, 0x65, 0xf0, 0x20, 0x95, 0x4b, 0x17, 0x22, 0x92, 0xe1, 0x4b, 0x18,
-	0x5e, 0x14, 0xd9, 0x2e, 0x29, 0xf2, 0x77, 0x4a, 0xe8, 0x33, 0x18, 0x94, 0x45, 0x9a, 0x9b, 0x6a,
-	0xd6, 0xa5, 0x98, 0xde, 0xdf, 0xc7, 0x74, 0x81, 0x72, 0xee, 0xd4, 0x61, 0xdc, 0xe0, 0x25, 0xaa,
-	0xf5, 0x99, 0x4e, 0x2a, 0x7a, 0x8c, 0xf5, 0x7d, 0x74, 0xa7, 0xf8, 0xf5, 0x75, 0x64, 0xbf, 0x84,
-	0x80, 0x6e, 0xa3, 0xd0, 0x49, 0x7d, 0xe7, 0x3f, 0x3c, 0x7c, 0x17, 0x54, 0x08, 0x74, 0x64, 0x1f,
-	0x3f, 0x52, 0xe1, 0x1f, 0x60, 0x72, 0xa0, 0x6a, 0x5f, 0xea, 0xce, 0xc1, 0xa5, 0xfe, 0x02, 0xc0,
-	0x56, 0xb7, 0x75, 0x00, 0x3b, 0x3c, 0x80, 0x7c, 0x07, 0x49, 0xed, 0x2b, 0xfc, 0x8f, 0x07, 0x7e,
-	0x13, 0xfc, 0x4d, 0x6c, 0x1e, 0xc1, 0x91, 0x4b, 0xa6, 0x3e, 0xcf, 0xa2, 0x34, 0x8e, 0x9b, 0xa4,
-	0xe7, 0xf2, 0x30, 0xe5, 0xee, 0x8d, 0x94, 0x3f, 0x05, 0x28, 0x2d, 0xf2, 0xa8, 0xb5, 0xdd, 0x29,
-	0x70, 0x92, 0xb9, 0x64, 0xdf, 0xa7, 0x49, 0x1f, 0xb9, 0x71, 0x83, 0x15, 0x94, 0xe8, 0x32, 0x84,
-	0x09, 0x8a, 0x85, 0x4e, 0x22, 0x91, 0xa5, 0xa2, 0xaa, 0x1f, 0x54, 0x25, 0x31, 0xd0, 0x33, 0x14,
-	0x61, 0xbf, 0x2c, 0x4a, 0xa5, 0x85, 0x29, 0x34, 0x3d, 0xa8, 0x80, 0x37, 0x3c, 0x7b, 0x08, 0x93,
-	0x9a, 0x8e, 0x68, 0xec, 0xd9, 0xe1, 0x33, 0xae, 0x85, 0x57, 0x38, 0xfe, 0x5a, 0x87, 0xbc, 0x16,
-	0xd9, 0x56, 0xb9, 0x79, 0xe4, 0x0e, 0x79, 0x89, 0xa2, 0x3b, 0x5f, 0x58, 0x08, 0x13, 0xbc, 0xe9,
-	0xd1, 0x75, 0x6a, 0x56, 0x51, 0xa9, 0xeb, 0xe9, 0x34, 0x42, 0xe1, 0xef, 0x52, 0xb3, 0xba, 0xd0,
-	0xf4, 0xda, 0x6f, 0xbc, 0xb3, 0x61, 0xe2, 0xde, 0xd8, 0x5f, 0x3d, 0xe8, 0x5e, 0xca, 0xdb, 0x9d,
-	0xec, 0x23, 0xf0, 0x31, 0x1c, 0x0a, 0xd7, 0xc2, 0x3c, 0xac, 0xe4, 0x9a, 0x22, 0x75, 0xaa, 0xd6,
-	0x0e, 0x80, 0xaa, 0x17, 0x78, 0x55, 0x1f, 0x41, 0x8f, 0x8a, 0x7d, 0xab, 0x85, 0x5d, 0x52, 0x16,
-	0x9c, 0xb4, 0x98, 0x46, 0x1a, 0x17, 0xb9, 0x03, 0x99, 0x68, 0x7c, 0x25, 0x5b, 0x9d, 0x39, 0x64,
-	0x91, 0xc4, 0x3e, 0xe4, 0x06, 0x09, 0x3e, 0x37, 0x07, 0x2a, 0x58, 0x11, 0xbe, 0xb9, 0x56, 0xa3,
-	0x22, 0x03, 0x0b, 0xaa, 0x6b, 0x54, 0x64, 0x70, 0x30, 0x8a, 0x82, 0x1b, 0xa3, 0x68, 0x06, 0x43,
-	0xdb, 0xb7, 0x24, 0xc1, 0x19, 0xf0, 0x9a, 0x3d, 0xe8, 0x8d, 0x16, 0xcc, 0x66, 0xa8, 0xfc, 0xb9,
-	0x03, 0x03, 0x9b, 0x0a, 0x3e, 0x76, 0x7b, 0x19, 0x2c, 0x3a, 0x96, 0xb9, 0x6b, 0x37, 0x6a, 0x96,
-	0x1d, 0xb7, 0xd8, 0xd4, 0xcb, 0xce, 0x66, 0x5b, 0xd9, 0x19, 0xe8, 0x73, 0xa2, 0xd1, 0xa3, 0x6d,
-	0x3d, 0x16, 0x04, 0xcb, 0x34, 0x35, 0x1f, 0xee, 0x6b, 0x1e, 0x3e, 0x84, 0x3e, 0xbd, 0x7c, 0x36,
-	0x86, 0xce, 0x1b, 0xd7, 0xc2, 0x3a, 0x6f, 0x90, 0xdb, 0xb9, 0x6d, 0xad, 0xb3, 0x0b, 0xbf, 0x83,
-	0x1e, 0x57, 0x31, 0xad, 0x7d, 0x99, 0x5a, 0x1a, 0x67, 0x46, 0x34, 0xa2, 0x6d, 0x8a, 0xd2, 0xd9,
-	0x22, 0x49, 0x87, 0xd3, 0xce, 0xe8, 0x96, 0x59, 0x62, 0xb0, 0xd5, 0x2f, 0x0a, 0x63, 0x8a, 0x0d,
-	0x05, 0xdf, 0xe7, 0x8e, 0x0b, 0x13, 0x08, 0x9e, 0x89, 0x58, 0x9d, 0xe5, 0x49, 0x46, 0x3b, 0xee,
-	0x4e, 0x5c, 0xd7, 0x9d, 0x74, 0x27, 0xae, 0xd1, 0x59, 0x99, 0x9a, 0x78, 0xe5, 0x0e, 0xb0, 0x0c,
-	0xad, 0x5e, 0x45, 0x96, 0xd5, 0x4b, 0x1f, 0xd2, 0xec, 0x87, 0x00, 0x71, 0x91, 0x2f, 0x53, 0xa9,
-	0xf2, 0xd8, 0x22, 0xe4, 0xf1, 0x96, 0x24, 0x7c, 0x03, 0x70, 0xb5, 0x5a, 0x1a, 0xae, 0xaa, 0x6d,
-	0x46, 0xe1, 0x24, 0x2a, 0x97, 0x4a, 0xbb, 0xc3, 0x1c, 0x87, 0x11, 0x88, 0x44, 0xd5, 0xe9, 0x08,
-	0x8b, 0x9a, 0x16, 0x71, 0xb3, 0x60, 0x22, 0x4d, 0xc9, 0x28, 0xb1, 0x35, 0xbb, 0x26, 0x19, 0xe2,
-	0xa8, 0x6d, 0x6f, 0x52, 0x37, 0x48, 0xfb, 0xdc, 0x32, 0xe1, 0xdf, 0x3d, 0x18, 0x62, 0x8e, 0x17,
-	0x45, 0xc5, 0x7e, 0x02, 0x03, 0x1d, 0x23, 0x73, 0x7b, 0x7d, 0x40, 0x88, 0xb9, 0xd3, 0xe2, 0x18,
-	0x2f, 0xcd, 0x73, 0xb5, 0x34, 0xbf, 0xd9, 0x29, 0xb7, 0xdd, 0xdf, 0x6a, 0xd6, 0x7b, 0x0b, 0xf6,
-	0x0b, 0x80, 0xd2, 0x70, 0x04, 0x1a, 0xed, 0xbb, 0x77, 0xdb, 0xb7, 0x4c, 0xd8, 0x4f, 0x61, 0x58,
-	0x9a, 0xaf, 0x8a, 0xad, 0x59, 0x51, 0x0a, 0x77, 0x58, 0xd7, 0x7a, 0x1a, 0x1a, 0xe6, 0x45, 0x51,
-	0xd9, 0xac, 0xee, 0x1c, 0x1a, 0xa4, 0x66, 0x3f, 0x83, 0xc1, 0x92, 0xea, 0x48, 0xd7, 0xee, 0x60,
-	0xe2, 0x35, 0x25, 0xe6, 0xce, 0x04, 0x1f, 0xcd, 0x1f, 0xb7, 0x22, 0x4b, 0xcd, 0xce, 0xdd, 0xc7,
-	0x9a, 0xc5, 0x42, 0x2e, 0x45, 0x9c, 0x8a, 0xec, 0x1c, 0x3f, 0x31, 0x7c, 0xfa, 0xc4, 0x68, 0x49,
-	0xc2, 0x7f, 0x7a, 0xe0, 0xa3, 0x3f, 0x5a, 0xc6, 0xfe, 0x8f, 0xe7, 0xff, 0x8a, 0x27, 0x5e, 0xe6,
-	0x25, 0xc2, 0x79, 0x4e, 0x8d, 0xad, 0xcb, 0x1d, 0x17, 0x7e, 0x0b, 0xc3, 0xaf, 0x17, 0xaf, 0x08,
-	0xe5, 0x47, 0xd0, 0xd7, 0xf1, 0xd7, 0x8b, 0x57, 0x6f, 0x01, 0xd9, 0x2a, 0xa9, 0x15, 0xec, 0xf6,
-	0xad, 0x60, 0x67, 0x3f, 0x7f, 0x74, 0xb1, 0x20, 0x00, 0x3d, 0x4e, 0x74, 0xf8, 0x12, 0xc6, 0x17,
-	0x42, 0x8b, 0x4d, 0xfd, 0x22, 0x1e, 0x42, 0xb7, 0x2c, 0x2a, 0xe7, 0xf9, 0xde, 0x61, 0x8a, 0x17,
-	0x45, 0xc5, 0x51, 0xcb, 0x1e, 0x40, 0x37, 0xdd, 0x24, 0xb7, 0x0b, 0x47, 0x1f, 0xaf, 0x1c, 0x75,
-	0xe1, 0xaf, 0x60, 0xda, 0xf8, 0x7d, 0x5a, 0x6c, 0xf0, 0x1b, 0x13, 0xdf, 0xe3, 0x52, 0x09, 0xf3,
-	0x05, 0x79, 0x1f, 0x73, 0xcb, 0xd4, 0xd2, 0x53, 0x72, 0xe7, 0xa4, 0xa7, 0xa1, 0x84, 0x7b, 0xfb,
-	0xb8, 0x34, 0x0e, 0x54, 0xb3, 0x63, 0x9f, 0xc3, 0x40, 0x53, 0xc3, 0x70, 0xf1, 0xdd, 0x6f, 0x2d,
-	0x1d, 0x4d, 0x33, 0xe1, 0xce, 0xe6, 0x5d, 0xa2, 0xfc, 0xce, 0x65, 0xff, 0xfb, 0x22, 0x2b, 0x10,
-	0xb3, 0xcf, 0xf0, 0xcb, 0x7f, 0x49, 0xf9, 0x77, 0x0f, 0xf3, 0x77, 0xd8, 0x73, 0xab, 0x7f, 0x17,
-	0xdf, 0x7f, 0xe9, 0xc0, 0xfb, 0xe7, 0x8b, 0xa7, 0x2b, 0x6c, 0xf6, 0xf5, 0xbf, 0x06, 0x9f, 0xe3,
-	0x37, 0x1c, 0x2e, 0xd8, 0x18, 0xff, 0xd1, 0xe9, 0x07, 0xed, 0xa5, 0x69, 0x91, 0x29, 0x6b, 0x2c,
-	0xb9, 0x35, 0x72, 0xa3, 0xdb, 0x6b, 0x46, 0xf7, 0x63, 0x18, 0x88, 0xd8, 0xa4, 0x45, 0x4e, 0x15,
-	0x3c, 0x6a, 0xef, 0x5c, 0xe7, 0x8b, 0x33, 0xd2, 0x70, 0x67, 0x41, 0xa3, 0x38, 0x5f, 0x16, 0xf5,
-	0x6c, 0x42, 0x3a, 0xfc, 0x77, 0x07, 0x26, 0x76, 0x8f, 0x7c, 0xdb, 0x96, 0x7a, 0xb0, 0x63, 0x79,
-	0x37, 0x76, 0xac, 0xbb, 0x46, 0xe0, 0x0c, 0x86, 0x6e, 0xcb, 0x72, 0x27, 0xd5, 0x2c, 0x7e, 0xab,
-	0x18, 0x9d, 0x26, 0x89, 0xd2, 0x51, 0x96, 0xe6, 0xf5, 0xc7, 0xcc, 0xc8, 0xc9, 0x9e, 0xa7, 0xb9,
-	0x62, 0x3f, 0x86, 0x23, 0x99, 0x6a, 0x45, 0x01, 0x5b, 0x23, 0x3b, 0x20, 0x27, 0x8d, 0x94, 0xcc,
-	0xea, 0x31, 0x3b, 0x6c, 0x8d, 0xd9, 0x87, 0x30, 0x91, 0x6a, 0x89, 0x93, 0x24, 0xaa, 0x8c, 0x30,
-	0x76, 0x49, 0xe8, 0xf3, 0xb1, 0x13, 0x5e, 0xa2, 0xec, 0xf1, 0x9f, 0x60, 0xdc, 0x86, 0x95, 0x8d,
-	0xc1, 0xbf, 0x8a, 0x2c, 0x00, 0xd3, 0xf7, 0xd8, 0x14, 0xc6, 0x35, 0x87, 0x1b, 0xe6, 0xb4, 0xc3,
-	0xee, 0xc3, 0xb4, 0x2d, 0xc1, 0x5d, 0x75, 0xea, 0x31, 0x80, 0xc1, 0x55, 0x44, 0x16, 0x5d, 0x36,
-	0x81, 0xc0, 0xd2, 0x97, 0x72, 0x3d, 0xed, 0xb1, 0x7b, 0x30, 0x69, 0x58, 0xfc, 0x0a, 0x99, 0xf6,
-	0x59, 0x00, 0xfd, 0xab, 0x08, 0xb5, 0x83, 0xc7, 0x4f, 0xc0, 0xaf, 0xcb, 0x82, 0x4e, 0xe6, 0x79,
-	0xa5, 0xb4, 0x99, 0xbe, 0x87, 0xf4, 0xb7, 0xb4, 0xcb, 0x4c, 0x3b, 0x48, 0x9f, 0xab, 0x4c, 0x19,
-	0x35, 0xf5, 0x16, 0x03, 0xaa, 0xe6, 0x97, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x28, 0x3d, 0xf1,
-	0x85, 0xd6, 0x12, 0x00, 0x00,
+	0x11, 0x8f, 0xfe, 0xac, 0xa4, 0x6d, 0x49, 0x17, 0x79, 0x30, 0x89, 0x92, 0x10, 0xb0, 0xd7, 0x86,
+	0x38, 0x26, 0x98, 0xe2, 0x92, 0x67, 0xaa, 0x0e, 0x1f, 0xa6, 0xae, 0xca, 0x71, 0x2e, 0x73, 0x17,
+	0x53, 0xe4, 0x01, 0xd5, 0x68, 0x67, 0xb4, 0xb7, 0xb9, 0xd5, 0xee, 0x32, 0x3b, 0xf2, 0x59, 0x0f,
+	0xbc, 0xf1, 0xce, 0x07, 0xe1, 0x8b, 0xf0, 0xc0, 0x77, 0xe0, 0x89, 0x17, 0x28, 0xbe, 0x03, 0xd5,
+	0xdd, 0xb3, 0xab, 0xd5, 0xdd, 0xb9, 0x70, 0x15, 0xaf, 0xbc, 0xf5, 0x3f, 0xf5, 0xf4, 0xfc, 0xba,
+	0xa7, 0xbb, 0x57, 0x70, 0x50, 0xda, 0xc2, 0x15, 0xeb, 0x2a, 0x79, 0x42, 0x84, 0x18, 0xd5, 0x7c,
+	0xf4, 0x35, 0x84, 0xe7, 0xaa, 0xba, 0x7c, 0xae, 0x96, 0x26, 0x13, 0xef, 0xc1, 0xc0, 0xa9, 0xea,
+	0x32, 0xd5, 0xf3, 0xce, 0xbd, 0xce, 0xa3, 0x50, 0x7a, 0x0e, 0xe5, 0x95, 0xbe, 0x4c, 0x75, 0x35,
+	0xef, 0xde, 0xeb, 0xa1, 0x9c, 0x39, 0x71, 0x17, 0x82, 0x34, 0xd7, 0xe6, 0xf5, 0xbc, 0x77, 0xaf,
+	0xf3, 0x28, 0x90, 0xcc, 0x44, 0x0a, 0xe0, 0x4c, 0x5f, 0x7e, 0x69, 0xaa, 0x4a, 0x25, 0x46, 0xcc,
+	0xa0, 0x17, 0x37, 0x0e, 0x91, 0x14, 0x3f, 0x83, 0x21, 0xfa, 0xcd, 0xd4, 0x72, 0xde, 0xbd, 0xd7,
+	0x79, 0x34, 0x3e, 0xfc, 0xde, 0x93, 0x26, 0xbc, 0x26, 0x16, 0x59, 0xdb, 0x08, 0x01, 0x7d, 0xad,
+	0x9c, 0xa2, 0x33, 0x26, 0x92, 0xe8, 0xe8, 0x04, 0x82, 0x93, 0x35, 0x7a, 0xbf, 0x0b, 0xc1, 0x55,
+	0xaa, 0xdd, 0x05, 0xf9, 0x0f, 0x24, 0x33, 0x18, 0xef, 0x85, 0x49, 0x93, 0x0b, 0x47, 0x07, 0x04,
+	0xd2, 0x73, 0xb7, 0xba, 0x7a, 0x06, 0xfd, 0x23, 0x6b, 0x94, 0x38, 0x80, 0xae, 0x0f, 0x33, 0x90,
+	0xdd, 0x54, 0x8b, 0x0f, 0x61, 0x54, 0x2a, 0x6b, 0x72, 0x97, 0x6a, 0xef, 0xa5, 0xe1, 0xd1, 0x4f,
+	0xae, 0xd6, 0x86, 0xfc, 0x84, 0x92, 0xe8, 0xe8, 0xaf, 0x5d, 0x18, 0x3c, 0x55, 0x6b, 0x63, 0xdb,
+	0xae, 0x42, 0x72, 0x55, 0x9b, 0x77, 0x77, 0xe6, 0x28, 0x73, 0xdb, 0xd2, 0x78, 0xe4, 0x88, 0x46,
+	0x99, 0xd2, 0xda, 0xce, 0xfb, 0x6c, 0x87, 0x34, 0x5e, 0x45, 0x59, 0xa3, 0x52, 0x3d, 0x0f, 0xf8,
+	0x2a, 0xcc, 0x89, 0x1f, 0x40, 0x98, 0x15, 0x79, 0x92, 0xba, 0x8d, 0x36, 0xf3, 0xc1, 0xbd, 0xce,
+	0xa3, 0xae, 0xdc, 0x09, 0x30, 0xf8, 0x4c, 0x39, 0x56, 0x0e, 0x49, 0xd9, 0xf0, 0x78, 0x8a, 0x75,
+	0x55, 0x39, 0x1f, 0xf1, 0x29, 0x48, 0x53, 0xc4, 0xe5, 0x3c, 0xf4, 0x11, 0x97, 0x68, 0x53, 0x16,
+	0xd6, 0xcd, 0x81, 0xa3, 0x43, 0x1a, 0x7d, 0x6e, 0x2a, 0x63, 0xe9, 0x26, 0x63, 0xb2, 0x6c, 0x78,
+	0x06, 0xab, 0xaa, 0xae, 0x0a, 0xab, 0xe7, 0x13, 0xd6, 0xd5, 0x3c, 0xa6, 0x68, 0x69, 0x55, 0xae,
+	0xe7, 0x53, 0x52, 0x30, 0x83, 0xbf, 0xb0, 0xa6, 0x32, 0xf6, 0x95, 0xd1, 0xf3, 0x03, 0xfe, 0x45,
+	0xcd, 0x47, 0x31, 0xdc, 0x61, 0x24, 0x8f, 0x72, 0x8d, 0x05, 0x71, 0x92, 0xaf, 0x0a, 0xf1, 0x08,
+	0x06, 0x31, 0x09, 0x09, 0xd8, 0xf1, 0xe1, 0x6c, 0x57, 0x34, 0x6c, 0x2c, 0xbd, 0x5e, 0x3c, 0x84,
+	0x00, 0x6b, 0x87, 0x8b, 0x75, 0x7c, 0x78, 0xb0, 0x5f, 0x5d, 0x92, 0x95, 0xd1, 0xdf, 0x3b, 0xd0,
+	0x47, 0xfe, 0x8d, 0x45, 0xff, 0x21, 0x8c, 0x90, 0x6a, 0x65, 0xae, 0xe1, 0xc5, 0x47, 0x10, 0xc6,
+	0xd6, 0x28, 0x67, 0x16, 0xca, 0xf9, 0x2a, 0x18, 0xb1, 0xe0, 0xc8, 0xb5, 0x94, 0xcb, 0xad, 0xcf,
+	0xa5, 0x57, 0xfe, 0x6a, 0x8b, 0xca, 0x4d, 0xa9, 0xfd, 0x2f, 0x03, 0x0f, 0x23, 0x09, 0x8e, 0x1c,
+	0x86, 0x62, 0x72, 0xb5, 0xcc, 0x38, 0xa3, 0x23, 0xe9, 0x39, 0xf1, 0x01, 0x8c, 0xd2, 0x6a, 0xa1,
+	0x32, 0x65, 0xd7, 0x94, 0xce, 0x91, 0x1c, 0xa6, 0xd5, 0x11, 0xb2, 0xa8, 0xd2, 0x26, 0x5b, 0xac,
+	0x32, 0x95, 0x50, 0x46, 0x47, 0x72, 0xa8, 0x4d, 0xf6, 0x2c, 0x53, 0x49, 0x74, 0x0e, 0x63, 0xbc,
+	0xe0, 0x99, 0x66, 0x00, 0x23, 0xe8, 0x63, 0xfc, 0x1e, 0xbe, 0xeb, 0xa8, 0x90, 0x4e, 0xdc, 0x87,
+	0x7e, 0xa5, 0x1b, 0xe4, 0xa6, 0x3b, 0x9b, 0x33, 0x7d, 0x29, 0x49, 0x15, 0xfd, 0xb3, 0x0b, 0xc0,
+	0x80, 0x13, 0x7a, 0xd7, 0x6b, 0xfd, 0x63, 0x00, 0x4e, 0xc3, 0x82, 0xdb, 0x05, 0xca, 0x43, 0x96,
+	0x9c, 0xe8, 0x4a, 0xbc, 0xcf, 0x6f, 0x7f, 0x91, 0x6a, 0x0f, 0x1b, 0xa1, 0x7d, 0x82, 0x4d, 0x21,
+	0x74, 0xe9, 0xda, 0x2c, 0xec, 0x26, 0x33, 0xf3, 0x3e, 0x1d, 0xdf, 0xca, 0xf0, 0xb1, 0xda, 0x3e,
+	0x75, 0x99, 0x1c, 0xa1, 0x89, 0xdc, 0x64, 0x06, 0x8f, 0xb1, 0x46, 0xc5, 0x8e, 0xed, 0x19, 0xc7,
+	0x90, 0x24, 0xa4, 0xbe, 0x0f, 0x13, 0x56, 0x6b, 0xf3, 0x2a, 0x8d, 0x19, 0xce, 0x50, 0x8e, 0x49,
+	0x76, 0x4c, 0xa2, 0x3d, 0xe0, 0x86, 0x7b, 0xc0, 0x89, 0x1f, 0xc1, 0xd8, 0xe7, 0xa8, 0x05, 0x2b,
+	0xb0, 0x88, 0x0c, 0x76, 0x79, 0x0a, 0xf7, 0xf2, 0x24, 0xa0, 0x5f, 0xb5, 0x9e, 0x0d, 0xd2, 0x78,
+	0xe3, 0xb4, 0x5a, 0xac, 0x36, 0x59, 0x46, 0xaf, 0x66, 0x24, 0x07, 0x69, 0xf5, 0x6c, 0x93, 0x65,
+	0x22, 0x82, 0x69, 0x96, 0xe6, 0x97, 0x8b, 0xc4, 0x16, 0x9b, 0x12, 0x01, 0xe1, 0x87, 0x33, 0x46,
+	0xe1, 0x6f, 0x50, 0x76, 0xa2, 0xa3, 0xaf, 0xe1, 0xc0, 0x63, 0x9d, 0xae, 0x0d, 0x5e, 0xf5, 0xad,
+	0x7a, 0xcb, 0x47, 0x6d, 0x2c, 0x7d, 0x75, 0xd6, 0xc8, 0x45, 0x2f, 0x60, 0xc0, 0x68, 0x62, 0x67,
+	0xd6, 0x6a, 0xeb, 0x5b, 0x1e, 0x92, 0xe2, 0x10, 0x80, 0x7f, 0xa8, 0xf2, 0xc4, 0xf8, 0x22, 0x68,
+	0x37, 0x67, 0xf4, 0x81, 0x2a, 0x49, 0xfe, 0x89, 0x8c, 0x3e, 0x87, 0xb0, 0x91, 0xe3, 0x5b, 0xaf,
+	0x9c, 0xb2, 0xce, 0x07, 0xc8, 0x0c, 0x1e, 0x64, 0x72, 0xed, 0x43, 0x44, 0x32, 0x7a, 0x09, 0xc3,
+	0xd3, 0x22, 0xdb, 0x26, 0x45, 0xfe, 0x56, 0x17, 0xfa, 0x04, 0x06, 0x65, 0x91, 0xe6, 0xae, 0x9a,
+	0xf7, 0x28, 0xa6, 0x77, 0x77, 0x31, 0x9d, 0xa2, 0x5c, 0x7a, 0x75, 0x14, 0x37, 0x78, 0xa9, 0xea,
+	0xf2, 0xc8, 0x26, 0x15, 0x3d, 0xc6, 0xba, 0x1e, 0xfd, 0x29, 0xa3, 0xba, 0x1c, 0xc5, 0x17, 0x10,
+	0x52, 0x35, 0x2a, 0x9b, 0xd4, 0x35, 0xff, 0xfe, 0xfe, 0xbb, 0xa0, 0x44, 0xa0, 0x23, 0x7e, 0xfc,
+	0x48, 0x45, 0xbf, 0x87, 0xe9, 0x9e, 0xaa, 0x5d, 0xd4, 0x9d, 0xbd, 0xa2, 0xfe, 0x02, 0xc6, 0x9c,
+	0x5d, 0xcc, 0x44, 0x75, 0x13, 0x50, 0x72, 0x81, 0x59, 0x91, 0x90, 0xd4, 0x64, 0x85, 0x23, 0xb9,
+	0x51, 0x60, 0x99, 0x36, 0x05, 0xc2, 0xce, 0x87, 0x09, 0x17, 0x87, 0xf8, 0x14, 0x82, 0xff, 0xea,
+	0x97, 0x2d, 0xa2, 0x7f, 0x75, 0xa1, 0x2f, 0x6f, 0x2b, 0x9f, 0x87, 0x70, 0xe0, 0xe1, 0xa9, 0x6f,
+	0xc0, 0xb8, 0x4f, 0xe2, 0x06, 0xc6, 0x13, 0xbd, 0x0f, 0x62, 0xef, 0x1a, 0x88, 0x1f, 0x03, 0x94,
+	0x9c, 0x4b, 0xd4, 0x72, 0xbf, 0x0b, 0xbd, 0xe4, 0x44, 0x8b, 0xef, 0xd3, 0xee, 0xb0, 0xf0, 0x03,
+	0x0c, 0x6b, 0x42, 0xa3, 0xcb, 0x08, 0xa6, 0x28, 0x56, 0x36, 0x59, 0xa8, 0x2c, 0x55, 0x55, 0xfd,
+	0x44, 0x2b, 0x8d, 0x20, 0x1f, 0xa1, 0x08, 0x3b, 0x70, 0x51, 0x1a, 0xab, 0x5c, 0x61, 0xe9, 0x89,
+	0x86, 0xb2, 0xe1, 0xc5, 0x03, 0x98, 0xd6, 0xf4, 0x82, 0x06, 0x29, 0x8f, 0xb3, 0x49, 0x2d, 0x3c,
+	0xc7, 0x81, 0xda, 0x3a, 0xe4, 0x95, 0xca, 0x36, 0xc6, 0x4f, 0x38, 0x7f, 0xc8, 0x4b, 0x14, 0xdd,
+	0xfa, 0x66, 0x23, 0x98, 0x22, 0x6e, 0x8b, 0xab, 0xd4, 0x5d, 0x2c, 0x4a, 0x5b, 0xcf, 0xbb, 0x31,
+	0x0a, 0x7f, 0x9b, 0xba, 0x8b, 0x53, 0xbb, 0x9f, 0x98, 0xc9, 0x5e, 0x62, 0xa2, 0xbf, 0x74, 0xa1,
+	0x77, 0xa6, 0x6f, 0xf6, 0xc6, 0x0f, 0x60, 0x84, 0xe1, 0x50, 0xb8, 0x0c, 0xf3, 0xb0, 0xd2, 0x97,
+	0x14, 0xa9, 0x57, 0xb5, 0xb6, 0x0a, 0x54, 0xbd, 0xc0, 0xe2, 0x7f, 0x08, 0x7d, 0xaa, 0xcf, 0x1b,
+	0x4d, 0xf1, 0x8c, 0x6e, 0x21, 0x49, 0x8b, 0xd7, 0x48, 0xe3, 0x22, 0xf7, 0x20, 0x13, 0x8d, 0xef,
+	0x6e, 0x63, 0x33, 0x8f, 0x2c, 0x92, 0xd8, 0xd9, 0xfc, 0x68, 0xc2, 0x07, 0xec, 0x41, 0x05, 0x16,
+	0xe1, 0x2b, 0x6e, 0xb5, 0x3e, 0x32, 0x60, 0x50, 0x7d, 0xeb, 0x23, 0x83, 0xbd, 0xe1, 0x16, 0x5e,
+	0x1b, 0x6e, 0x73, 0x18, 0x72, 0x27, 0xd4, 0x04, 0x67, 0x28, 0x6b, 0x76, 0xaf, 0xdb, 0x32, 0x98,
+	0xcd, 0x98, 0xfa, 0x53, 0x07, 0x06, 0x7c, 0x15, 0x6c, 0x1f, 0x5c, 0x0c, 0x8c, 0x0e, 0x33, 0xb7,
+	0x6d, 0x5b, 0xcd, 0xfa, 0xe4, 0x57, 0xa5, 0x7a, 0x7d, 0x5a, 0x6f, 0x2a, 0x9e, 0xaa, 0x23, 0x49,
+	0x34, 0x7a, 0xe4, 0x66, 0xc6, 0x20, 0x30, 0xd3, 0xe4, 0x7c, 0xb8, 0xcb, 0x79, 0xf4, 0x00, 0x02,
+	0xea, 0x25, 0x62, 0x02, 0x9d, 0xd7, 0xbe, 0x29, 0x76, 0x5e, 0x23, 0xb7, 0xf5, 0xfb, 0x5f, 0x67,
+	0x1b, 0x7d, 0x0b, 0x7d, 0x69, 0x62, 0x5a, 0x24, 0x33, 0xb3, 0x72, 0xde, 0x8c, 0x68, 0x44, 0xdb,
+	0x15, 0xa5, 0xb7, 0x45, 0x92, 0x0e, 0xa7, 0x2d, 0xd4, 0xaf, 0xc7, 0xc4, 0xe0, 0xf0, 0x58, 0x16,
+	0xce, 0x15, 0x6b, 0x0a, 0x3e, 0x90, 0x9e, 0x8b, 0x12, 0x08, 0x9f, 0xa9, 0xd8, 0x1c, 0xe5, 0x49,
+	0x46, 0x5b, 0xf3, 0x56, 0x5d, 0xd5, 0xbd, 0x79, 0xab, 0xae, 0xd0, 0x59, 0x99, 0xba, 0xf8, 0xc2,
+	0x1f, 0xc0, 0x0c, 0x2d, 0x73, 0x45, 0x96, 0xd5, 0x6b, 0x24, 0xd2, 0xe2, 0x87, 0x00, 0x71, 0x91,
+	0xaf, 0x52, 0x6d, 0xf2, 0x98, 0x11, 0xea, 0xca, 0x96, 0x24, 0x7a, 0x0d, 0x70, 0x7e, 0xb1, 0x72,
+	0xd2, 0x54, 0x9b, 0x8c, 0xc2, 0x49, 0x4c, 0xae, 0x8d, 0xf5, 0x87, 0x79, 0x0e, 0x23, 0x50, 0x89,
+	0xa9, 0xaf, 0xa3, 0x18, 0x35, 0xab, 0xe2, 0x66, 0x65, 0x45, 0x9a, 0x2e, 0x63, 0xd4, 0xc6, 0x6d,
+	0x9b, 0xcb, 0x10, 0x47, 0x83, 0x60, 0x9d, 0xfa, 0xd1, 0x1c, 0x48, 0x66, 0xa2, 0xbf, 0x75, 0x61,
+	0x88, 0x77, 0x3c, 0x2d, 0x2a, 0xf1, 0x13, 0x18, 0xd8, 0x18, 0x99, 0x9b, 0x0b, 0x09, 0x42, 0x2c,
+	0xbd, 0x16, 0x17, 0x83, 0xd2, 0x3d, 0x37, 0x2b, 0xf7, 0xeb, 0xad, 0xf1, 0xdf, 0x0b, 0x37, 0xda,
+	0xff, 0xce, 0x42, 0xfc, 0x1c, 0xa0, 0x74, 0x12, 0x81, 0x46, 0xfb, 0xde, 0xed, 0xf6, 0x2d, 0x13,
+	0xf1, 0x29, 0x0c, 0x4b, 0xf7, 0x65, 0xb1, 0x71, 0x17, 0x74, 0x85, 0x5b, 0xac, 0x6b, 0x3d, 0x8d,
+	0x21, 0xf7, 0xa2, 0xa8, 0xf8, 0x56, 0xb7, 0x8e, 0x21, 0x52, 0x8b, 0x9f, 0xc2, 0x60, 0x45, 0x79,
+	0xa4, 0xb2, 0xdb, 0x6b, 0xcd, 0x4d, 0x8a, 0xa5, 0x37, 0xc1, 0x47, 0xf3, 0x87, 0x8d, 0xca, 0x52,
+	0xb7, 0xf5, 0xf5, 0x58, 0xb3, 0x98, 0xc8, 0x95, 0x8a, 0x53, 0x95, 0x1d, 0xe3, 0x47, 0xcb, 0x88,
+	0x3e, 0x5a, 0x5a, 0x92, 0xe8, 0x1f, 0x5d, 0x18, 0xa1, 0x3f, 0x5a, 0xef, 0xfe, 0x8f, 0xe7, 0xff,
+	0x8a, 0x27, 0x16, 0xf3, 0x0a, 0xe1, 0x3c, 0xa6, 0xc6, 0xd6, 0x93, 0x9e, 0x8b, 0xbe, 0x81, 0xe1,
+	0x57, 0xcb, 0xef, 0x08, 0xe5, 0x87, 0x10, 0xd8, 0xf8, 0xab, 0xe5, 0x77, 0x6f, 0x00, 0x99, 0x95,
+	0xd4, 0x0a, 0xb6, 0xbb, 0x56, 0xb0, 0xe5, 0x0f, 0x2a, 0x5b, 0x2c, 0x09, 0xc0, 0xae, 0x24, 0x3a,
+	0x7a, 0x09, 0x93, 0x53, 0x65, 0xd5, 0xba, 0x7e, 0x11, 0x0f, 0xa0, 0x57, 0x16, 0x95, 0xf7, 0x7c,
+	0x67, 0xff, 0x8a, 0xa7, 0x45, 0x25, 0x51, 0x2b, 0xee, 0x43, 0x2f, 0x5d, 0x27, 0x37, 0x13, 0x47,
+	0x9f, 0xc3, 0x12, 0x75, 0xd1, 0x2f, 0x61, 0xd6, 0xf8, 0x7d, 0x5a, 0xac, 0xf1, 0xab, 0x15, 0xdf,
+	0xe3, 0xca, 0x28, 0xf7, 0x0b, 0xf2, 0x3e, 0x91, 0xcc, 0xd4, 0xd2, 0x43, 0x72, 0xe7, 0xa5, 0x87,
+	0x91, 0x86, 0x3b, 0xbb, 0xb8, 0x2c, 0x0e, 0x54, 0xb7, 0x15, 0x9f, 0xc1, 0xc0, 0x52, 0xc3, 0xf0,
+	0xf1, 0xdd, 0x6d, 0xed, 0x49, 0x4d, 0x33, 0x91, 0xde, 0xe6, 0x6d, 0xa2, 0xfc, 0xd6, 0xdf, 0xfe,
+	0x77, 0x45, 0x56, 0x20, 0x66, 0x9f, 0x40, 0x90, 0xe6, 0x2b, 0xba, 0x7f, 0x6f, 0xff, 0xfe, 0x1e,
+	0x7b, 0xc9, 0xfa, 0xb7, 0xf1, 0xfd, 0xe7, 0x0e, 0xbc, 0x7b, 0xbc, 0x7c, 0x7a, 0x81, 0xcd, 0xbe,
+	0xfe, 0x1f, 0xe2, 0x33, 0xfc, 0x2a, 0xc4, 0x95, 0x1d, 0xe3, 0x3f, 0x38, 0x7c, 0xaf, 0xbd, 0xe7,
+	0x2d, 0x33, 0xc3, 0xc6, 0x5a, 0xb2, 0x91, 0x1f, 0xdd, 0xdd, 0x66, 0x74, 0x3f, 0x86, 0x81, 0x8a,
+	0x5d, 0x5a, 0xe4, 0x94, 0xc1, 0x83, 0x43, 0xd1, 0xfa, 0x36, 0x59, 0x1e, 0x91, 0x46, 0x7a, 0x0b,
+	0x1a, 0xc5, 0xf9, 0xaa, 0xa8, 0x67, 0x13, 0xd2, 0xd1, 0xbf, 0x3b, 0x30, 0xe5, 0xcd, 0xf4, 0x4d,
+	0x7b, 0xef, 0xde, 0x8e, 0xd5, 0xbd, 0xb6, 0x63, 0xdd, 0x36, 0x02, 0xe7, 0x30, 0xf4, 0x5b, 0x96,
+	0x3f, 0xa9, 0x66, 0xf1, 0xeb, 0xc7, 0xd9, 0x34, 0x49, 0x8c, 0x5d, 0x64, 0x69, 0x5e, 0x7f, 0x1e,
+	0x8d, 0xbd, 0xec, 0x79, 0x9a, 0x1b, 0xf1, 0x63, 0x38, 0xd0, 0xa9, 0x35, 0x14, 0x30, 0x1b, 0xf1,
+	0x80, 0x9c, 0x36, 0x52, 0x32, 0xab, 0xc7, 0xec, 0xb0, 0x35, 0x66, 0x1f, 0xc0, 0x54, 0x9b, 0x15,
+	0x4e, 0x92, 0x45, 0xe5, 0x94, 0xe3, 0x25, 0x21, 0x90, 0x13, 0x2f, 0x3c, 0x43, 0xd9, 0xe3, 0x3f,
+	0xc2, 0xa4, 0x0d, 0xab, 0x98, 0xc0, 0xe8, 0x7c, 0xc1, 0x00, 0xcc, 0xde, 0x11, 0x33, 0x98, 0xd4,
+	0x1c, 0x6e, 0x98, 0xb3, 0x8e, 0xb8, 0x0b, 0xb3, 0xb6, 0x04, 0xd7, 0xea, 0x59, 0x57, 0x00, 0x0c,
+	0xce, 0x17, 0x64, 0xd1, 0x13, 0x53, 0x08, 0x99, 0x3e, 0xd3, 0x97, 0xb3, 0xbe, 0xb8, 0x03, 0xd3,
+	0x86, 0xc5, 0xcd, 0x76, 0x16, 0x88, 0x10, 0x82, 0xf3, 0x05, 0x6a, 0x07, 0x8f, 0x9f, 0xc0, 0xa8,
+	0x4e, 0x0b, 0x3a, 0x39, 0xc9, 0x2b, 0x63, 0xdd, 0xec, 0x1d, 0xa4, 0xbf, 0xa1, 0x5d, 0x66, 0xd6,
+	0x41, 0xfa, 0xd8, 0x64, 0xc6, 0x99, 0x59, 0x77, 0x39, 0xa0, 0x6c, 0x7e, 0xfe, 0x9f, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0x64, 0x5b, 0xe8, 0x15, 0x28, 0x13, 0x00, 0x00,
 }
diff --git a/protomsg.proto b/protomsg.proto
index 51a3677..38ec79c 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -118,10 +118,15 @@
 
 message TaskGroupArgs {
     string task_id = 1;
-    repeated TaskArgs group_args = 2;
+    repeated GroupRule group_rules = 2;
 }
 
-message TaskArgs {
+message GroupRule {
+    string group_id = 1;
+    repeated GroupRule rules = 2;
+}
+
+message Rule {
     string id =1;
     string camera_task_id =2;
     string camera_id =3;

--
Gitblit v1.8.0