From abd6d2381b39009f8bd9faf47ddf4535a1596fdc Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 04 十二月 2019 13:24:47 +0800
Subject: [PATCH] add pollChannelCount to PollConfig
---
protomsg.pb.go | 472 +++++++++++++++++++++++++---------------------------------
1 files changed, 207 insertions(+), 265 deletions(-)
diff --git a/protomsg.pb.go b/protomsg.pb.go
index 8a421d2..395e79d 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -9,6 +9,7 @@
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
+ math_bits "math/bits"
)
// Reference imports to suppress errors if they are not otherwise used.
@@ -37,6 +38,8 @@
TableChanged_T_TimeRule TableChanged = 8
TableChanged_T_Server TableChanged = 9
TableChanged_T_PollConfig TableChanged = 10
+ TableChanged_T_File TableChanged = 11
+ TableChanged_T_FileSetting TableChanged = 12
)
var TableChanged_name = map[int32]string{
@@ -51,6 +54,8 @@
8: "T_TimeRule",
9: "T_Server",
10: "T_PollConfig",
+ 11: "T_File",
+ 12: "T_FileSetting",
}
var TableChanged_value = map[string]int32{
@@ -65,6 +70,8 @@
"T_TimeRule": 8,
"T_Server": 9,
"T_PollConfig": 10,
+ "T_File": 11,
+ "T_FileSetting": 12,
}
func (x TableChanged) String() string {
@@ -2119,7 +2126,7 @@
Tasks []string `protobuf:"bytes,4,rep,name=tasks,proto3" json:"tasks,omitempty"`
TreeNodes []string `protobuf:"bytes,5,rep,name=treeNodes,proto3" json:"treeNodes,omitempty"`
Tabs []string `protobuf:"bytes,6,rep,name=tabs,proto3" json:"tabs,omitempty"`
- AlarmLevel []int32 `protobuf:"varint,7,rep,packed,name=alarmLevel,proto3" json:"alarmLevel,omitempty"`
+ AlarmLevel string `protobuf:"bytes,7,opt,name=alarmLevel,proto3" json:"alarmLevel,omitempty"`
SearchTime []string `protobuf:"bytes,8,rep,name=searchTime,proto3" json:"searchTime,omitempty"`
InputValue string `protobuf:"bytes,9,opt,name=inputValue,proto3" json:"inputValue,omitempty"`
Collection string `protobuf:"bytes,10,opt,name=collection,proto3" json:"collection,omitempty"`
@@ -2202,11 +2209,11 @@
return nil
}
-func (m *CompareArgs) GetAlarmLevel() []int32 {
+func (m *CompareArgs) GetAlarmLevel() string {
if m != nil {
return m.AlarmLevel
}
- return nil
+ return ""
}
func (m *CompareArgs) GetSearchTime() []string {
@@ -2948,167 +2955,168 @@
func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
var fileDescriptor_32de24555f916688 = []byte{
- // 2551 bytes of a gzipped FileDescriptorProto
+ // 2566 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x38, 0xcb, 0x6e, 0x1c, 0xc7,
0xb5, 0xec, 0x79, 0xcf, 0x99, 0x19, 0xaa, 0x55, 0xd2, 0xb5, 0x5b, 0xf2, 0x35, 0x4d, 0xf7, 0x95,
0x61, 0x5d, 0xc1, 0xf6, 0xbd, 0x90, 0xbd, 0x08, 0xb2, 0x08, 0x30, 0xd6, 0x23, 0x18, 0xc0, 0x71,
0x98, 0x26, 0xa5, 0xec, 0xd2, 0xa8, 0x99, 0x2e, 0x0e, 0x1b, 0x2c, 0x76, 0x37, 0xaa, 0xba, 0x69,
- 0x73, 0x91, 0x0f, 0xc8, 0x2a, 0xf9, 0xa1, 0x20, 0x41, 0x56, 0x59, 0x64, 0xe1, 0x65, 0xb2, 0x72,
- 0x60, 0x03, 0x41, 0x80, 0x20, 0x7f, 0x90, 0x00, 0xc1, 0x39, 0x55, 0xd5, 0x8f, 0x21, 0x65, 0x6b,
- 0x35, 0x75, 0x1e, 0x5d, 0x75, 0xde, 0x8f, 0x81, 0xfd, 0x42, 0xe5, 0x65, 0x7e, 0xa1, 0xb7, 0x1f,
- 0xd1, 0x81, 0x4d, 0x1c, 0x7c, 0x1f, 0xd6, 0x5c, 0x0b, 0x83, 0x0d, 0x9f, 0xc3, 0x60, 0xa9, 0x04,
- 0x67, 0xfb, 0xd0, 0x4b, 0x93, 0xc0, 0x3b, 0xf4, 0x1e, 0x0e, 0xa3, 0x5e, 0x9a, 0xb0, 0xfb, 0x30,
- 0x29, 0xb8, 0x12, 0x59, 0x99, 0x26, 0x41, 0x8f, 0xb0, 0x35, 0xcc, 0x18, 0x0c, 0x32, 0x7e, 0x21,
- 0x82, 0xfe, 0xa1, 0xf7, 0x70, 0x1a, 0xd1, 0x39, 0xfc, 0x57, 0x1f, 0x46, 0x4f, 0xf8, 0x85, 0x50,
- 0xed, 0xab, 0xa6, 0x74, 0x95, 0x63, 0xef, 0x35, 0xec, 0xec, 0x2e, 0x0c, 0xb9, 0x4c, 0xb9, 0xb6,
- 0x77, 0x18, 0x80, 0xbd, 0x0b, 0x73, 0x9d, 0xf1, 0x42, 0x9f, 0xe5, 0x65, 0x5c, 0x29, 0x19, 0x0c,
- 0x88, 0x38, 0x73, 0xb8, 0x17, 0x4a, 0xe2, 0x65, 0xe5, 0x55, 0x21, 0x82, 0x21, 0xc9, 0x44, 0x67,
- 0xc4, 0xf1, 0x24, 0x51, 0xc1, 0xc8, 0x3c, 0x80, 0x67, 0xf6, 0xdf, 0x30, 0x95, 0x79, 0xb6, 0x4d,
- 0xcb, 0x2a, 0x11, 0xc1, 0xf8, 0xd0, 0x7b, 0xd8, 0x8b, 0x1a, 0x04, 0x6a, 0x27, 0x79, 0x69, 0x88,
- 0x13, 0x22, 0xd6, 0x30, 0x8a, 0x76, 0x2a, 0xf3, 0x5c, 0x05, 0x53, 0x7a, 0xc2, 0x00, 0xf8, 0x86,
- 0x2a, 0x75, 0x11, 0x80, 0x79, 0x03, 0xcf, 0xa4, 0x68, 0x11, 0xcc, 0xac, 0xa2, 0x05, 0xf2, 0x14,
- 0xb9, 0x2a, 0x83, 0xb9, 0x91, 0x0d, 0xcf, 0xf8, 0x52, 0xa5, 0x85, 0x22, 0x03, 0x2c, 0x88, 0xb3,
- 0x86, 0x8d, 0x8d, 0xb5, 0xfe, 0x22, 0x57, 0x49, 0xb0, 0x6f, 0x68, 0x0e, 0x46, 0x29, 0xd6, 0x8a,
- 0x67, 0x49, 0x70, 0xcb, 0x18, 0x88, 0x00, 0xfc, 0x42, 0x09, 0x2d, 0xd4, 0xa5, 0x48, 0x02, 0xdf,
- 0x7c, 0xe1, 0x60, 0xf6, 0x36, 0x40, 0xaa, 0x63, 0x55, 0x65, 0x59, 0x9a, 0x6d, 0x83, 0xdb, 0x87,
- 0xde, 0xc3, 0x49, 0x34, 0x4d, 0x75, 0x64, 0x10, 0x48, 0x56, 0x55, 0x16, 0x8b, 0x8c, 0xaf, 0xa5,
- 0x08, 0x98, 0x21, 0xab, 0x2a, 0x7b, 0x46, 0x08, 0x76, 0x0f, 0x26, 0x48, 0x26, 0xdb, 0xde, 0x21,
- 0xf9, 0xc7, 0xaa, 0xca, 0x4e, 0xd0, 0xbc, 0x21, 0x2c, 0x90, 0x44, 0xcf, 0xa8, 0x38, 0x4d, 0x82,
- 0xbb, 0xc6, 0x2d, 0xaa, 0xca, 0x8e, 0x09, 0xb7, 0x4a, 0xc2, 0x0d, 0xdc, 0x36, 0xde, 0x5f, 0x66,
- 0xc9, 0x09, 0xd7, 0xe7, 0xab, 0xec, 0x34, 0x67, 0x0f, 0x61, 0xb4, 0x21, 0x24, 0x05, 0xc3, 0xec,
- 0xb1, 0xff, 0x51, 0x1d, 0x92, 0x86, 0x39, 0xb2, 0x74, 0xf6, 0x00, 0x86, 0x25, 0xd7, 0xe7, 0x3a,
- 0xe8, 0x1d, 0xf6, 0x1f, 0xce, 0x1e, 0xef, 0x37, 0x8c, 0x78, 0x59, 0x64, 0x88, 0xe1, 0xd7, 0x1e,
- 0x0c, 0x10, 0x66, 0x6f, 0xc0, 0x08, 0x31, 0x75, 0x94, 0x59, 0x08, 0xcd, 0x83, 0xa7, 0x56, 0xb4,
- 0xd5, 0x30, 0x7b, 0x0b, 0xa6, 0x1b, 0x25, 0x78, 0x29, 0x62, 0x5e, 0xda, 0xa8, 0x9b, 0x18, 0xc4,
- 0xb2, 0x6c, 0x11, 0xd7, 0x57, 0x36, 0xea, 0x2c, 0xf1, 0xd3, 0x2b, 0x24, 0x56, 0x45, 0x62, 0xbf,
- 0x1c, 0x5a, 0x1f, 0x12, 0x62, 0x59, 0xa2, 0x28, 0xd6, 0xa4, 0x23, 0x32, 0xa9, 0x85, 0xd0, 0x9e,
- 0xa9, 0x8e, 0xb9, 0xe4, 0xea, 0x82, 0xc2, 0x6f, 0x12, 0x8d, 0x53, 0xbd, 0x44, 0x10, 0x49, 0x89,
- 0x90, 0xf1, 0xa9, 0xe4, 0x5b, 0x0a, 0xbe, 0x49, 0x34, 0x4e, 0x84, 0x7c, 0x2e, 0xf9, 0x36, 0x3c,
- 0x81, 0x19, 0x2a, 0x78, 0x9c, 0x18, 0x03, 0x86, 0x30, 0x40, 0xf9, 0xad, 0xf9, 0x76, 0xad, 0x42,
- 0x34, 0xf6, 0x2e, 0x0c, 0x74, 0x52, 0x5b, 0x6e, 0xd1, 0xf0, 0x1c, 0x27, 0xe7, 0x11, 0x91, 0xc2,
- 0x1f, 0xc2, 0x08, 0x81, 0x2a, 0x63, 0xff, 0x05, 0xa3, 0xb4, 0xd8, 0xc4, 0xb5, 0xe1, 0x86, 0x69,
- 0xb1, 0x59, 0x25, 0x28, 0x91, 0x4e, 0xce, 0x8d, 0xf3, 0x8d, 0xdd, 0xc6, 0x3a, 0x39, 0x47, 0xe7,
- 0x87, 0x2f, 0x01, 0xac, 0x44, 0xf8, 0xfd, 0xeb, 0x08, 0xf4, 0xa0, 0x23, 0x90, 0xdf, 0x15, 0xa8,
- 0xca, 0xac, 0x4c, 0x7f, 0xeb, 0x01, 0x98, 0x20, 0x20, 0x8f, 0xee, 0xd6, 0x0c, 0x74, 0x08, 0x51,
- 0x63, 0x5b, 0x7f, 0xd0, 0x21, 0x84, 0x58, 0x25, 0xec, 0x4d, 0x18, 0xe3, 0x4b, 0x48, 0xea, 0x37,
- 0xfe, 0x5f, 0x25, 0xec, 0x43, 0x98, 0x96, 0xe9, 0x85, 0x88, 0x55, 0x25, 0x45, 0x30, 0xd8, 0x7d,
- 0xff, 0x29, 0xbf, 0x7a, 0x52, 0xca, 0x68, 0x82, 0x2c, 0x51, 0x25, 0x05, 0xa5, 0x84, 0xe0, 0x9b,
- 0xd2, 0xf0, 0x1b, 0xcf, 0x4e, 0x09, 0x43, 0xe4, 0x77, 0x61, 0x6e, 0xc8, 0x89, 0xb8, 0x4c, 0x37,
- 0xc2, 0x96, 0x97, 0x19, 0xe1, 0x9e, 0x12, 0xaa, 0xe3, 0xca, 0x71, 0xc7, 0x95, 0xec, 0x1d, 0x98,
- 0xd9, 0xa8, 0x69, 0x39, 0x1a, 0x0c, 0x8a, 0x18, 0x9a, 0xc8, 0x99, 0x76, 0x22, 0x87, 0xc1, 0x40,
- 0x63, 0x15, 0x01, 0x53, 0x45, 0xf0, 0x8c, 0x1a, 0xa7, 0x3a, 0x3e, 0xad, 0xa4, 0xa4, 0x72, 0x33,
- 0x89, 0x46, 0xa9, 0x7e, 0x5e, 0x49, 0xc9, 0x0e, 0x61, 0x2e, 0xd3, 0xec, 0x3c, 0x76, 0xf6, 0x98,
- 0x93, 0x8c, 0x80, 0x38, 0x4a, 0xc3, 0x24, 0xfc, 0x19, 0xec, 0x5b, 0x3b, 0xa7, 0x17, 0x02, 0x15,
- 0x7d, 0xad, 0xfa, 0xfc, 0x56, 0xdb, 0x92, 0x36, 0x5b, 0x9c, 0xdd, 0xc2, 0xcf, 0x61, 0x64, 0x6c,
- 0xc9, 0x7c, 0xe8, 0x27, 0xfc, 0xca, 0xb6, 0x0d, 0x3c, 0xb2, 0xc7, 0x00, 0xe6, 0x43, 0x9e, 0x6d,
- 0x85, 0x8d, 0x81, 0x3b, 0xad, 0x38, 0xc1, 0x3b, 0x90, 0x14, 0xd1, 0xfd, 0x74, 0x0c, 0x3f, 0x86,
- 0x69, 0x8d, 0xc7, 0xc2, 0xa7, 0x4b, 0xae, 0x4a, 0x17, 0xa1, 0x04, 0xe0, 0x43, 0x22, 0x73, 0x91,
- 0x80, 0xc7, 0xf0, 0x25, 0x8c, 0x8f, 0x72, 0x79, 0xb5, 0xcd, 0xb3, 0xd7, 0x52, 0xe8, 0x7d, 0x18,
- 0x15, 0x79, 0x9a, 0x95, 0xd8, 0x71, 0x50, 0xa6, 0x5b, 0x8d, 0x4c, 0x47, 0x88, 0x8f, 0x2c, 0x39,
- 0xdc, 0xd4, 0xf6, 0xe2, 0xfa, 0x7c, 0xa9, 0xb6, 0xba, 0x1b, 0x8b, 0xde, 0x4e, 0x2c, 0x7e, 0x02,
- 0x53, 0xb2, 0x3d, 0x57, 0x5b, 0x17, 0xf2, 0x6f, 0x76, 0xd3, 0xe2, 0xc7, 0x2a, 0xaf, 0x0a, 0xbc,
- 0xc8, 0x14, 0x23, 0x3c, 0x85, 0x97, 0xb0, 0xe8, 0x90, 0xda, 0x21, 0xed, 0x75, 0x42, 0xfa, 0x13,
- 0x98, 0x6d, 0x91, 0x8b, 0x3c, 0xa1, 0xaf, 0x1b, 0x94, 0xae, 0x40, 0xaf, 0x44, 0xb0, 0x75, 0x47,
- 0xdd, 0x8a, 0xad, 0x7e, 0x3b, 0xb6, 0xc2, 0x3f, 0x79, 0x30, 0xad, 0xbf, 0xc0, 0xe8, 0x35, 0x77,
- 0xd7, 0xaf, 0x8e, 0x09, 0x5e, 0x51, 0x33, 0x31, 0xa4, 0x52, 0x7c, 0x59, 0x5a, 0x43, 0x4e, 0x09,
- 0x73, 0x22, 0xbe, 0x2c, 0x31, 0xb8, 0xa9, 0xb4, 0xc5, 0x52, 0x5c, 0x0a, 0x49, 0x8f, 0x0c, 0x23,
- 0x20, 0xd4, 0x67, 0x88, 0xc1, 0x82, 0x6e, 0x04, 0x1e, 0xec, 0x16, 0x74, 0x92, 0xd5, 0x10, 0xa9,
- 0xee, 0x88, 0x32, 0xae, 0x1b, 0x3a, 0xd6, 0x1d, 0x51, 0x52, 0xd3, 0xf9, 0x1f, 0x58, 0x24, 0xe2,
- 0x54, 0x64, 0x1b, 0x11, 0xeb, 0x92, 0x97, 0xae, 0xbc, 0xce, 0x2d, 0xf2, 0x18, 0x71, 0xe1, 0x3f,
- 0x7a, 0x30, 0x88, 0x6e, 0x0a, 0xe9, 0x07, 0xb0, 0x6f, 0x5d, 0xe6, 0xac, 0x6a, 0x54, 0x98, 0x6f,
- 0x6a, 0xd7, 0xae, 0x76, 0x8a, 0x4c, 0x7f, 0xc7, 0xb1, 0x6f, 0x03, 0x14, 0x26, 0xbe, 0x90, 0x6a,
- 0x7a, 0xc2, 0xd4, 0x62, 0x56, 0x09, 0x56, 0x52, 0x2c, 0x99, 0x69, 0x62, 0x05, 0x1f, 0xea, 0x04,
- 0xaf, 0x0c, 0x61, 0x81, 0x68, 0xae, 0xb6, 0xb1, 0x99, 0x6f, 0x6c, 0xd1, 0xd0, 0x09, 0x3a, 0x7e,
- 0x49, 0x53, 0xce, 0x7d, 0x98, 0xe4, 0x85, 0x50, 0xbc, 0xcc, 0x15, 0x15, 0x8d, 0x69, 0x54, 0xc3,
- 0xa8, 0xb6, 0x3b, 0x1b, 0xb3, 0x4c, 0x8c, 0xdc, 0x0e, 0xe9, 0x1a, 0xb2, 0x7b, 0xe4, 0x92, 0xcb,
- 0xca, 0x14, 0x90, 0xfa, 0x91, 0x97, 0x88, 0xba, 0xb1, 0x8a, 0x50, 0x23, 0x97, 0x22, 0xfe, 0x22,
- 0x2d, 0xcf, 0xe2, 0x42, 0x09, 0x3b, 0xba, 0xcc, 0x10, 0xf9, 0xf3, 0xb4, 0x3c, 0x3b, 0x52, 0xdd,
- 0x98, 0x98, 0x77, 0x62, 0x22, 0xfc, 0x7d, 0x0f, 0xfa, 0xc7, 0xc9, 0xf5, 0x5a, 0xdd, 0x34, 0x95,
- 0xde, 0xab, 0x9a, 0x4a, 0xbf, 0xd3, 0x54, 0x1c, 0x89, 0x92, 0x74, 0x50, 0x93, 0x3e, 0xc7, 0x3c,
- 0x7d, 0x00, 0x03, 0x4a, 0xa5, 0xe1, 0x0d, 0xdd, 0x63, 0xa9, 0xb6, 0x11, 0x51, 0x51, 0xbb, 0x74,
- 0x93, 0x67, 0x6e, 0xe2, 0xc3, 0x33, 0x96, 0x08, 0x9c, 0x19, 0x8d, 0x45, 0xf1, 0x88, 0x51, 0x6a,
- 0xbb, 0x3a, 0xd6, 0x1a, 0x6b, 0x4a, 0x30, 0x28, 0x2c, 0x38, 0xad, 0x1a, 0x4d, 0x0c, 0xc6, 0x8c,
- 0xb6, 0x46, 0x13, 0x43, 0x67, 0x2e, 0x80, 0x9d, 0xb9, 0xa0, 0x49, 0xb2, 0xd9, 0x6e, 0xeb, 0xaf,
- 0x9b, 0x82, 0x19, 0x05, 0xeb, 0xfe, 0x9e, 0xd7, 0xfd, 0x9d, 0xc2, 0xd6, 0xce, 0x31, 0xab, 0xdd,
- 0xa4, 0x6f, 0x6e, 0xee, 0x75, 0x6e, 0xfe, 0x7f, 0xb2, 0x1b, 0xa5, 0xb8, 0x2d, 0x63, 0x77, 0x77,
- 0xda, 0xab, 0x14, 0xc7, 0xa2, 0x8c, 0x6a, 0xae, 0xb0, 0x02, 0x68, 0xf0, 0x54, 0x5b, 0x93, 0xe6,
- 0x39, 0x1b, 0xb3, 0x77, 0xc1, 0x78, 0xac, 0xeb, 0xbe, 0xf7, 0x5d, 0x06, 0x9b, 0x87, 0x6e, 0x5f,
- 0x7b, 0xc8, 0x25, 0xb1, 0x8b, 0xb4, 0x41, 0x13, 0x69, 0xe1, 0x2f, 0x61, 0xec, 0x74, 0xdc, 0x8d,
- 0x96, 0x6b, 0x19, 0xd2, 0xfb, 0xee, 0x0c, 0xe9, 0xef, 0x64, 0xc8, 0xb5, 0xe0, 0x1f, 0x5c, 0x0b,
- 0xfe, 0xf0, 0xef, 0x1e, 0x4d, 0x3c, 0x4b, 0xb5, 0x6d, 0x16, 0x0d, 0xaf, 0xbd, 0x68, 0xdc, 0xd4,
- 0x21, 0xdc, 0x66, 0x61, 0xb7, 0x1a, 0xb7, 0x59, 0x5c, 0x54, 0xda, 0xe8, 0x36, 0x89, 0xe8, 0x8c,
- 0xb8, 0x2a, 0x4b, 0xdd, 0x24, 0x48, 0x67, 0x7c, 0xc5, 0x34, 0x3c, 0x13, 0x90, 0x06, 0xb0, 0x35,
- 0x8c, 0x57, 0xb2, 0xb4, 0xa2, 0x9a, 0xd8, 0x9c, 0x5b, 0xa4, 0x49, 0xd4, 0xff, 0x05, 0xdf, 0x31,
- 0xd5, 0x3a, 0x9b, 0x48, 0xbd, 0x65, 0xf1, 0x3f, 0x75, 0xaa, 0x3b, 0x4b, 0x4f, 0x5b, 0x96, 0xfe,
- 0xb5, 0x07, 0xb7, 0x9e, 0xae, 0x9f, 0x9c, 0xe1, 0x83, 0x3f, 0x11, 0x5a, 0xf3, 0xad, 0x60, 0x1f,
- 0xe0, 0x34, 0x8d, 0xd1, 0x83, 0x3a, 0xef, 0x3f, 0x7e, 0xa3, 0xdd, 0x8f, 0xd6, 0x52, 0x18, 0xe6,
- 0x24, 0x32, 0x4c, 0xd6, 0x41, 0xbd, 0xda, 0x41, 0x8f, 0x60, 0xc4, 0x37, 0x65, 0x9a, 0x67, 0x64,
- 0x89, 0xfd, 0xc7, 0xac, 0x35, 0x41, 0xad, 0x97, 0x44, 0x89, 0x2c, 0x07, 0xe5, 0x61, 0x76, 0x9a,
- 0x5b, 0x1f, 0xd0, 0x39, 0xfc, 0xa7, 0x07, 0x0b, 0xd3, 0x41, 0x5f, 0xd5, 0x9f, 0xbf, 0x73, 0xb8,
- 0xbb, 0x61, 0xb9, 0x64, 0x01, 0x8c, 0x6d, 0xe5, 0x75, 0xe5, 0xc2, 0x82, 0x38, 0xa3, 0x95, 0x2a,
- 0xdd, 0x6e, 0x85, 0x8a, 0x65, 0x9a, 0xb9, 0x2e, 0x32, 0xb3, 0xb8, 0xcf, 0xd2, 0x4c, 0xb0, 0xf7,
- 0x60, 0x3f, 0x49, 0x95, 0x20, 0x81, 0x0d, 0x93, 0x71, 0xd2, 0xa2, 0xc6, 0x12, 0x9b, 0x73, 0xff,
- 0xb8, 0xe5, 0xfe, 0x6b, 0x4d, 0x68, 0x42, 0x96, 0xef, 0x36, 0xa1, 0xdf, 0x7a, 0xb0, 0x78, 0x99,
- 0x26, 0x22, 0x2f, 0x79, 0x21, 0x68, 0x6c, 0xbf, 0x0f, 0x13, 0xa1, 0x9f, 0xf2, 0x92, 0xd7, 0x99,
- 0x56, 0xc3, 0x48, 0x73, 0xaa, 0x5e, 0x53, 0xbd, 0x29, 0x07, 0xdd, 0xb1, 0x16, 0x13, 0xf4, 0x62,
- 0xbb, 0x32, 0x5d, 0xa8, 0x1f, 0x19, 0x00, 0x6f, 0xba, 0xc4, 0x67, 0x5f, 0x28, 0xe9, 0xb6, 0x12,
- 0x07, 0xe3, 0x4d, 0x94, 0xdb, 0xd8, 0x7f, 0xfa, 0x78, 0x93, 0x81, 0x3a, 0x4a, 0xda, 0xed, 0x39,
- 0xfc, 0x77, 0x0f, 0x66, 0x4f, 0xf2, 0x0b, 0xdc, 0xee, 0x69, 0x14, 0xa1, 0x25, 0x6a, 0x2d, 0x05,
- 0x7e, 0xed, 0xd1, 0xd7, 0x35, 0xcc, 0x1e, 0x81, 0xbf, 0x31, 0xac, 0x27, 0x67, 0x4a, 0xe8, 0xb3,
- 0x5c, 0x1a, 0x2d, 0x7a, 0xd1, 0x35, 0x3c, 0x3b, 0x84, 0xd9, 0x29, 0xdf, 0x88, 0xe7, 0x82, 0x97,
- 0x95, 0x32, 0xfe, 0x9c, 0x47, 0x6d, 0x14, 0xea, 0x65, 0xb6, 0xbe, 0x01, 0x3d, 0x63, 0x00, 0xdc,
- 0xdc, 0x4b, 0x25, 0xc4, 0xe7, 0x79, 0x22, 0x4c, 0x1b, 0x98, 0x46, 0x0d, 0x82, 0x34, 0xe0, 0x6b,
- 0xa7, 0x17, 0x9d, 0xd9, 0x01, 0xb4, 0x46, 0x8f, 0x60, 0x7c, 0xd8, 0xdf, 0x19, 0x46, 0x0e, 0x00,
- 0xb4, 0xe0, 0x6a, 0x73, 0x76, 0x62, 0xda, 0x00, 0x7e, 0xd9, 0xc2, 0x20, 0x3d, 0xcd, 0x8a, 0xca,
- 0x24, 0xa4, 0xeb, 0x02, 0x0d, 0x06, 0xe9, 0x9b, 0x5c, 0x4a, 0x13, 0x2c, 0xb6, 0x0d, 0xb4, 0x30,
- 0x64, 0xed, 0xbc, 0x52, 0x9b, 0xba, 0x11, 0x18, 0x88, 0x3d, 0x80, 0x05, 0xcf, 0xb8, 0xbc, 0x72,
- 0x5b, 0xb2, 0x6d, 0xa8, 0x5d, 0x64, 0xb8, 0x86, 0xb9, 0x35, 0xff, 0xb3, 0x4b, 0x91, 0x95, 0xec,
- 0x07, 0x30, 0x15, 0x78, 0xc0, 0x4e, 0x69, 0x33, 0xf8, 0x7e, 0x6b, 0x71, 0x6e, 0xb1, 0x22, 0x47,
- 0xd4, 0x30, 0x53, 0x9a, 0xf0, 0x2b, 0x99, 0x73, 0xe3, 0x94, 0x79, 0xe4, 0xc0, 0xf0, 0x17, 0xb0,
- 0x7f, 0x9c, 0x9c, 0xbb, 0x6f, 0xf9, 0xe6, 0xec, 0x5a, 0x4e, 0x06, 0x38, 0x80, 0xae, 0xa5, 0xa8,
- 0x33, 0xd2, 0x81, 0x2c, 0x84, 0xb9, 0xf5, 0xed, 0xf1, 0x26, 0xb7, 0x8e, 0xec, 0x45, 0x1d, 0x5c,
- 0x18, 0x81, 0xdf, 0xdc, 0x1f, 0x09, 0x5d, 0xc9, 0x92, 0xfd, 0x08, 0x16, 0x9b, 0x36, 0x82, 0x82,
- 0x69, 0xf6, 0x38, 0xe8, 0x34, 0x92, 0x96, 0x48, 0x51, 0x97, 0x3d, 0xfc, 0x55, 0x1f, 0xa6, 0xa4,
- 0xe6, 0x51, 0xa5, 0xcf, 0x5e, 0x6b, 0xc6, 0x7f, 0xdb, 0xee, 0x1e, 0x66, 0x7f, 0x30, 0x39, 0x44,
- 0x6b, 0xc6, 0x31, 0xed, 0x10, 0xf7, 0x80, 0x56, 0x98, 0x18, 0x17, 0x09, 0x5b, 0x46, 0x10, 0x7e,
- 0x96, 0xd1, 0xbc, 0x98, 0xea, 0x58, 0xf3, 0x32, 0xd5, 0xa7, 0x57, 0x31, 0x97, 0x26, 0xa3, 0x26,
- 0xd1, 0x3c, 0xd5, 0xc7, 0x06, 0xb9, 0x94, 0x12, 0xeb, 0x16, 0xcd, 0x4f, 0x34, 0x13, 0x8f, 0xec,
- 0xdf, 0x2f, 0x95, 0x14, 0x34, 0x12, 0x37, 0x3d, 0x7b, 0xdc, 0xe9, 0xd9, 0x6f, 0xc1, 0xd4, 0x6c,
- 0x68, 0xcd, 0x34, 0x37, 0xa1, 0xf5, 0x0c, 0x3d, 0xf6, 0x0e, 0xcc, 0x88, 0x68, 0x37, 0xcc, 0x69,
- 0xb3, 0xbd, 0xd9, 0x05, 0xf3, 0xff, 0x60, 0x92, 0x16, 0x71, 0x91, 0xab, 0x52, 0x07, 0xb0, 0xdb,
- 0xf1, 0xd1, 0x30, 0xab, 0xe2, 0x28, 0x57, 0x65, 0x34, 0x4e, 0xe9, 0x57, 0xb3, 0xf7, 0x60, 0x50,
- 0x29, 0xa9, 0x83, 0xd9, 0x6e, 0xd7, 0x46, 0xe6, 0x17, 0x4a, 0x46, 0x44, 0x66, 0x1f, 0xba, 0xee,
- 0x3e, 0xdf, 0x5d, 0x59, 0x6a, 0x93, 0xb7, 0x7a, 0x7c, 0xf8, 0xb5, 0x07, 0x8b, 0x0e, 0xe1, 0x9a,
- 0x3f, 0xd0, 0xf6, 0x79, 0x91, 0x6e, 0xda, 0x7f, 0x22, 0x4c, 0x09, 0x43, 0x8a, 0xe2, 0x3e, 0x49,
- 0x64, 0xae, 0xb6, 0xf5, 0x3e, 0x89, 0x08, 0xec, 0xd1, 0xed, 0x76, 0x3f, 0xf8, 0xbe, 0x81, 0x78,
- 0x78, 0xc3, 0x40, 0x4c, 0xff, 0x6d, 0x49, 0x61, 0xbb, 0xec, 0xc8, 0x2e, 0xf2, 0x95, 0x14, 0x26,
- 0x7f, 0x43, 0x58, 0x50, 0x92, 0xc4, 0x45, 0xa5, 0xcf, 0xb0, 0xe7, 0x98, 0x1a, 0x3f, 0x13, 0x4e,
- 0xa3, 0x55, 0x12, 0xbe, 0x00, 0x68, 0xcc, 0x89, 0xe2, 0xba, 0xbf, 0xbb, 0x0a, 0x57, 0xc2, 0x0d,
- 0x62, 0xd5, 0xfc, 0xcd, 0xd7, 0x6b, 0xfd, 0xcd, 0xf7, 0xaa, 0x85, 0xeb, 0x63, 0x18, 0x5b, 0xc3,
- 0xbb, 0xf9, 0xd4, 0x6b, 0xe6, 0xd3, 0x57, 0x8c, 0x79, 0xe1, 0xef, 0x3c, 0x23, 0xcc, 0xb2, 0x2c,
- 0x31, 0x55, 0xdf, 0x84, 0xb1, 0x13, 0xdc, 0x8e, 0x89, 0x05, 0xc9, 0xcc, 0x42, 0xe8, 0x6f, 0xf8,
- 0x05, 0x7d, 0x7c, 0xd3, 0x9f, 0x6b, 0x48, 0x6c, 0x6b, 0x52, 0xef, 0x38, 0x56, 0x93, 0x04, 0xc3,
- 0xcf, 0x12, 0x5b, 0xa3, 0x38, 0x18, 0x14, 0x4d, 0xe3, 0xf7, 0x60, 0x22, 0xf3, 0x0d, 0x97, 0x68,
- 0x06, 0xbb, 0xa0, 0x11, 0xbc, 0x2a, 0xf0, 0x62, 0x6a, 0x37, 0xf4, 0x47, 0xed, 0xa8, 0xdb, 0x7f,
- 0xc2, 0xbf, 0x78, 0x70, 0xe7, 0x99, 0x3e, 0x12, 0x4a, 0xe7, 0xd9, 0x13, 0xbe, 0x39, 0xb3, 0x33,
- 0x07, 0xfb, 0xc0, 0xf6, 0x1f, 0x53, 0xd6, 0x5a, 0xa5, 0xe0, 0x99, 0x6e, 0xb1, 0x25, 0xb6, 0xfd,
- 0xde, 0xb3, 0x9d, 0xc8, 0x8c, 0x09, 0xfd, 0xba, 0x28, 0x99, 0xd5, 0xad, 0xa0, 0xdb, 0x5b, 0x6a,
- 0x19, 0xc4, 0x8a, 0x6a, 0xd9, 0xa9, 0xed, 0x3a, 0x36, 0xcf, 0x2d, 0xd8, 0x9a, 0x6d, 0x86, 0xdf,
- 0x3b, 0xdb, 0x74, 0xff, 0xd9, 0x1b, 0x3a, 0xef, 0x3c, 0xfa, 0x83, 0x07, 0xf3, 0xf6, 0x1c, 0xc5,
- 0xe6, 0x30, 0x39, 0x89, 0x8d, 0xcd, 0xfd, 0x3d, 0xe6, 0xc3, 0xdc, 0x41, 0x38, 0xea, 0xfb, 0x1e,
- 0xbb, 0x0b, 0x7e, 0x1b, 0x83, 0x4d, 0xd6, 0xef, 0x31, 0x80, 0xd1, 0x49, 0x4c, 0x1c, 0x7d, 0xb6,
- 0x80, 0xa9, 0x39, 0x1f, 0x27, 0xe7, 0xfe, 0x80, 0xdd, 0x86, 0x45, 0x0d, 0x62, 0xb2, 0xf9, 0x43,
- 0x36, 0x85, 0xe1, 0x49, 0x8c, 0xd4, 0x11, 0xbb, 0x03, 0xb7, 0xdc, 0x75, 0x76, 0xc0, 0xf2, 0xc7,
- 0x6c, 0x1f, 0xe0, 0x24, 0x3e, 0xb1, 0x7f, 0xd0, 0xf8, 0x13, 0x23, 0x93, 0x69, 0x31, 0xfe, 0xd4,
- 0xc8, 0x74, 0x94, 0x4b, 0xf9, 0x24, 0xcf, 0x4e, 0xd3, 0xad, 0x0f, 0x8f, 0x3e, 0x82, 0x89, 0x53,
- 0x18, 0x25, 0x59, 0x65, 0x5a, 0xa8, 0xd2, 0xdf, 0xc3, 0xf3, 0x0b, 0x5a, 0x7f, 0x7c, 0x0f, 0xcf,
- 0x4f, 0x85, 0x14, 0xa5, 0xf0, 0x7b, 0x8f, 0x96, 0xe0, 0xef, 0x76, 0x1e, 0x76, 0x0b, 0x66, 0x91,
- 0x58, 0x65, 0x69, 0x49, 0xae, 0xf3, 0xf7, 0x10, 0x61, 0x3e, 0x36, 0x08, 0x8f, 0xcd, 0x60, 0x6c,
- 0xbf, 0xf2, 0x7b, 0x8f, 0x3e, 0x81, 0xfd, 0xae, 0x97, 0x8d, 0xda, 0x4f, 0xd7, 0x64, 0x4c, 0x7f,
- 0xcf, 0x28, 0x66, 0x41, 0x13, 0x3a, 0xbe, 0xf7, 0x69, 0xf0, 0xc7, 0x6f, 0x0e, 0xbc, 0xaf, 0xbe,
- 0x39, 0xf0, 0xfe, 0xfa, 0xcd, 0x81, 0xf7, 0x9b, 0x6f, 0x0f, 0xf6, 0xbe, 0xfa, 0xf6, 0x60, 0xef,
- 0xcf, 0xdf, 0x1e, 0xec, 0xad, 0x47, 0xe4, 0xba, 0x8f, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0xb7,
- 0x29, 0x90, 0xe3, 0xe8, 0x18, 0x00, 0x00,
+ 0x73, 0x91, 0x0f, 0xc8, 0x2a, 0xf9, 0xa1, 0x20, 0x59, 0x66, 0x91, 0x85, 0x97, 0xc9, 0xca, 0x89,
+ 0x0d, 0x04, 0x01, 0x82, 0xfc, 0x41, 0x02, 0x04, 0xe7, 0x54, 0x55, 0x3f, 0x86, 0x94, 0xad, 0xd5,
+ 0xd4, 0x79, 0x74, 0xd5, 0x79, 0x3f, 0x06, 0xf6, 0x0b, 0x95, 0x97, 0xf9, 0x85, 0xde, 0x7e, 0x44,
+ 0x07, 0x36, 0x71, 0xf0, 0x7d, 0x58, 0x73, 0x2d, 0x0c, 0x36, 0x7c, 0x0e, 0x83, 0xa5, 0x12, 0x9c,
+ 0xed, 0x43, 0x2f, 0x4d, 0x02, 0xef, 0xd0, 0x7b, 0x38, 0x8c, 0x7a, 0x69, 0xc2, 0xee, 0xc3, 0xa4,
+ 0xe0, 0x4a, 0x64, 0x65, 0x9a, 0x04, 0x3d, 0xc2, 0xd6, 0x30, 0x63, 0x30, 0xc8, 0xf8, 0x85, 0x08,
+ 0xfa, 0x87, 0xde, 0xc3, 0x69, 0x44, 0xe7, 0xf0, 0x5f, 0x7d, 0x18, 0x3d, 0xe1, 0x17, 0x42, 0xb5,
+ 0xaf, 0x9a, 0xd2, 0x55, 0x8e, 0xbd, 0xd7, 0xb0, 0xb3, 0xbb, 0x30, 0xe4, 0x32, 0xe5, 0xda, 0xde,
+ 0x61, 0x00, 0xf6, 0x2e, 0xcc, 0x75, 0xc6, 0x0b, 0x7d, 0x96, 0x97, 0x71, 0xa5, 0x64, 0x30, 0x20,
+ 0xe2, 0xcc, 0xe1, 0x5e, 0x28, 0x89, 0x97, 0x95, 0x57, 0x85, 0x08, 0x86, 0x24, 0x13, 0x9d, 0x11,
+ 0xc7, 0x93, 0x44, 0x05, 0x23, 0xf3, 0x00, 0x9e, 0xd9, 0x7f, 0xc3, 0x54, 0xe6, 0xd9, 0x36, 0x2d,
+ 0xab, 0x44, 0x04, 0xe3, 0x43, 0xef, 0x61, 0x2f, 0x6a, 0x10, 0xa8, 0x9d, 0xe4, 0xa5, 0x21, 0x4e,
+ 0x88, 0x58, 0xc3, 0x28, 0xda, 0xa9, 0xcc, 0x73, 0x15, 0x4c, 0xe9, 0x09, 0x03, 0xe0, 0x1b, 0xaa,
+ 0xd4, 0x45, 0x00, 0xe6, 0x0d, 0x3c, 0x93, 0xa2, 0x45, 0x30, 0xb3, 0x8a, 0x16, 0xc8, 0x53, 0xe4,
+ 0xaa, 0x0c, 0xe6, 0x46, 0x36, 0x3c, 0xe3, 0x4b, 0x95, 0x16, 0x8a, 0x0c, 0xb0, 0x20, 0xce, 0x1a,
+ 0x36, 0x36, 0xd6, 0xfa, 0x8b, 0x5c, 0x25, 0xc1, 0xbe, 0xa1, 0x39, 0x18, 0xa5, 0x58, 0x2b, 0x9e,
+ 0x25, 0xc1, 0x2d, 0x63, 0x20, 0x02, 0xf0, 0x0b, 0x25, 0xb4, 0x50, 0x97, 0x22, 0x09, 0x7c, 0xf3,
+ 0x85, 0x83, 0xd9, 0xdb, 0x00, 0xa9, 0x8e, 0x55, 0x95, 0x65, 0x69, 0xb6, 0x0d, 0x6e, 0x1f, 0x7a,
+ 0x0f, 0x27, 0xd1, 0x34, 0xd5, 0x91, 0x41, 0x20, 0x59, 0x55, 0x59, 0x2c, 0x32, 0xbe, 0x96, 0x22,
+ 0x60, 0x86, 0xac, 0xaa, 0xec, 0x19, 0x21, 0xd8, 0x3d, 0x98, 0x20, 0x99, 0x6c, 0x7b, 0x87, 0xe4,
+ 0x1f, 0xab, 0x2a, 0x3b, 0x41, 0xf3, 0x86, 0xb0, 0x40, 0x12, 0x3d, 0xa3, 0xe2, 0x34, 0x09, 0xee,
+ 0x1a, 0xb7, 0xa8, 0x2a, 0x3b, 0x26, 0xdc, 0x2a, 0x09, 0x37, 0x70, 0xdb, 0x78, 0x7f, 0x99, 0x25,
+ 0x27, 0x5c, 0x9f, 0xaf, 0xb2, 0xd3, 0x9c, 0x3d, 0x84, 0xd1, 0x86, 0x90, 0x14, 0x0c, 0xb3, 0xc7,
+ 0xfe, 0x47, 0x75, 0x48, 0x1a, 0xe6, 0xc8, 0xd2, 0xd9, 0x03, 0x18, 0x96, 0x5c, 0x9f, 0xeb, 0xa0,
+ 0x77, 0xd8, 0x7f, 0x38, 0x7b, 0xbc, 0xdf, 0x30, 0xe2, 0x65, 0x91, 0x21, 0x86, 0x5f, 0x7b, 0x30,
+ 0x40, 0x98, 0xbd, 0x01, 0x23, 0xc4, 0xd4, 0x51, 0x66, 0x21, 0x34, 0x0f, 0x9e, 0x5a, 0xd1, 0x56,
+ 0xc3, 0xec, 0x2d, 0x98, 0x6e, 0x94, 0xe0, 0xa5, 0x88, 0x79, 0x69, 0xa3, 0x6e, 0x62, 0x10, 0xcb,
+ 0xb2, 0x45, 0x5c, 0x5f, 0xd9, 0xa8, 0xb3, 0xc4, 0x4f, 0xaf, 0x90, 0x58, 0x15, 0x89, 0xfd, 0x72,
+ 0x68, 0x7d, 0x48, 0x88, 0x65, 0x89, 0xa2, 0x58, 0x93, 0x8e, 0xc8, 0xa4, 0x16, 0x42, 0x7b, 0xa6,
+ 0x3a, 0xe6, 0x92, 0xab, 0x0b, 0x0a, 0xbf, 0x49, 0x34, 0x4e, 0xf5, 0x12, 0x41, 0x24, 0x25, 0x42,
+ 0xc6, 0xa7, 0x92, 0x6f, 0x29, 0xf8, 0x26, 0xd1, 0x38, 0x11, 0xf2, 0xb9, 0xe4, 0xdb, 0xf0, 0x04,
+ 0x66, 0xa8, 0xe0, 0x71, 0x62, 0x0c, 0x18, 0xc2, 0x00, 0xe5, 0xb7, 0xe6, 0xdb, 0xb5, 0x0a, 0xd1,
+ 0xd8, 0xbb, 0x30, 0xd0, 0x49, 0x6d, 0xb9, 0x45, 0xc3, 0x73, 0x9c, 0x9c, 0x47, 0x44, 0x0a, 0x7f,
+ 0x08, 0x23, 0x04, 0xaa, 0x8c, 0xfd, 0x17, 0x8c, 0xd2, 0x62, 0x13, 0xd7, 0x86, 0x1b, 0xa6, 0xc5,
+ 0x66, 0x95, 0xa0, 0x44, 0x3a, 0x39, 0x37, 0xce, 0x37, 0x76, 0x1b, 0xeb, 0xe4, 0x1c, 0x9d, 0x1f,
+ 0xbe, 0x04, 0xb0, 0x12, 0xe1, 0xf7, 0xaf, 0x23, 0xd0, 0x83, 0x8e, 0x40, 0x7e, 0x57, 0xa0, 0x2a,
+ 0xb3, 0x32, 0xfd, 0xad, 0x07, 0x60, 0x82, 0x80, 0x3c, 0xba, 0x5b, 0x33, 0xd0, 0x21, 0x44, 0x8d,
+ 0x6d, 0xfd, 0x41, 0x87, 0x10, 0x62, 0x95, 0xb0, 0x37, 0x61, 0x8c, 0x2f, 0x21, 0xa9, 0xdf, 0xf8,
+ 0x7f, 0x95, 0xb0, 0x0f, 0x61, 0x5a, 0xa6, 0x17, 0x22, 0x56, 0x95, 0x14, 0xc1, 0x60, 0xf7, 0xfd,
+ 0xa7, 0xfc, 0xea, 0x49, 0x29, 0xa3, 0x09, 0xb2, 0x44, 0x95, 0x14, 0x94, 0x12, 0x82, 0x6f, 0x4a,
+ 0xc3, 0x6f, 0x3c, 0x3b, 0x25, 0x0c, 0x91, 0xdf, 0x85, 0xb9, 0x21, 0x27, 0xe2, 0x32, 0xdd, 0x08,
+ 0x5b, 0x5e, 0x66, 0x84, 0x7b, 0x4a, 0xa8, 0x8e, 0x2b, 0xc7, 0x1d, 0x57, 0xb2, 0x77, 0x60, 0x66,
+ 0xa3, 0xa6, 0xe5, 0x68, 0x30, 0x28, 0x62, 0x68, 0x22, 0x67, 0xda, 0x89, 0x1c, 0x06, 0x03, 0x8d,
+ 0x55, 0x04, 0x4c, 0x15, 0xc1, 0x33, 0x6a, 0x9c, 0xea, 0xf8, 0xb4, 0x92, 0x92, 0xca, 0xcd, 0x24,
+ 0x1a, 0xa5, 0xfa, 0x79, 0x25, 0x25, 0x3b, 0x84, 0xb9, 0x4c, 0xb3, 0xf3, 0xd8, 0xd9, 0x63, 0x4e,
+ 0x32, 0x02, 0xe2, 0x28, 0x0d, 0x93, 0xf0, 0x67, 0xb0, 0x6f, 0xed, 0x9c, 0x5e, 0x08, 0x54, 0xf4,
+ 0xb5, 0xea, 0xf3, 0x5b, 0x6d, 0x4b, 0xda, 0x6c, 0x71, 0x76, 0x0b, 0x3f, 0x87, 0x91, 0xb1, 0x25,
+ 0xf3, 0xa1, 0x9f, 0xf0, 0x2b, 0xdb, 0x36, 0xf0, 0xc8, 0x1e, 0x03, 0x98, 0x0f, 0x79, 0xb6, 0x15,
+ 0x36, 0x06, 0xee, 0xb4, 0xe2, 0x04, 0xef, 0x40, 0x52, 0x44, 0xf7, 0xd3, 0x31, 0xfc, 0x18, 0xa6,
+ 0x35, 0x1e, 0x0b, 0x9f, 0x2e, 0xb9, 0x2a, 0x5d, 0x84, 0x12, 0x80, 0x0f, 0x89, 0xcc, 0x45, 0x02,
+ 0x1e, 0xc3, 0x97, 0x30, 0x3e, 0xca, 0xe5, 0xd5, 0x36, 0xcf, 0x5e, 0x4b, 0xa1, 0xf7, 0x61, 0x54,
+ 0xe4, 0x69, 0x56, 0x62, 0xc7, 0x41, 0x99, 0x6e, 0x35, 0x32, 0x1d, 0x21, 0x3e, 0xb2, 0xe4, 0x70,
+ 0x53, 0xdb, 0x8b, 0xeb, 0xf3, 0xa5, 0xda, 0xea, 0x6e, 0x2c, 0x7a, 0x3b, 0xb1, 0xf8, 0x09, 0x4c,
+ 0xc9, 0xf6, 0x5c, 0x6d, 0x5d, 0xc8, 0xbf, 0xd9, 0x4d, 0x8b, 0x1f, 0xab, 0xbc, 0x2a, 0xf0, 0x22,
+ 0x53, 0x8c, 0xf0, 0x14, 0x5e, 0xc2, 0xa2, 0x43, 0x6a, 0x87, 0xb4, 0xd7, 0x09, 0xe9, 0x4f, 0x60,
+ 0xb6, 0x45, 0x2e, 0xf2, 0x84, 0xbe, 0x6e, 0x50, 0xba, 0x02, 0xbd, 0x12, 0xc1, 0xd6, 0x1d, 0x75,
+ 0x2b, 0xb6, 0xfa, 0xed, 0xd8, 0x0a, 0xff, 0xe8, 0xc1, 0xb4, 0xfe, 0x02, 0xa3, 0xd7, 0xdc, 0x5d,
+ 0xbf, 0x3a, 0x26, 0x78, 0x45, 0xcd, 0xc4, 0x90, 0x4a, 0xf1, 0x65, 0x69, 0x0d, 0x39, 0x25, 0xcc,
+ 0x89, 0xf8, 0xb2, 0xc4, 0xe0, 0xa6, 0xd2, 0x16, 0x4b, 0x71, 0x29, 0x24, 0x3d, 0x32, 0x8c, 0x80,
+ 0x50, 0x9f, 0x21, 0x06, 0x0b, 0xba, 0x11, 0x78, 0xb0, 0x5b, 0xd0, 0x49, 0x56, 0x43, 0xa4, 0xba,
+ 0x23, 0xca, 0xb8, 0x6e, 0xe8, 0x58, 0x77, 0x44, 0x49, 0x4d, 0xe7, 0x7f, 0x60, 0x91, 0x88, 0x53,
+ 0x91, 0x6d, 0x44, 0xac, 0x4b, 0x5e, 0xba, 0xf2, 0x3a, 0xb7, 0xc8, 0x63, 0xc4, 0x85, 0xff, 0xe8,
+ 0xc1, 0x20, 0xba, 0x29, 0xa4, 0x1f, 0xc0, 0xbe, 0x75, 0x99, 0xb3, 0xaa, 0x51, 0x61, 0xbe, 0xa9,
+ 0x5d, 0xbb, 0xda, 0x29, 0x32, 0xfd, 0x1d, 0xc7, 0xbe, 0x0d, 0x50, 0x98, 0xf8, 0x42, 0xaa, 0xe9,
+ 0x09, 0x53, 0x8b, 0x59, 0x25, 0x58, 0x49, 0xb1, 0x64, 0xa6, 0x89, 0x15, 0x7c, 0xa8, 0x13, 0xbc,
+ 0x32, 0x84, 0x05, 0xa2, 0xb9, 0xda, 0xc6, 0x66, 0xbe, 0xb1, 0x45, 0x43, 0x27, 0xe8, 0xf8, 0x25,
+ 0x4d, 0x39, 0xf7, 0x61, 0x92, 0x17, 0x42, 0xf1, 0x32, 0x57, 0x54, 0x34, 0xa6, 0x51, 0x0d, 0xa3,
+ 0xda, 0xee, 0x6c, 0xcc, 0x32, 0x31, 0x72, 0x3b, 0xa4, 0x6b, 0xc8, 0xee, 0x91, 0x4b, 0x2e, 0x2b,
+ 0x53, 0x40, 0xea, 0x47, 0x5e, 0x22, 0xea, 0xc6, 0x2a, 0x42, 0x8d, 0x5c, 0x8a, 0xf8, 0x8b, 0xb4,
+ 0x3c, 0x8b, 0x0b, 0x25, 0xec, 0xe8, 0x32, 0x43, 0xe4, 0xcf, 0xd3, 0xf2, 0xec, 0x48, 0x75, 0x63,
+ 0x62, 0xde, 0x89, 0x89, 0xf0, 0xf7, 0x3d, 0xe8, 0x1f, 0x27, 0xd7, 0x6b, 0x75, 0xd3, 0x54, 0x7a,
+ 0xaf, 0x6a, 0x2a, 0xfd, 0x4e, 0x53, 0x71, 0x24, 0x4a, 0xd2, 0x41, 0x4d, 0xfa, 0x1c, 0xf3, 0xf4,
+ 0x01, 0x0c, 0x28, 0x95, 0x86, 0x37, 0x74, 0x8f, 0xa5, 0xda, 0x46, 0x44, 0x45, 0xed, 0xd2, 0x4d,
+ 0x9e, 0xb9, 0x89, 0x0f, 0xcf, 0x58, 0x22, 0x70, 0x66, 0x34, 0x16, 0xc5, 0x23, 0x46, 0xa9, 0xed,
+ 0xea, 0x58, 0x6b, 0xac, 0x29, 0xc1, 0xa0, 0xb0, 0xe0, 0xb4, 0x6a, 0x34, 0x31, 0x18, 0x33, 0xda,
+ 0x1a, 0x4d, 0x0c, 0x9d, 0xb9, 0x00, 0x76, 0xe6, 0x82, 0x26, 0xc9, 0x66, 0xbb, 0xad, 0xbf, 0x6e,
+ 0x0a, 0x66, 0x14, 0xac, 0xfb, 0x7b, 0x5e, 0xf7, 0x77, 0x0a, 0x5b, 0x3b, 0xc7, 0xac, 0x76, 0x93,
+ 0xbe, 0xb9, 0xb9, 0xd7, 0xb9, 0xf9, 0xff, 0xc9, 0x6e, 0x94, 0xe2, 0xb6, 0x8c, 0xdd, 0xdd, 0x69,
+ 0xaf, 0x52, 0x1c, 0x8b, 0x32, 0xaa, 0xb9, 0xc2, 0x0a, 0xa0, 0xc1, 0x53, 0x6d, 0x4d, 0x9a, 0xe7,
+ 0x6c, 0xcc, 0xde, 0x05, 0xe3, 0xb1, 0xae, 0xfb, 0xde, 0x77, 0x19, 0x6c, 0x1e, 0xba, 0x7d, 0xed,
+ 0x21, 0x97, 0xc4, 0x2e, 0xd2, 0x06, 0x4d, 0xa4, 0x85, 0xbf, 0x84, 0xb1, 0xd3, 0x71, 0x37, 0x5a,
+ 0xae, 0x65, 0x48, 0xef, 0xbb, 0x33, 0xa4, 0xbf, 0x93, 0x21, 0xd7, 0x82, 0x7f, 0x70, 0x2d, 0xf8,
+ 0xc3, 0xbf, 0x7b, 0x34, 0xf1, 0x2c, 0xd5, 0xb6, 0x59, 0x34, 0xbc, 0xf6, 0xa2, 0x71, 0x53, 0x87,
+ 0x70, 0x9b, 0x85, 0xdd, 0x6a, 0xdc, 0x66, 0x71, 0x51, 0x69, 0xa3, 0xdb, 0x24, 0xa2, 0x33, 0xe2,
+ 0xaa, 0x2c, 0x75, 0x93, 0x20, 0x9d, 0xf1, 0x15, 0xd3, 0xf0, 0x4c, 0x40, 0x1a, 0xc0, 0xd6, 0x30,
+ 0x5e, 0xc9, 0xd2, 0x8a, 0x6a, 0x62, 0x73, 0x6e, 0x91, 0x26, 0x51, 0xff, 0x17, 0x7c, 0xc7, 0x54,
+ 0xeb, 0x6c, 0x22, 0xf5, 0x96, 0xc5, 0xff, 0xd4, 0xa9, 0xee, 0x2c, 0x3d, 0x6d, 0x59, 0xfa, 0xd7,
+ 0x1e, 0xdc, 0x7a, 0xba, 0x7e, 0x72, 0x86, 0x0f, 0xfe, 0x44, 0x68, 0xcd, 0xb7, 0x82, 0x7d, 0x80,
+ 0xd3, 0x34, 0x46, 0x0f, 0xea, 0xbc, 0xff, 0xf8, 0x8d, 0x76, 0x3f, 0x5a, 0x4b, 0x61, 0x98, 0x93,
+ 0xc8, 0x30, 0x59, 0x07, 0xf5, 0x6a, 0x07, 0x3d, 0x82, 0x11, 0xdf, 0x94, 0x69, 0x9e, 0x91, 0x25,
+ 0xf6, 0x1f, 0xb3, 0xd6, 0x04, 0xb5, 0x5e, 0x12, 0x25, 0xb2, 0x1c, 0x94, 0x87, 0xd9, 0x69, 0x6e,
+ 0x7d, 0x40, 0xe7, 0xf0, 0x9f, 0x1e, 0x2c, 0x4c, 0x07, 0x7d, 0x55, 0x7f, 0xfe, 0xce, 0xe1, 0xee,
+ 0x86, 0xe5, 0x92, 0x05, 0x30, 0xb6, 0x95, 0xd7, 0x95, 0x0b, 0x0b, 0xe2, 0x8c, 0x56, 0xaa, 0x74,
+ 0xbb, 0x15, 0x2a, 0x96, 0x69, 0xe6, 0xba, 0xc8, 0xcc, 0xe2, 0x3e, 0x4b, 0x33, 0xc1, 0xde, 0x83,
+ 0xfd, 0x24, 0x55, 0x82, 0x04, 0x36, 0x4c, 0xc6, 0x49, 0x8b, 0x1a, 0x4b, 0x6c, 0xce, 0xfd, 0xe3,
+ 0x96, 0xfb, 0xaf, 0x35, 0xa1, 0x09, 0x59, 0xbe, 0xdb, 0x84, 0x7e, 0xeb, 0xc1, 0xe2, 0x65, 0x9a,
+ 0x88, 0xbc, 0xe4, 0x85, 0xa0, 0xb1, 0xfd, 0x3e, 0x4c, 0x84, 0x7e, 0xca, 0x4b, 0x5e, 0x67, 0x5a,
+ 0x0d, 0x23, 0xcd, 0xa9, 0x7a, 0x4d, 0xf5, 0xa6, 0x1c, 0x74, 0xc7, 0x5a, 0x4c, 0xd0, 0x8b, 0xed,
+ 0xca, 0x74, 0xa1, 0x7e, 0x64, 0x00, 0xbc, 0xe9, 0x12, 0x9f, 0x7d, 0xa1, 0xa4, 0xdb, 0x4a, 0x1c,
+ 0x8c, 0x37, 0x51, 0x6e, 0x63, 0xff, 0xe9, 0xe3, 0x4d, 0x06, 0xea, 0x28, 0x69, 0xb7, 0xe7, 0xf0,
+ 0xdf, 0x3d, 0x98, 0x3d, 0xc9, 0x2f, 0x70, 0xbb, 0xa7, 0x51, 0x84, 0x96, 0xa8, 0xb5, 0x14, 0xf8,
+ 0xb5, 0x47, 0x5f, 0xd7, 0x30, 0x7b, 0x04, 0xfe, 0xc6, 0xb0, 0x9e, 0x9c, 0x29, 0xa1, 0xcf, 0x72,
+ 0x69, 0xb4, 0xe8, 0x45, 0xd7, 0xf0, 0xec, 0x10, 0x66, 0xa7, 0x7c, 0x23, 0x9e, 0x0b, 0x5e, 0x56,
+ 0xca, 0xf8, 0x73, 0x1e, 0xb5, 0x51, 0xa8, 0x97, 0xd9, 0xfa, 0x06, 0xf4, 0x8c, 0x01, 0x70, 0x73,
+ 0x2f, 0x95, 0x10, 0x9f, 0xe7, 0x89, 0x30, 0x6d, 0x60, 0x1a, 0x35, 0x08, 0xd2, 0x80, 0xaf, 0x9d,
+ 0x5e, 0x74, 0x66, 0x07, 0xd0, 0x1a, 0x3d, 0xac, 0x03, 0xdb, 0xc3, 0xc8, 0x01, 0x80, 0x16, 0x5c,
+ 0x6d, 0xce, 0x4e, 0x4c, 0x1b, 0xc0, 0x2f, 0x5b, 0x18, 0xa4, 0xa7, 0x59, 0x51, 0x99, 0x84, 0x74,
+ 0x5d, 0xa0, 0xc1, 0x20, 0x7d, 0x93, 0x4b, 0x69, 0x82, 0xc5, 0xb6, 0x81, 0x16, 0x86, 0xac, 0x9d,
+ 0x57, 0x6a, 0x53, 0x37, 0x02, 0x03, 0xb1, 0x07, 0xb0, 0xe0, 0x19, 0x97, 0x57, 0x6e, 0x4b, 0xb6,
+ 0x0d, 0xb5, 0x8b, 0x0c, 0xd7, 0x30, 0xb7, 0xe6, 0x7f, 0x76, 0x29, 0xb2, 0x92, 0xfd, 0x00, 0xa6,
+ 0x02, 0x0f, 0xd8, 0x29, 0x6d, 0x06, 0xdf, 0x6f, 0x2d, 0xce, 0x2d, 0x56, 0xe4, 0x88, 0x1a, 0x66,
+ 0x4a, 0x13, 0x7e, 0x25, 0x73, 0x6e, 0x9c, 0x32, 0x8f, 0x1c, 0x18, 0xfe, 0x02, 0xf6, 0x8f, 0x93,
+ 0x73, 0xf7, 0x2d, 0xdf, 0x9c, 0x5d, 0xcb, 0xc9, 0x00, 0x07, 0xd0, 0xb5, 0x14, 0x75, 0x46, 0x3a,
+ 0x90, 0x85, 0x30, 0xb7, 0xbe, 0x3d, 0xde, 0xe4, 0xd6, 0x91, 0xbd, 0xa8, 0x83, 0x0b, 0x23, 0xf0,
+ 0x9b, 0xfb, 0x23, 0xa1, 0x2b, 0x59, 0xb2, 0x1f, 0xc1, 0x62, 0xd3, 0x46, 0x50, 0x30, 0xcd, 0x1e,
+ 0x07, 0x9d, 0x46, 0xd2, 0x12, 0x29, 0xea, 0xb2, 0x87, 0xbf, 0xea, 0xc3, 0x94, 0xd4, 0x3c, 0xaa,
+ 0xf4, 0xd9, 0x6b, 0xcd, 0xf8, 0x6f, 0xdb, 0xdd, 0xc3, 0xec, 0x0f, 0x26, 0x87, 0x68, 0xcd, 0x38,
+ 0xa6, 0x1d, 0xe2, 0x1e, 0xd0, 0x0a, 0x13, 0xe3, 0x22, 0x61, 0xcb, 0x08, 0xc2, 0xcf, 0x32, 0x9a,
+ 0x17, 0x53, 0x1d, 0x6b, 0x5e, 0xa6, 0xfa, 0xf4, 0x2a, 0xe6, 0xd2, 0x64, 0xd4, 0x24, 0x9a, 0xa7,
+ 0xfa, 0xd8, 0x20, 0x97, 0x52, 0x62, 0xdd, 0xa2, 0xf9, 0x89, 0x66, 0xe2, 0x91, 0xfd, 0xfb, 0xa5,
+ 0x92, 0x82, 0x46, 0xe2, 0xa6, 0x67, 0x8f, 0x3b, 0x3d, 0xfb, 0x2d, 0x98, 0x9a, 0x0d, 0xad, 0x99,
+ 0xe6, 0x26, 0xb4, 0x9e, 0xa1, 0xc7, 0xde, 0x81, 0x19, 0x11, 0xed, 0x86, 0x39, 0x6d, 0xb6, 0x37,
+ 0xbb, 0x60, 0xfe, 0x1f, 0x4c, 0xd2, 0x22, 0x2e, 0x72, 0x55, 0xea, 0x00, 0x76, 0x3b, 0x3e, 0x1a,
+ 0x66, 0x55, 0x1c, 0xe5, 0xaa, 0x8c, 0xc6, 0x29, 0xfd, 0x6a, 0xf6, 0x1e, 0x0c, 0x2a, 0x25, 0x75,
+ 0x30, 0xdb, 0xed, 0xda, 0xc8, 0xfc, 0x42, 0xc9, 0x88, 0xc8, 0xec, 0x43, 0xd7, 0xdd, 0xe7, 0xbb,
+ 0x2b, 0x4b, 0x6d, 0xf2, 0x56, 0x8f, 0x0f, 0xbf, 0xf6, 0x60, 0xd1, 0x21, 0x5c, 0xf3, 0x07, 0xda,
+ 0x3e, 0x2f, 0xd2, 0x4d, 0xfb, 0x4f, 0x84, 0x29, 0x61, 0x48, 0x51, 0xdc, 0x27, 0x89, 0xcc, 0xd5,
+ 0xb6, 0xde, 0x27, 0x11, 0x81, 0x3d, 0xba, 0xdd, 0xee, 0x07, 0xdf, 0x37, 0x10, 0x0f, 0x6f, 0x18,
+ 0x88, 0xe9, 0xbf, 0x2d, 0x29, 0x6c, 0x97, 0x1d, 0xd9, 0x45, 0xbe, 0x92, 0xc2, 0xe4, 0x6f, 0x08,
+ 0x0b, 0x4a, 0x92, 0xb8, 0xa8, 0xf4, 0x19, 0xf6, 0x1c, 0x53, 0x22, 0x66, 0xc2, 0x69, 0xb4, 0x4a,
+ 0xc2, 0x17, 0x00, 0x8d, 0x39, 0x51, 0x5c, 0xf7, 0x77, 0x57, 0xe1, 0x4a, 0xb8, 0x41, 0xac, 0x9a,
+ 0xbf, 0xf9, 0x7a, 0xad, 0xbf, 0xf9, 0x5e, 0xb5, 0x70, 0x7d, 0x0c, 0x63, 0x6b, 0x78, 0x37, 0x9f,
+ 0x7a, 0xcd, 0x7c, 0xfa, 0x8a, 0x31, 0x2f, 0xfc, 0x9d, 0x67, 0x84, 0x59, 0x96, 0x25, 0xa6, 0xea,
+ 0x9b, 0x30, 0x76, 0x82, 0xdb, 0x31, 0xb1, 0x20, 0x99, 0x59, 0x08, 0xfd, 0x0d, 0xbf, 0xa0, 0x8f,
+ 0x6f, 0xfa, 0x73, 0x0d, 0x89, 0x6d, 0x4d, 0xea, 0x1d, 0xc7, 0x6a, 0x92, 0x60, 0xf8, 0x59, 0x62,
+ 0x6b, 0x14, 0x07, 0x83, 0xa2, 0x69, 0xfc, 0x1e, 0x4c, 0x64, 0xbe, 0xe1, 0x12, 0xcd, 0x60, 0x17,
+ 0x34, 0x82, 0x57, 0x05, 0x5e, 0x4c, 0xed, 0x86, 0xfe, 0xa8, 0x1d, 0x75, 0xfb, 0x4f, 0xf8, 0x67,
+ 0x0f, 0xee, 0x3c, 0xd3, 0x47, 0x42, 0xe9, 0x3c, 0x7b, 0xc2, 0x37, 0x67, 0x76, 0xe6, 0x60, 0x1f,
+ 0xd8, 0xfe, 0x63, 0xca, 0x5a, 0xab, 0x14, 0x3c, 0xd3, 0x2d, 0xb6, 0xc4, 0xb6, 0xdf, 0x7b, 0xb6,
+ 0x13, 0x99, 0x31, 0xa1, 0x5f, 0x17, 0x25, 0xb3, 0xba, 0x15, 0x74, 0x7b, 0x4b, 0x2d, 0x83, 0x58,
+ 0x51, 0x2d, 0x3b, 0xb5, 0x5d, 0xc7, 0xe6, 0xb9, 0x05, 0x5b, 0xb3, 0xcd, 0xf0, 0x7b, 0x67, 0x9b,
+ 0xee, 0x3f, 0x7b, 0x43, 0xe7, 0x9d, 0x47, 0x7f, 0xf5, 0x60, 0xde, 0x9e, 0xa3, 0xd8, 0x1c, 0x26,
+ 0x27, 0xb1, 0xb1, 0xb9, 0xbf, 0xc7, 0x7c, 0x98, 0x3b, 0x08, 0x47, 0x7d, 0xdf, 0x63, 0x77, 0xc1,
+ 0x6f, 0x63, 0xb0, 0xc9, 0xfa, 0x3d, 0x06, 0x30, 0x3a, 0x89, 0x89, 0xa3, 0xcf, 0x16, 0x30, 0x35,
+ 0xe7, 0xe3, 0xe4, 0xdc, 0x1f, 0xb0, 0xdb, 0xb0, 0xa8, 0x41, 0x4c, 0x36, 0x7f, 0xc8, 0xa6, 0x30,
+ 0x3c, 0x89, 0x91, 0x3a, 0x62, 0x77, 0xe0, 0x96, 0xbb, 0xce, 0x0e, 0x58, 0xfe, 0x98, 0xed, 0x03,
+ 0x9c, 0xc4, 0x27, 0xf6, 0x0f, 0x1a, 0x7f, 0x62, 0x64, 0x32, 0x2d, 0xc6, 0x9f, 0x1a, 0x99, 0x8e,
+ 0x72, 0x29, 0x9f, 0xe4, 0xd9, 0x69, 0xba, 0xf5, 0xc1, 0xbc, 0xfe, 0x3c, 0x95, 0xc2, 0x9f, 0x99,
+ 0xe7, 0xf0, 0x7c, 0x2c, 0xca, 0x32, 0xcd, 0xb6, 0xfe, 0xfc, 0xd1, 0x47, 0x30, 0x71, 0xf6, 0x40,
+ 0xd6, 0x55, 0xa6, 0x85, 0x2a, 0xfd, 0x3d, 0x3c, 0xbf, 0xa0, 0xed, 0xc8, 0xf7, 0xf0, 0xfc, 0x54,
+ 0x48, 0x51, 0x0a, 0xbf, 0xf7, 0x68, 0x09, 0xfe, 0x6e, 0x63, 0x62, 0xb7, 0x60, 0x16, 0x89, 0x55,
+ 0x96, 0x96, 0xe4, 0x59, 0x7f, 0x0f, 0x11, 0xe6, 0x63, 0x83, 0xf0, 0xd8, 0x0c, 0xc6, 0xf6, 0x2b,
+ 0xbf, 0xf7, 0xe8, 0x13, 0xd8, 0xef, 0x06, 0x81, 0xb1, 0xca, 0xd3, 0x35, 0xd9, 0xda, 0xdf, 0x33,
+ 0x7a, 0x5b, 0xd0, 0x44, 0x96, 0xef, 0x7d, 0x1a, 0xfc, 0xe1, 0x9b, 0x03, 0xef, 0xab, 0x6f, 0x0e,
+ 0xbc, 0xbf, 0x7c, 0x73, 0xe0, 0xfd, 0xe6, 0xdb, 0x83, 0xbd, 0xaf, 0xbe, 0x3d, 0xd8, 0xfb, 0xd3,
+ 0xb7, 0x07, 0x7b, 0xeb, 0x11, 0x79, 0xf6, 0xe3, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xf9, 0xfd,
+ 0xf0, 0x88, 0x07, 0x19, 0x00, 0x00,
}
func (m *Area) Marshal() (dAtA []byte, err error) {
@@ -4582,22 +4590,10 @@
}
}
if len(m.AlarmLevel) > 0 {
- dAtA5 := make([]byte, len(m.AlarmLevel)*10)
- var j4 int
- for _, num1 := range m.AlarmLevel {
- num := uint64(num1)
- for num >= 1<<7 {
- dAtA5[j4] = uint8(uint64(num)&0x7f | 0x80)
- num >>= 7
- j4++
- }
- dAtA5[j4] = uint8(num)
- j4++
- }
dAtA[i] = 0x3a
i++
- i = encodeVarintProtomsg(dAtA, i, uint64(j4))
- i += copy(dAtA[i:], dAtA5[:j4])
+ i = encodeVarintProtomsg(dAtA, i, uint64(len(m.AlarmLevel)))
+ i += copy(dAtA[i:], m.AlarmLevel)
}
if len(m.SearchTime) > 0 {
for _, s := range m.SearchTime {
@@ -5014,11 +5010,11 @@
dAtA[i] = 0x12
i++
i = encodeVarintProtomsg(dAtA, i, uint64(m.Cam.Size()))
- n6, err6 := m.Cam.MarshalTo(dAtA[i:])
- if err6 != nil {
- return 0, err6
+ n4, err4 := m.Cam.MarshalTo(dAtA[i:])
+ if err4 != nil {
+ return 0, err4
}
- i += n6
+ i += n4
}
if len(m.ServerId) > 0 {
dAtA[i] = 0x1a
@@ -5901,12 +5897,9 @@
n += 1 + l + sovProtomsg(uint64(l))
}
}
- if len(m.AlarmLevel) > 0 {
- l = 0
- for _, e := range m.AlarmLevel {
- l += sovProtomsg(uint64(e))
- }
- n += 1 + sovProtomsg(uint64(l)) + l
+ l = len(m.AlarmLevel)
+ if l > 0 {
+ n += 1 + l + sovProtomsg(uint64(l))
}
if len(m.SearchTime) > 0 {
for _, s := range m.SearchTime {
@@ -6182,14 +6175,7 @@
}
func sovProtomsg(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozProtomsg(x uint64) (n int) {
return sovProtomsg(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -11581,81 +11567,37 @@
m.Tabs = append(m.Tabs, string(dAtA[iNdEx:postIndex]))
iNdEx = postIndex
case 7:
- if wireType == 0 {
- var v int32
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowProtomsg
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- v |= int32(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- m.AlarmLevel = append(m.AlarmLevel, v)
- } else if wireType == 2 {
- var packedLen int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowProtomsg
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- packedLen |= int(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if packedLen < 0 {
- return ErrInvalidLengthProtomsg
- }
- postIndex := iNdEx + packedLen
- if postIndex < 0 {
- return ErrInvalidLengthProtomsg
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- var elementCount int
- var count int
- for _, integer := range dAtA[iNdEx:postIndex] {
- if integer < 128 {
- count++
- }
- }
- elementCount = count
- if elementCount != 0 && len(m.AlarmLevel) == 0 {
- m.AlarmLevel = make([]int32, 0, elementCount)
- }
- for iNdEx < postIndex {
- var v int32
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowProtomsg
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- v |= int32(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- m.AlarmLevel = append(m.AlarmLevel, v)
- }
- } else {
+ if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field AlarmLevel", 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.AlarmLevel = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
case 8:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field SearchTime", wireType)
--
Gitblit v1.8.0