From 5a482419c227affd0713c40c3f573c2bc5cd2702 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 12 七月 2019 16:12:01 +0800
Subject: [PATCH] GroupRule add defence_state
---
protomsg.pb.go | 257 +++++++++++++++++++++++++++++---------------------
1 files changed, 149 insertions(+), 108 deletions(-)
diff --git a/protomsg.pb.go b/protomsg.pb.go
index 9935430..e98660c 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -1146,11 +1146,12 @@
}
type GroupRule struct {
- GroupId string `protobuf:"bytes,1,opt,name=group_id,json=groupId,proto3" json:"group_id,omitempty"`
- GroupText string `protobuf:"bytes,2,opt,name=group_text,json=groupText,proto3" json:"group_text,omitempty"`
- AlarmLevel int32 `protobuf:"varint,3,opt,name=alarm_level,json=alarmLevel,proto3" json:"alarm_level,omitempty"`
- Rules []*Rule `protobuf:"bytes,4,rep,name=rules,proto3" json:"rules,omitempty"`
- SetType string `protobuf:"bytes,5,opt,name=set_type,json=setType,proto3" json:"set_type,omitempty"`
+ GroupId string `protobuf:"bytes,1,opt,name=group_id,json=groupId,proto3" json:"group_id,omitempty"`
+ GroupText string `protobuf:"bytes,2,opt,name=group_text,json=groupText,proto3" json:"group_text,omitempty"`
+ AlarmLevel int32 `protobuf:"varint,3,opt,name=alarm_level,json=alarmLevel,proto3" json:"alarm_level,omitempty"`
+ Rules []*Rule `protobuf:"bytes,4,rep,name=rules,proto3" json:"rules,omitempty"`
+ SetType string `protobuf:"bytes,5,opt,name=set_type,json=setType,proto3" json:"set_type,omitempty"`
+ DefenceState bool `protobuf:"varint,6,opt,name=defence_state,json=defenceState,proto3" json:"defence_state,omitempty"`
}
func (m *GroupRule) Reset() { *m = GroupRule{} }
@@ -1219,6 +1220,13 @@
return m.SetType
}
return ""
+}
+
+func (m *GroupRule) GetDefenceState() bool {
+ if m != nil {
+ return m.DefenceState
+ }
+ return false
}
type Rule struct {
@@ -1776,109 +1784,109 @@
func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
var fileDescriptor_32de24555f916688 = []byte{
- // 1623 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0xcd, 0x8e, 0xdc, 0xc6,
- 0x11, 0x5e, 0xce, 0x3f, 0x6b, 0x7e, 0x44, 0xb5, 0x14, 0x9b, 0x91, 0xe3, 0xcd, 0x8a, 0x56, 0x90,
- 0x85, 0x90, 0xe8, 0xb0, 0xf6, 0x29, 0xb7, 0xb1, 0x14, 0x05, 0x03, 0x38, 0x86, 0xc2, 0x1d, 0x2b,
- 0x47, 0xa2, 0x77, 0xba, 0x97, 0x6a, 0x2c, 0x97, 0x1c, 0x74, 0x37, 0xd7, 0xde, 0xa7, 0x48, 0x8e,
- 0x79, 0x83, 0xbc, 0x46, 0x90, 0x53, 0x8e, 0x3e, 0xe6, 0x96, 0x40, 0x02, 0x72, 0x09, 0xf2, 0x0a,
- 0x41, 0x50, 0xd5, 0x4d, 0x0e, 0x67, 0xbc, 0x0a, 0x74, 0xab, 0x3f, 0x76, 0x57, 0x57, 0x7d, 0xfd,
- 0x55, 0x13, 0x16, 0x5b, 0x5d, 0xd9, 0xea, 0xda, 0xe4, 0xcf, 0x48, 0x60, 0x93, 0x46, 0x7f, 0x04,
- 0x17, 0xdc, 0x48, 0x67, 0x4d, 0x5e, 0xc2, 0x60, 0xa9, 0x25, 0x67, 0x0b, 0xe8, 0x29, 0x11, 0x07,
- 0x27, 0xc1, 0xe9, 0x30, 0xed, 0x29, 0xc1, 0x1e, 0xc1, 0x64, 0xcb, 0xb5, 0x2c, 0xad, 0x12, 0x71,
- 0x8f, 0xac, 0xad, 0xce, 0x18, 0x0c, 0x4a, 0x7e, 0x2d, 0xe3, 0xfe, 0x49, 0x70, 0x1a, 0xa6, 0x24,
- 0x27, 0xff, 0xed, 0xc3, 0xe8, 0x39, 0xbf, 0x96, 0xba, 0xbb, 0x54, 0x48, 0x4b, 0x35, 0xe1, 0xbd,
- 0x5d, 0x38, 0x7b, 0x08, 0x43, 0x5e, 0x28, 0x6e, 0xfc, 0x1a, 0x4e, 0x61, 0x8f, 0x61, 0x66, 0x4a,
- 0xbe, 0x35, 0x6f, 0x2a, 0x9b, 0xd5, 0xba, 0x88, 0x07, 0xe4, 0x9c, 0x36, 0xb6, 0x6f, 0x74, 0x81,
- 0x8b, 0xd9, 0xdb, 0xad, 0x8c, 0x87, 0x94, 0x13, 0xc9, 0x68, 0xe3, 0x42, 0xe8, 0x78, 0xe4, 0x36,
- 0x40, 0x99, 0x7d, 0x04, 0x23, 0xae, 0x25, 0x57, 0x22, 0x1e, 0x53, 0xa4, 0xd7, 0xd8, 0x4f, 0x20,
- 0x2c, 0xaa, 0x32, 0x57, 0xb6, 0x16, 0x32, 0x9e, 0x9c, 0x04, 0xa7, 0xbd, 0x74, 0x67, 0xc0, 0x53,
- 0x17, 0xdc, 0x3a, 0x67, 0x48, 0xce, 0x56, 0xc7, 0x5d, 0xb4, 0x35, 0xdb, 0x18, 0xdc, 0x2e, 0x28,
- 0xd3, 0x51, 0xb7, 0xf1, 0xd4, 0x1f, 0x75, 0x8b, 0x31, 0xdb, 0x4a, 0xdb, 0x78, 0xe6, 0xb2, 0x43,
- 0x19, 0xd7, 0xac, 0x8d, 0xd4, 0x54, 0x82, 0x39, 0x45, 0xb6, 0xba, 0xab, 0xb2, 0x31, 0xdf, 0x56,
- 0x5a, 0xc4, 0x0b, 0xe7, 0x6b, 0x74, 0x2c, 0xd1, 0x85, 0xe6, 0xa5, 0x88, 0xef, 0xb9, 0x12, 0x91,
- 0x82, 0x5f, 0x68, 0x69, 0xa4, 0xbe, 0x91, 0x22, 0x8e, 0xdc, 0x17, 0x8d, 0xce, 0x3e, 0x05, 0x50,
- 0x26, 0xd3, 0x75, 0x59, 0xaa, 0x32, 0x8f, 0xef, 0x9f, 0x04, 0xa7, 0x93, 0x34, 0x54, 0x26, 0x75,
- 0x06, 0x74, 0xeb, 0xba, 0xcc, 0x64, 0xc9, 0x2f, 0x0a, 0x19, 0x33, 0xe7, 0xd6, 0x75, 0xf9, 0x6b,
- 0x32, 0xb0, 0x1f, 0xc3, 0x04, 0xdd, 0x54, 0xdd, 0x07, 0x94, 0xff, 0x58, 0xd7, 0xe5, 0x1a, 0x0b,
- 0x9c, 0xc0, 0x1c, 0x5d, 0xb4, 0x8d, 0xce, 0x94, 0x88, 0x1f, 0xba, 0xc6, 0xe8, 0xba, 0x3c, 0x27,
- 0xdb, 0x4a, 0x24, 0x1b, 0xb8, 0xef, 0xfa, 0xbf, 0x2c, 0xc5, 0x9a, 0x9b, 0xab, 0x55, 0x79, 0x59,
- 0xb1, 0x53, 0x18, 0x6d, 0xc8, 0x48, 0x70, 0x98, 0x9e, 0x45, 0xcf, 0x5a, 0x50, 0xba, 0xe0, 0xd4,
- 0xfb, 0xd9, 0x13, 0x18, 0x5a, 0x6e, 0xae, 0x4c, 0xdc, 0x3b, 0xe9, 0x9f, 0x4e, 0xcf, 0x16, 0xbb,
- 0x40, 0x5c, 0x2c, 0x75, 0xce, 0xe4, 0x1f, 0x01, 0x0c, 0x50, 0xc7, 0xf6, 0xa2, 0xa5, 0xc5, 0x99,
- 0xd7, 0xb0, 0x3c, 0x28, 0x75, 0xf0, 0xd6, 0xea, 0xec, 0x13, 0x08, 0x37, 0x5a, 0x72, 0x2b, 0x33,
- 0x6e, 0x3d, 0xee, 0x26, 0xce, 0xb0, 0xb4, 0x1d, 0xe7, 0xc5, 0xad, 0xc7, 0x9d, 0x77, 0x7e, 0x79,
- 0x8b, 0xce, 0x7a, 0x2b, 0xfc, 0x97, 0x43, 0xdf, 0x43, 0x32, 0x2c, 0x2d, 0xa6, 0xe2, 0x4b, 0x3a,
- 0xa2, 0x92, 0x7a, 0x0d, 0xeb, 0xa9, 0x4c, 0xc6, 0x0b, 0xae, 0xaf, 0x09, 0x83, 0x93, 0x74, 0xac,
- 0xcc, 0x12, 0x55, 0x74, 0x09, 0x59, 0x64, 0x97, 0x05, 0xcf, 0x09, 0x83, 0x93, 0x74, 0x2c, 0x64,
- 0xf1, 0xb2, 0xe0, 0x79, 0xb2, 0x86, 0x29, 0x1e, 0xf0, 0x5c, 0xb8, 0x02, 0x26, 0x30, 0xc0, 0xfc,
- 0x7d, 0xf9, 0x0e, 0xab, 0x42, 0x3e, 0xf6, 0x18, 0x06, 0x46, 0xb4, 0x95, 0x9b, 0xef, 0x62, 0xce,
- 0xc5, 0x55, 0x4a, 0xae, 0xe4, 0x57, 0x30, 0x42, 0xa5, 0x2e, 0xd9, 0x8f, 0x60, 0xa4, 0xb6, 0x9b,
- 0xac, 0x2d, 0xdc, 0x50, 0x6d, 0x37, 0x2b, 0x81, 0x19, 0x19, 0x71, 0xe5, 0x9a, 0xef, 0xea, 0x36,
- 0x36, 0xe2, 0x0a, 0x9b, 0x9f, 0xbc, 0x06, 0xf0, 0x19, 0xe1, 0xf7, 0x1f, 0x92, 0xd0, 0x93, 0xbd,
- 0x84, 0xa2, 0xfd, 0x84, 0xea, 0xd2, 0xe7, 0xf4, 0xaf, 0x1e, 0x80, 0x03, 0x01, 0x75, 0xf4, 0x90,
- 0x35, 0xb0, 0x21, 0xe4, 0xcd, 0x3c, 0x03, 0x61, 0x43, 0xc8, 0xb0, 0x12, 0xec, 0x63, 0x18, 0xe3,
- 0x4e, 0xe8, 0xea, 0xef, 0xfa, 0xbf, 0x12, 0xec, 0x97, 0x10, 0x5a, 0x75, 0x2d, 0x33, 0x5d, 0x17,
- 0x32, 0x1e, 0x1c, 0xee, 0xff, 0x82, 0xdf, 0x3e, 0xb7, 0x45, 0x3a, 0xc1, 0x90, 0xb4, 0x2e, 0x24,
- 0x5d, 0x09, 0xc9, 0x37, 0xd6, 0xc5, 0xbb, 0xce, 0x86, 0x64, 0x21, 0xf7, 0x63, 0x98, 0x39, 0xb7,
- 0x90, 0x37, 0x6a, 0x23, 0x3d, 0xc1, 0x4c, 0xc9, 0xf6, 0x82, 0x4c, 0x7b, 0xad, 0x1c, 0xef, 0xb5,
- 0x92, 0xfd, 0x14, 0xa6, 0x1e, 0x35, 0x9d, 0x46, 0x83, 0x33, 0x51, 0xc0, 0x0e, 0x39, 0xe1, 0x1e,
- 0x72, 0x18, 0x0c, 0x0c, 0xb2, 0x08, 0x38, 0x16, 0x41, 0x19, 0x4f, 0xac, 0x4c, 0x76, 0x59, 0x17,
- 0x05, 0xd1, 0xcd, 0x24, 0x1d, 0x29, 0xf3, 0xb2, 0x2e, 0x0a, 0x76, 0x02, 0xb3, 0x42, 0x95, 0x57,
- 0x59, 0x53, 0x8f, 0x19, 0xe5, 0x08, 0x68, 0xa3, 0x6b, 0x28, 0x92, 0xdf, 0xc1, 0xc2, 0xd7, 0x59,
- 0x5d, 0x4b, 0x3c, 0xe8, 0x07, 0x31, 0xf4, 0x27, 0xdd, 0x4a, 0xfa, 0xdb, 0xd2, 0xd4, 0x2d, 0xf9,
- 0x1a, 0x46, 0xae, 0x96, 0x2c, 0x82, 0xbe, 0xe0, 0xb7, 0x7e, 0x70, 0xa0, 0xc8, 0xce, 0x00, 0xdc,
- 0x87, 0xbc, 0xcc, 0xa5, 0xc7, 0xc0, 0x83, 0x0e, 0x4e, 0x70, 0x0d, 0x74, 0xa5, 0xb4, 0x3e, 0x89,
- 0xc9, 0xe7, 0x10, 0xb6, 0x76, 0x24, 0x3e, 0x63, 0xb9, 0xb6, 0x0d, 0x42, 0x49, 0xc1, 0x8d, 0x64,
- 0xd9, 0x20, 0x01, 0xc5, 0xe4, 0x35, 0x8c, 0x5f, 0x55, 0xc5, 0x6d, 0x5e, 0x95, 0x1f, 0x74, 0xa0,
- 0x9f, 0xc3, 0x68, 0x5b, 0xa9, 0xd2, 0xe2, 0xcc, 0xc1, 0x9c, 0xee, 0xed, 0x72, 0x7a, 0x85, 0xf6,
- 0xd4, 0xbb, 0x93, 0x4d, 0x5b, 0x2f, 0x6e, 0xae, 0x96, 0x3a, 0x37, 0xfb, 0x58, 0x0c, 0x0e, 0xb0,
- 0xf8, 0x05, 0x84, 0x54, 0x7b, 0xae, 0xf3, 0x06, 0xf2, 0x1f, 0xef, 0x5f, 0x8b, 0xdf, 0xe8, 0xaa,
- 0xde, 0xe2, 0x42, 0x8e, 0x8c, 0x50, 0x4a, 0x6e, 0x60, 0xbe, 0xe7, 0xea, 0x42, 0x3a, 0xd8, 0x83,
- 0xf4, 0x17, 0x30, 0xcd, 0x31, 0x8a, 0x3a, 0x61, 0x7e, 0x58, 0x50, 0x5a, 0x02, 0xbb, 0x92, 0x42,
- 0xde, 0x88, 0xa6, 0x83, 0xad, 0x7e, 0x17, 0x5b, 0xc9, 0x9f, 0x03, 0x08, 0xdb, 0x2f, 0x10, 0xbd,
- 0x6e, 0xed, 0x76, 0xd7, 0x31, 0xe9, 0x2b, 0x1a, 0x26, 0xce, 0x65, 0xe5, 0x77, 0xd6, 0x17, 0x32,
- 0x24, 0xcb, 0x5a, 0x7e, 0x67, 0x11, 0xdc, 0x44, 0x6d, 0x59, 0x21, 0x6f, 0x64, 0x41, 0x9b, 0x0c,
- 0x53, 0x20, 0xd3, 0x57, 0x68, 0x41, 0x42, 0x77, 0x09, 0x0f, 0x0e, 0x09, 0x9d, 0x72, 0x75, 0x4e,
- 0xe2, 0x1d, 0x69, 0xb3, 0x76, 0xa4, 0x23, 0xef, 0x48, 0x4b, 0xbc, 0xf3, 0xef, 0x1e, 0x0c, 0xd2,
- 0xbb, 0xd0, 0xfa, 0x04, 0x16, 0xbe, 0x1b, 0x4d, 0xc1, 0x5c, 0x76, 0xb3, 0x4d, 0xdb, 0xb5, 0xd5,
- 0x01, 0x7f, 0xf4, 0x0f, 0x7a, 0xf6, 0x29, 0xc0, 0xd6, 0x41, 0x07, 0xbd, 0x8e, 0xee, 0x43, 0x6f,
- 0x59, 0x09, 0x24, 0x49, 0x64, 0x43, 0x25, 0x7c, 0x4e, 0x43, 0x23, 0x70, 0xc9, 0x04, 0xe6, 0x68,
- 0xe6, 0x3a, 0xcf, 0xdc, 0xe3, 0xc5, 0xf3, 0x81, 0x11, 0xd8, 0xd3, 0x25, 0x3d, 0x61, 0x1e, 0xc1,
- 0xa4, 0xda, 0x4a, 0xcd, 0x6d, 0xa5, 0x89, 0x0f, 0xc2, 0xb4, 0xd5, 0xd9, 0x67, 0x30, 0x6f, 0x64,
- 0x77, 0xe2, 0x89, 0xcb, 0xbb, 0x31, 0x36, 0xb3, 0xb6, 0xd9, 0xe4, 0x86, 0x17, 0xb5, 0xe3, 0x86,
- 0x76, 0x93, 0xd7, 0x68, 0xba, 0x93, 0x20, 0x68, 0x46, 0x17, 0x32, 0xfb, 0x56, 0xd9, 0x37, 0xd9,
- 0x56, 0x4b, 0xff, 0x2a, 0x99, 0xa2, 0xf1, 0xf7, 0xca, 0xbe, 0x79, 0xa5, 0xf7, 0xdb, 0x3d, 0xdb,
- 0x6b, 0x77, 0xf2, 0x97, 0x1e, 0xf4, 0xcf, 0xc5, 0x0f, 0x69, 0x78, 0x37, 0x2f, 0x7a, 0xef, 0x9b,
- 0x17, 0xfd, 0xbd, 0x79, 0xd1, 0xb8, 0xe8, 0xfe, 0x0d, 0x5a, 0xd7, 0xd7, 0x78, 0x05, 0x9f, 0xc0,
- 0x80, 0x6e, 0xc9, 0xf0, 0x8e, 0xc1, 0xb0, 0xd4, 0x79, 0x4a, 0x5e, 0x3c, 0x9d, 0xda, 0x54, 0x65,
- 0xf3, 0x9c, 0x43, 0x19, 0x6f, 0x3f, 0x3e, 0x08, 0x5d, 0x45, 0x51, 0x44, 0x00, 0xfa, 0x81, 0x8d,
- 0x34, 0xe2, 0x4b, 0x09, 0xce, 0x84, 0x5c, 0xd2, 0xa1, 0x5f, 0x0a, 0x70, 0x65, 0xf4, 0xf4, 0x4b,
- 0x01, 0x7b, 0x23, 0x1f, 0x0e, 0x46, 0xfe, 0xee, 0xfe, 0x4c, 0x0f, 0xa7, 0x7a, 0xcb, 0xf7, 0xee,
- 0x95, 0xd7, 0x8e, 0xee, 0x3f, 0x05, 0x34, 0x65, 0x97, 0x3a, 0xdf, 0x3d, 0x6f, 0x83, 0xee, 0xf3,
- 0xf6, 0x2e, 0x56, 0x6a, 0xde, 0xb3, 0xfe, 0x2d, 0xdd, 0xbc, 0x67, 0xaf, 0x6b, 0x63, 0xa9, 0x7a,
- 0x93, 0x94, 0x64, 0xb4, 0xd5, 0xa5, 0x6a, 0x5e, 0x1f, 0x24, 0xe3, 0x2e, 0x8e, 0x64, 0x5d, 0xa5,
- 0x9c, 0xd2, 0x82, 0x63, 0xbc, 0x03, 0x47, 0xf2, 0x87, 0x00, 0xee, 0xbd, 0xb8, 0x78, 0xfe, 0x06,
- 0x03, 0x7e, 0x2b, 0x8d, 0xe1, 0xb9, 0x64, 0xbf, 0xc0, 0x17, 0x17, 0x1e, 0x10, 0x73, 0x5c, 0x9c,
- 0x7d, 0xd4, 0xe5, 0xac, 0x8b, 0x42, 0xba, 0x60, 0x91, 0xba, 0x20, 0x8f, 0x8b, 0x5e, 0x8b, 0x8b,
- 0xa7, 0x30, 0xe2, 0x1b, 0xab, 0xaa, 0x92, 0x32, 0x5f, 0x9c, 0xb1, 0xce, 0x94, 0xbd, 0x58, 0x92,
- 0x27, 0xf5, 0x11, 0xd4, 0xd0, 0xf2, 0xb2, 0xf2, 0x68, 0x20, 0x39, 0xf9, 0x4f, 0x00, 0x73, 0xc7,
- 0xb2, 0xef, 0xe3, 0xf0, 0xff, 0xfb, 0x00, 0xb8, 0xe3, 0x17, 0x84, 0xc5, 0x30, 0xf6, 0x57, 0xb8,
- 0xc1, 0x9d, 0x57, 0x71, 0x8e, 0x5b, 0xad, 0xf2, 0x5c, 0xea, 0xac, 0x50, 0x65, 0xc3, 0x34, 0x53,
- 0x6f, 0xfb, 0x4a, 0x95, 0x92, 0xfd, 0x0c, 0x16, 0x42, 0x69, 0x49, 0x09, 0xbb, 0x20, 0x57, 0xd4,
- 0x79, 0x6b, 0xa5, 0xb0, 0xa6, 0x5d, 0xe3, 0x4e, 0xbb, 0x3e, 0x83, 0xb9, 0x90, 0x97, 0xb2, 0xdc,
- 0xc8, 0xcc, 0x58, 0x6e, 0x1d, 0x16, 0x87, 0xe9, 0xcc, 0x1b, 0xcf, 0xd1, 0xf6, 0xf4, 0xaf, 0x01,
- 0xcc, 0xba, 0x75, 0x65, 0x33, 0x98, 0xac, 0x33, 0x57, 0x81, 0xe8, 0x88, 0x45, 0x30, 0x6b, 0x34,
- 0xe4, 0xaf, 0x28, 0x60, 0x0f, 0x21, 0xea, 0x5a, 0x70, 0x46, 0x44, 0x3d, 0x06, 0x30, 0x5a, 0x67,
- 0x14, 0xd1, 0x67, 0x73, 0x08, 0x9d, 0x7c, 0x2e, 0xae, 0xa2, 0x01, 0xbb, 0x0f, 0xf3, 0x56, 0x45,
- 0xde, 0x8c, 0x86, 0x2c, 0x84, 0xe1, 0x3a, 0x43, 0xef, 0x88, 0x3d, 0x80, 0x7b, 0xcd, 0x72, 0xbe,
- 0xe0, 0xd1, 0x98, 0x2d, 0x00, 0xd6, 0xd9, 0xda, 0x0f, 0xf5, 0x68, 0xe2, 0x72, 0x72, 0x2f, 0xfa,
- 0x28, 0x74, 0x39, 0xbd, 0xaa, 0x8a, 0xe2, 0x79, 0x55, 0x5e, 0xaa, 0x3c, 0x82, 0xa7, 0xcf, 0x60,
- 0xd2, 0x34, 0x17, 0x33, 0x59, 0x95, 0x46, 0x6a, 0x1b, 0x1d, 0xa1, 0xfc, 0x0d, 0xdd, 0xab, 0x28,
- 0x40, 0xf9, 0x85, 0x2c, 0xa4, 0x95, 0x51, 0xef, 0xcb, 0xf8, 0x6f, 0x6f, 0x8f, 0x83, 0xef, 0xdf,
- 0x1e, 0x07, 0xff, 0x7c, 0x7b, 0x1c, 0xfc, 0xf1, 0xdd, 0xf1, 0xd1, 0xf7, 0xef, 0x8e, 0x8f, 0xfe,
- 0xfe, 0xee, 0xf8, 0xe8, 0x62, 0x44, 0x68, 0xf9, 0xfc, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4d,
- 0x11, 0x9d, 0x1e, 0xa5, 0x0e, 0x00, 0x00,
+ // 1629 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0x4b, 0x8f, 0xdc, 0xc6,
+ 0x11, 0x5e, 0xce, 0x93, 0xac, 0x79, 0x88, 0x6a, 0x29, 0x36, 0x23, 0xc7, 0x9b, 0x15, 0xa3, 0x20,
+ 0x0b, 0x21, 0xd1, 0x61, 0xed, 0x53, 0x6e, 0x63, 0x29, 0x0a, 0x06, 0x70, 0x0c, 0x85, 0x3b, 0x56,
+ 0x8e, 0x44, 0xef, 0x74, 0x2f, 0xd5, 0x58, 0x2e, 0x39, 0xe8, 0x6e, 0xae, 0xbd, 0xbf, 0x22, 0x39,
+ 0xe6, 0xe7, 0x04, 0x39, 0xe5, 0x90, 0x83, 0x8f, 0xb9, 0x25, 0x90, 0x80, 0x5c, 0x82, 0xfc, 0x85,
+ 0x20, 0xa8, 0xea, 0x26, 0xe7, 0xa1, 0xb5, 0xa1, 0x5b, 0xbd, 0xa6, 0xbb, 0xba, 0xea, 0xe3, 0x57,
+ 0x35, 0x30, 0xdf, 0xe8, 0xda, 0xd6, 0xd7, 0xa6, 0x78, 0x46, 0x02, 0x0b, 0x5b, 0xfd, 0x11, 0x5c,
+ 0x70, 0x23, 0x9d, 0x35, 0x7d, 0x09, 0x83, 0x85, 0x96, 0x9c, 0xcd, 0xa1, 0xa7, 0x44, 0x12, 0x9c,
+ 0x04, 0xa7, 0xc3, 0xac, 0xa7, 0x04, 0x7b, 0x04, 0xe1, 0x86, 0x6b, 0x59, 0x59, 0x25, 0x92, 0x1e,
+ 0x59, 0x3b, 0x9d, 0x31, 0x18, 0x54, 0xfc, 0x5a, 0x26, 0xfd, 0x93, 0xe0, 0x34, 0xca, 0x48, 0x4e,
+ 0xff, 0xd7, 0x87, 0xd1, 0x73, 0x7e, 0x2d, 0xf5, 0xee, 0x51, 0x11, 0x1d, 0xd5, 0x86, 0xf7, 0xb6,
+ 0xe1, 0xec, 0x21, 0x0c, 0x79, 0xa9, 0xb8, 0xf1, 0x67, 0x38, 0x85, 0x3d, 0x86, 0xa9, 0xa9, 0xf8,
+ 0xc6, 0xbc, 0xa9, 0x6d, 0xde, 0xe8, 0x32, 0x19, 0x90, 0x73, 0xd2, 0xda, 0xbe, 0xd6, 0x25, 0x1e,
+ 0x66, 0x6f, 0x37, 0x32, 0x19, 0x52, 0x4e, 0x24, 0xa3, 0x8d, 0x0b, 0xa1, 0x93, 0x91, 0xbb, 0x00,
+ 0x65, 0xf6, 0x11, 0x8c, 0xb8, 0x96, 0x5c, 0x89, 0x64, 0x4c, 0x91, 0x5e, 0x63, 0x3f, 0x81, 0xa8,
+ 0xac, 0xab, 0x42, 0xd9, 0x46, 0xc8, 0x24, 0x3c, 0x09, 0x4e, 0x7b, 0xd9, 0xd6, 0x80, 0xaf, 0x2e,
+ 0xb9, 0x75, 0xce, 0x88, 0x9c, 0x9d, 0x8e, 0xb7, 0x68, 0x6b, 0x36, 0x09, 0xb8, 0x5b, 0x50, 0xa6,
+ 0xa7, 0x6e, 0x92, 0x89, 0x7f, 0xea, 0x06, 0x63, 0x36, 0xb5, 0xb6, 0xc9, 0xd4, 0x65, 0x87, 0x32,
+ 0x9e, 0xd9, 0x18, 0xa9, 0xa9, 0x04, 0x33, 0x8a, 0xec, 0x74, 0x57, 0x65, 0x63, 0xbe, 0xa9, 0xb5,
+ 0x48, 0xe6, 0xce, 0xd7, 0xea, 0x58, 0xa2, 0x0b, 0xcd, 0x2b, 0x91, 0xdc, 0x73, 0x25, 0x22, 0x05,
+ 0x7f, 0xa1, 0xa5, 0x91, 0xfa, 0x46, 0x8a, 0x24, 0x76, 0xbf, 0x68, 0x75, 0xf6, 0x29, 0x80, 0x32,
+ 0xb9, 0x6e, 0xaa, 0x4a, 0x55, 0x45, 0x72, 0xff, 0x24, 0x38, 0x0d, 0xb3, 0x48, 0x99, 0xcc, 0x19,
+ 0xd0, 0xad, 0x9b, 0x2a, 0x97, 0x15, 0xbf, 0x28, 0x65, 0xc2, 0x9c, 0x5b, 0x37, 0xd5, 0x6f, 0xc8,
+ 0xc0, 0x7e, 0x0c, 0x21, 0xba, 0xa9, 0xba, 0x0f, 0x28, 0xff, 0xb1, 0x6e, 0xaa, 0x15, 0x16, 0x38,
+ 0x85, 0x19, 0xba, 0xe8, 0x1a, 0x9d, 0x2b, 0x91, 0x3c, 0x74, 0x8d, 0xd1, 0x4d, 0x75, 0x4e, 0xb6,
+ 0xa5, 0x48, 0xd7, 0x70, 0xdf, 0xf5, 0x7f, 0x51, 0x89, 0x15, 0x37, 0x57, 0xcb, 0xea, 0xb2, 0x66,
+ 0xa7, 0x30, 0x5a, 0x93, 0x91, 0xe0, 0x30, 0x39, 0x8b, 0x9f, 0x75, 0xa0, 0x74, 0xc1, 0x99, 0xf7,
+ 0xb3, 0x27, 0x30, 0xb4, 0xdc, 0x5c, 0x99, 0xa4, 0x77, 0xd2, 0x3f, 0x9d, 0x9c, 0xcd, 0xb7, 0x81,
+ 0x78, 0x58, 0xe6, 0x9c, 0xe9, 0x3f, 0x03, 0x18, 0xa0, 0x8e, 0xed, 0x45, 0x4b, 0x87, 0x33, 0xaf,
+ 0x61, 0x79, 0x50, 0xda, 0xc1, 0x5b, 0xa7, 0xb3, 0x4f, 0x20, 0x5a, 0x6b, 0xc9, 0xad, 0xcc, 0xb9,
+ 0xf5, 0xb8, 0x0b, 0x9d, 0x61, 0x61, 0x77, 0x9c, 0x17, 0xb7, 0x1e, 0x77, 0xde, 0xf9, 0xc5, 0x2d,
+ 0x3a, 0x9b, 0x8d, 0xf0, 0xbf, 0x1c, 0xfa, 0x1e, 0x92, 0x61, 0x61, 0x31, 0x15, 0x5f, 0xd2, 0x11,
+ 0x95, 0xd4, 0x6b, 0x58, 0x4f, 0x65, 0x72, 0x5e, 0x72, 0x7d, 0x4d, 0x18, 0x0c, 0xb3, 0xb1, 0x32,
+ 0x0b, 0x54, 0xd1, 0x25, 0x64, 0x99, 0x5f, 0x96, 0xbc, 0x20, 0x0c, 0x86, 0xd9, 0x58, 0xc8, 0xf2,
+ 0x65, 0xc9, 0x8b, 0x74, 0x05, 0x13, 0x7c, 0xe0, 0xb9, 0x70, 0x05, 0x4c, 0x61, 0x80, 0xf9, 0xfb,
+ 0xf2, 0x1d, 0x56, 0x85, 0x7c, 0xec, 0x31, 0x0c, 0x8c, 0xe8, 0x2a, 0x37, 0xdb, 0xc6, 0x9c, 0x8b,
+ 0xab, 0x8c, 0x5c, 0xe9, 0xaf, 0x61, 0x84, 0x4a, 0x53, 0xb1, 0x1f, 0xc1, 0x48, 0x6d, 0xd6, 0x79,
+ 0x57, 0xb8, 0xa1, 0xda, 0xac, 0x97, 0x02, 0x33, 0x32, 0xe2, 0xca, 0x35, 0xdf, 0xd5, 0x6d, 0x6c,
+ 0xc4, 0x15, 0x36, 0x3f, 0x7d, 0x0d, 0xe0, 0x33, 0xc2, 0xdf, 0x7f, 0x48, 0x42, 0x4f, 0xf6, 0x12,
+ 0x8a, 0xf7, 0x13, 0x6a, 0x2a, 0x9f, 0xd3, 0xbf, 0x7b, 0x00, 0x0e, 0x04, 0xd4, 0xd1, 0x43, 0xd6,
+ 0xc0, 0x86, 0x90, 0x37, 0xf7, 0x0c, 0x84, 0x0d, 0x21, 0xc3, 0x52, 0xb0, 0x8f, 0x61, 0x8c, 0x37,
+ 0xa1, 0xab, 0xbf, 0xed, 0xff, 0x52, 0xb0, 0x5f, 0x41, 0x64, 0xd5, 0xb5, 0xcc, 0x75, 0x53, 0xca,
+ 0x64, 0x70, 0x78, 0xff, 0x0b, 0x7e, 0xfb, 0xdc, 0x96, 0x59, 0x88, 0x21, 0x59, 0x53, 0x4a, 0xfa,
+ 0x24, 0x24, 0x5f, 0x5b, 0x17, 0xef, 0x3a, 0x1b, 0x91, 0x85, 0xdc, 0x8f, 0x61, 0xea, 0xdc, 0x42,
+ 0xde, 0xa8, 0xb5, 0xf4, 0x04, 0x33, 0x21, 0xdb, 0x0b, 0x32, 0xed, 0xb5, 0x72, 0xbc, 0xd7, 0x4a,
+ 0xf6, 0x53, 0x98, 0x78, 0xd4, 0xec, 0x34, 0x1a, 0x9c, 0x89, 0x02, 0xb6, 0xc8, 0x89, 0xf6, 0x90,
+ 0xc3, 0x60, 0x60, 0x90, 0x45, 0xc0, 0xb1, 0x08, 0xca, 0xf8, 0x62, 0x65, 0xf2, 0xcb, 0xa6, 0x2c,
+ 0x89, 0x6e, 0xc2, 0x6c, 0xa4, 0xcc, 0xcb, 0xa6, 0x2c, 0xd9, 0x09, 0x4c, 0x4b, 0x55, 0x5d, 0xe5,
+ 0x6d, 0x3d, 0xa6, 0x94, 0x23, 0xa0, 0x8d, 0x3e, 0x43, 0x91, 0xfe, 0x1e, 0xe6, 0xbe, 0xce, 0xea,
+ 0x5a, 0xe2, 0x43, 0x3f, 0x88, 0xa1, 0x3f, 0xd9, 0xad, 0xa4, 0xff, 0x5a, 0xda, 0xba, 0xa5, 0x5f,
+ 0xc1, 0xc8, 0xd5, 0x92, 0xc5, 0xd0, 0x17, 0xfc, 0xd6, 0x0f, 0x0e, 0x14, 0xd9, 0x19, 0x80, 0xfb,
+ 0x21, 0xaf, 0x0a, 0xe9, 0x31, 0xf0, 0x60, 0x07, 0x27, 0x78, 0x06, 0xba, 0x32, 0x3a, 0x9f, 0xc4,
+ 0xf4, 0x33, 0x88, 0x3a, 0x3b, 0x12, 0x9f, 0xb1, 0x5c, 0xdb, 0x16, 0xa1, 0xa4, 0xe0, 0x45, 0xb2,
+ 0x6a, 0x91, 0x80, 0x62, 0xfa, 0x1a, 0xc6, 0xaf, 0xea, 0xf2, 0xb6, 0xa8, 0xab, 0x0f, 0x7a, 0xd0,
+ 0x2f, 0x60, 0xb4, 0xa9, 0x55, 0x65, 0x71, 0xe6, 0x60, 0x4e, 0xf7, 0xb6, 0x39, 0xbd, 0x42, 0x7b,
+ 0xe6, 0xdd, 0xe9, 0xba, 0xab, 0x17, 0x37, 0x57, 0x0b, 0x5d, 0x98, 0x7d, 0x2c, 0x06, 0x07, 0x58,
+ 0xfc, 0x1c, 0x22, 0xaa, 0x3d, 0xd7, 0x45, 0x0b, 0xf9, 0x8f, 0xf7, 0x3f, 0x8b, 0xdf, 0xea, 0xba,
+ 0xd9, 0xe0, 0x41, 0x8e, 0x8c, 0x50, 0x4a, 0x6f, 0x60, 0xb6, 0xe7, 0xda, 0x85, 0x74, 0xb0, 0x07,
+ 0xe9, 0xcf, 0x61, 0x52, 0x60, 0x14, 0x75, 0xc2, 0xbc, 0x5f, 0x50, 0x3a, 0x02, 0xbb, 0x92, 0x41,
+ 0xd1, 0x8a, 0x66, 0x07, 0x5b, 0xfd, 0x5d, 0x6c, 0xa5, 0x7f, 0x0f, 0x20, 0xea, 0x7e, 0x81, 0xe8,
+ 0x75, 0x67, 0x77, 0xb7, 0x8e, 0x49, 0x5f, 0xd2, 0x30, 0x71, 0x2e, 0x2b, 0xbf, 0xb5, 0xbe, 0x90,
+ 0x11, 0x59, 0x56, 0xf2, 0x5b, 0x8b, 0xe0, 0x26, 0x6a, 0xcb, 0x4b, 0x79, 0x23, 0x4b, 0xba, 0x64,
+ 0x98, 0x01, 0x99, 0xbe, 0x44, 0x0b, 0x12, 0xba, 0x4b, 0x78, 0x70, 0x48, 0xe8, 0x94, 0xab, 0x73,
+ 0x12, 0xef, 0x48, 0x9b, 0x77, 0x23, 0x1d, 0x79, 0x47, 0x5a, 0x1a, 0x3a, 0x3f, 0x83, 0x99, 0x90,
+ 0x97, 0xb2, 0x5a, 0xcb, 0xdc, 0x58, 0x6e, 0x5b, 0x7a, 0x9d, 0x7a, 0xe3, 0x39, 0xda, 0xd2, 0xff,
+ 0xf4, 0x60, 0x90, 0xdd, 0x05, 0xe9, 0x27, 0x30, 0xf7, 0x2d, 0x6b, 0xab, 0xea, 0x9e, 0x30, 0x5d,
+ 0x77, 0xad, 0x5d, 0x1e, 0x90, 0x4c, 0xff, 0xa0, 0xb1, 0x9f, 0x02, 0x6c, 0x1c, 0xbe, 0xd0, 0xeb,
+ 0x66, 0x42, 0xe4, 0x2d, 0x4b, 0x81, 0x4c, 0x8a, 0x94, 0xa9, 0x84, 0x4f, 0x7c, 0x68, 0x04, 0x1e,
+ 0x99, 0xc2, 0x0c, 0xcd, 0x5c, 0x17, 0xb9, 0xdb, 0x70, 0x3c, 0x69, 0x18, 0x81, 0x8d, 0x5f, 0xd0,
+ 0x9e, 0xf3, 0x08, 0xc2, 0x7a, 0x23, 0x35, 0xb7, 0xb5, 0x26, 0xd2, 0x88, 0xb2, 0x4e, 0xc7, 0x67,
+ 0xb7, 0xb2, 0x2b, 0x4b, 0xe8, 0xf2, 0x6e, 0x8d, 0xed, 0x40, 0x6e, 0x2f, 0xb9, 0xe1, 0x65, 0xe3,
+ 0x08, 0xa4, 0xbb, 0xe4, 0x35, 0x9a, 0xee, 0x64, 0x11, 0x1a, 0xe4, 0xa5, 0xcc, 0xbf, 0x51, 0xf6,
+ 0x4d, 0xbe, 0xd1, 0xd2, 0xaf, 0x2e, 0x13, 0x34, 0xfe, 0x41, 0xd9, 0x37, 0xaf, 0xf4, 0x3e, 0x26,
+ 0xa6, 0x7b, 0x98, 0x48, 0xff, 0xd2, 0x83, 0xfe, 0xb9, 0x78, 0x9f, 0xab, 0xb7, 0x43, 0xa5, 0xf7,
+ 0x7d, 0x43, 0xa5, 0xbf, 0x37, 0x54, 0x5a, 0x17, 0x7d, 0xa4, 0x83, 0xce, 0xf5, 0x15, 0x7e, 0xa7,
+ 0x4f, 0x60, 0x40, 0x9f, 0xd2, 0xf0, 0x8e, 0xe9, 0xb1, 0xd0, 0x45, 0x46, 0x5e, 0x7c, 0x9d, 0x5a,
+ 0xd7, 0x55, 0xbb, 0xf3, 0xa1, 0x8c, 0x14, 0x81, 0x5b, 0xa3, 0xab, 0x28, 0x8a, 0x88, 0x52, 0x3f,
+ 0xd5, 0x91, 0x6b, 0x7c, 0x29, 0xc1, 0x99, 0x90, 0x70, 0x76, 0x38, 0x9a, 0x02, 0x5c, 0x19, 0x3d,
+ 0x47, 0x53, 0xc0, 0xde, 0x5e, 0x00, 0x07, 0x7b, 0xc1, 0xf6, 0x23, 0x9b, 0x1c, 0x8e, 0xfe, 0x6e,
+ 0x28, 0xb8, 0x55, 0xb0, 0x9b, 0xef, 0x7f, 0x0e, 0x68, 0x14, 0x2f, 0x74, 0xb1, 0xdd, 0x81, 0x83,
+ 0xdd, 0x1d, 0xf8, 0x2e, 0xea, 0x6a, 0x97, 0x5e, 0xbf, 0x70, 0xb7, 0x4b, 0xef, 0x75, 0x63, 0x2c,
+ 0x55, 0x2f, 0xcc, 0x48, 0x46, 0x5b, 0x53, 0xa9, 0x76, 0x45, 0x21, 0x19, 0x6f, 0x71, 0x4c, 0xec,
+ 0x2a, 0xe5, 0x94, 0x0e, 0x1c, 0xe3, 0x2d, 0x38, 0xd2, 0x3f, 0x06, 0x70, 0xef, 0xc5, 0xc5, 0xf3,
+ 0x37, 0x18, 0xf0, 0x3b, 0x69, 0x0c, 0x2f, 0x24, 0xfb, 0x25, 0xae, 0x65, 0xf8, 0x40, 0xcc, 0x71,
+ 0x7e, 0xf6, 0xd1, 0x2e, 0xb1, 0x5d, 0x94, 0xd2, 0x05, 0x8b, 0xcc, 0x05, 0x79, 0x5c, 0xf4, 0x3a,
+ 0x5c, 0x3c, 0x85, 0x11, 0x5f, 0x5b, 0x55, 0x57, 0x94, 0xf9, 0xfc, 0x8c, 0xed, 0x8c, 0xe2, 0x8b,
+ 0x05, 0x79, 0x32, 0x1f, 0x41, 0x0d, 0xad, 0x2e, 0x6b, 0x8f, 0x06, 0x92, 0xd3, 0xff, 0x06, 0x30,
+ 0x73, 0x54, 0xfc, 0x7d, 0x44, 0xff, 0x83, 0x5b, 0xc2, 0x1d, 0xff, 0x53, 0x58, 0x02, 0x63, 0xff,
+ 0x09, 0xb7, 0xb8, 0xf3, 0x2a, 0x0e, 0x7b, 0xab, 0x55, 0x51, 0x48, 0x9d, 0x97, 0xaa, 0x6a, 0xe9,
+ 0x68, 0xe2, 0x6d, 0x5f, 0xaa, 0x4a, 0xb2, 0x9f, 0xc3, 0x5c, 0x28, 0x2d, 0x29, 0x61, 0x17, 0xe4,
+ 0x8a, 0x3a, 0xeb, 0xac, 0x14, 0xd6, 0xb6, 0x6b, 0xbc, 0xd3, 0xae, 0xf7, 0xd8, 0x2c, 0xa4, 0xca,
+ 0xef, 0xb1, 0xd9, 0xd3, 0xbf, 0x06, 0x30, 0xdd, 0xad, 0x2b, 0x9b, 0x42, 0xb8, 0xca, 0x5d, 0x05,
+ 0xe2, 0x23, 0x16, 0xc3, 0xb4, 0xd5, 0x90, 0xbf, 0xe2, 0x80, 0x3d, 0x84, 0x78, 0xd7, 0x82, 0x83,
+ 0x24, 0xee, 0x31, 0x80, 0xd1, 0x2a, 0xa7, 0x88, 0x3e, 0x9b, 0x41, 0xe4, 0xe4, 0x73, 0x71, 0x15,
+ 0x0f, 0xd8, 0x7d, 0x98, 0x75, 0x2a, 0xf2, 0x66, 0x3c, 0x64, 0x11, 0x0c, 0x57, 0x39, 0x7a, 0x47,
+ 0xec, 0x01, 0xdc, 0x6b, 0x8f, 0xf3, 0x05, 0x8f, 0xc7, 0x6c, 0x0e, 0xb0, 0xca, 0x57, 0x7e, 0xf2,
+ 0xc7, 0xa1, 0xcb, 0xc9, 0xad, 0xfd, 0x71, 0xe4, 0x72, 0x7a, 0x55, 0x97, 0xe5, 0xf3, 0xba, 0xba,
+ 0x54, 0x45, 0x0c, 0x4f, 0x9f, 0x41, 0xd8, 0x36, 0x17, 0x33, 0x59, 0x56, 0x46, 0x6a, 0x1b, 0x1f,
+ 0xa1, 0xfc, 0x35, 0x7d, 0x57, 0x71, 0x80, 0xf2, 0x0b, 0x59, 0x4a, 0x2b, 0xe3, 0xde, 0x17, 0xc9,
+ 0xdf, 0xde, 0x1e, 0x07, 0xdf, 0xbd, 0x3d, 0x0e, 0xfe, 0xf5, 0xf6, 0x38, 0xf8, 0xd3, 0xbb, 0xe3,
+ 0xa3, 0xef, 0xde, 0x1d, 0x1f, 0xfd, 0xe3, 0xdd, 0xf1, 0xd1, 0xc5, 0x88, 0xd0, 0xf2, 0xd9, 0xff,
+ 0x03, 0x00, 0x00, 0xff, 0xff, 0x59, 0x02, 0xcd, 0x8b, 0xca, 0x0e, 0x00, 0x00,
}
func (m *Area) Marshal() (dAtA []byte, err error) {
@@ -2681,6 +2689,16 @@
i = encodeVarintProtomsg(dAtA, i, uint64(len(m.SetType)))
i += copy(dAtA[i:], m.SetType)
}
+ if m.DefenceState {
+ dAtA[i] = 0x30
+ i++
+ if m.DefenceState {
+ dAtA[i] = 1
+ } else {
+ dAtA[i] = 0
+ }
+ i++
+ }
return i, nil
}
@@ -3461,6 +3479,9 @@
l = len(m.SetType)
if l > 0 {
n += 1 + l + sovProtomsg(uint64(l))
+ }
+ if m.DefenceState {
+ n += 2
}
return n
}
@@ -6476,6 +6497,26 @@
}
m.SetType = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
+ case 6:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field DefenceState", wireType)
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowProtomsg
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ v |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ m.DefenceState = bool(v != 0)
default:
iNdEx = preIndex
skippy, err := skipProtomsg(dAtA[iNdEx:])
--
Gitblit v1.8.0