From 7b44351cb40bc5c5497c5d1b3df0efb7b0acd385 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 24 八月 2019 16:09:57 +0800
Subject: [PATCH] fix alarmlevel type
---
protomsg.proto | 3
protomsg.pb.go | 398 +++++++++++++++++++++++++++++++-------------------------
2 files changed, 224 insertions(+), 177 deletions(-)
diff --git a/protomsg.pb.go b/protomsg.pb.go
index 188bc89..c4213aa 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -2084,7 +2084,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 []string `protobuf:"bytes,7,rep,name=alarmLevel,proto3" json:"alarmLevel,omitempty"`
+ AlarmLevel []int32 `protobuf:"varint,7,rep,packed,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"`
@@ -2167,7 +2167,7 @@
return nil
}
-func (m *CompareArgs) GetAlarmLevel() []string {
+func (m *CompareArgs) GetAlarmLevel() []int32 {
if m != nil {
return m.AlarmLevel
}
@@ -2774,14 +2774,14 @@
func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
var fileDescriptor_32de24555f916688 = []byte{
- // 2406 bytes of a gzipped FileDescriptorProto
+ // 2407 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0xcd, 0x6e, 0x1c, 0xc7,
0xf1, 0xe7, 0xec, 0xf7, 0xd4, 0x7e, 0x68, 0x35, 0xd2, 0xdf, 0x1e, 0xcb, 0x7f, 0xd3, 0xd4, 0x44,
0x86, 0x19, 0xc1, 0x56, 0x02, 0x4a, 0xa7, 0x1c, 0x02, 0xd0, 0x24, 0x15, 0x2c, 0xe0, 0x28, 0xcc,
0x90, 0x52, 0x6e, 0x19, 0xf4, 0xee, 0x34, 0x97, 0x03, 0x36, 0x67, 0x06, 0xdd, 0x33, 0xb4, 0x79,
0xc8, 0x03, 0xe4, 0x94, 0xbc, 0x42, 0xde, 0x24, 0xc8, 0x29, 0x87, 0x1c, 0x7c, 0x4c, 0x4e, 0x0e,
0x24, 0x20, 0x08, 0x10, 0xe4, 0x11, 0x12, 0x04, 0x55, 0xdd, 0x3d, 0x1f, 0x4b, 0xca, 0xd6, 0x69,
- 0xbb, 0x7e, 0x55, 0xdb, 0x5d, 0x5d, 0xdf, 0x3d, 0x30, 0xcb, 0x65, 0x56, 0x64, 0x97, 0x6a, 0xfd,
+ 0xbb, 0x7e, 0x55, 0xd3, 0x5d, 0x5d, 0xdf, 0xbd, 0x30, 0xcb, 0x65, 0x56, 0x64, 0x97, 0x6a, 0xfd,
0x84, 0x16, 0xde, 0xc8, 0xd2, 0x0f, 0x60, 0xc9, 0x14, 0xd7, 0x68, 0xf0, 0x1c, 0x7a, 0xfb, 0x92,
0x33, 0x6f, 0x06, 0x9d, 0x24, 0xf6, 0x9d, 0x1d, 0x67, 0xb7, 0x1f, 0x76, 0x92, 0xd8, 0x7b, 0x00,
0xa3, 0x9c, 0x49, 0x9e, 0x16, 0x49, 0xec, 0x77, 0x08, 0xad, 0x68, 0xcf, 0x83, 0x5e, 0xca, 0x2e,
@@ -2795,137 +2795,137 @@
0x53, 0x64, 0xa1, 0x72, 0x1f, 0xf4, 0x29, 0xb8, 0xa6, 0xab, 0xe6, 0xfe, 0xd8, 0x5c, 0x35, 0x47,
0x99, 0x3c, 0x93, 0x85, 0x3f, 0xd1, 0xda, 0xe1, 0x1a, 0xf7, 0x2c, 0x15, 0x97, 0x64, 0x82, 0x29,
0x49, 0x56, 0xb4, 0xb6, 0xb2, 0x52, 0x5f, 0x65, 0x32, 0xf6, 0x67, 0x9a, 0x67, 0x69, 0x34, 0xd1,
- 0x52, 0xb2, 0x34, 0xf6, 0xef, 0x68, 0x13, 0x11, 0x81, 0xff, 0x90, 0x5c, 0x71, 0x79, 0xc5, 0x63,
- 0x7f, 0xae, 0xff, 0x61, 0x69, 0xef, 0x23, 0x80, 0x44, 0x45, 0xb2, 0x4c, 0xd3, 0x24, 0x5d, 0xfb,
- 0x77, 0x77, 0x9c, 0xdd, 0x51, 0xe8, 0x26, 0x2a, 0xd4, 0x00, 0xb2, 0x65, 0x99, 0x46, 0x3c, 0x65,
- 0x4b, 0xc1, 0x7d, 0x4f, 0xb3, 0x65, 0x99, 0x1e, 0x11, 0xe0, 0x7d, 0x00, 0x23, 0x64, 0x93, 0x75,
- 0xef, 0x91, 0xfe, 0x43, 0x59, 0xa6, 0xa7, 0x68, 0xe0, 0x00, 0xa6, 0xc8, 0xa2, 0x63, 0x64, 0x94,
- 0xc4, 0xfe, 0x7d, 0xed, 0x18, 0x59, 0xa6, 0x27, 0x84, 0x2d, 0xe2, 0x60, 0x05, 0x77, 0xb5, 0xff,
- 0xf7, 0xd3, 0xf8, 0x94, 0xa9, 0x8b, 0x45, 0x7a, 0x96, 0x79, 0xbb, 0x30, 0x58, 0x11, 0x48, 0xe1,
- 0x30, 0xde, 0x9b, 0x3f, 0xa9, 0x82, 0x52, 0x0b, 0x87, 0x86, 0xef, 0x3d, 0x82, 0x7e, 0xc1, 0xd4,
- 0x85, 0xf2, 0x3b, 0x3b, 0xdd, 0xdd, 0xf1, 0xde, 0xac, 0x16, 0xc4, 0xcd, 0x42, 0xcd, 0x0c, 0xbe,
- 0x75, 0xa0, 0x87, 0x34, 0xba, 0x17, 0x91, 0x2a, 0xce, 0x0c, 0x85, 0xe6, 0xc1, 0x55, 0x23, 0xde,
- 0x2a, 0xda, 0xfb, 0x10, 0xdc, 0x95, 0xe4, 0xac, 0xe0, 0x11, 0x2b, 0x4c, 0xdc, 0x8d, 0x34, 0xb0,
- 0x5f, 0x34, 0x98, 0xcb, 0x6b, 0x13, 0x77, 0x86, 0xf9, 0xc5, 0x35, 0x32, 0xcb, 0x3c, 0x36, 0xff,
- 0xec, 0x1b, 0x1f, 0x12, 0xb0, 0x5f, 0xa0, 0x2a, 0xc6, 0xa4, 0x03, 0x32, 0xa9, 0xa1, 0xd0, 0x9e,
- 0x89, 0x8a, 0x98, 0x60, 0xf2, 0x92, 0x62, 0x70, 0x14, 0x0e, 0x13, 0xb5, 0x8f, 0x24, 0xb2, 0x62,
- 0x2e, 0xa2, 0x33, 0xc1, 0xd6, 0x14, 0x83, 0xa3, 0x70, 0x18, 0x73, 0xf1, 0x5c, 0xb0, 0x75, 0x70,
- 0x0a, 0x63, 0xbc, 0xe0, 0x49, 0xac, 0x0d, 0x18, 0x40, 0x0f, 0xf5, 0x37, 0xe6, 0xdb, 0xb4, 0x0a,
- 0xf1, 0xbc, 0x87, 0xd0, 0x53, 0x71, 0x65, 0xb9, 0x69, 0x2d, 0x73, 0x12, 0x5f, 0x84, 0xc4, 0x0a,
- 0x7e, 0x02, 0x03, 0x24, 0xca, 0xd4, 0xfb, 0x3f, 0x18, 0x24, 0xf9, 0x2a, 0xaa, 0x0c, 0xd7, 0x4f,
- 0xf2, 0xd5, 0x22, 0x46, 0x8d, 0x54, 0x7c, 0xa1, 0x9d, 0xaf, 0xed, 0x36, 0x54, 0xf1, 0x05, 0x3a,
- 0x3f, 0x78, 0x05, 0x60, 0x34, 0xc2, 0xff, 0xbf, 0x8b, 0x42, 0x8f, 0x5a, 0x0a, 0xcd, 0xdb, 0x0a,
- 0x95, 0xa9, 0xd1, 0xe9, 0x1f, 0x1d, 0x00, 0x1d, 0x04, 0xe4, 0xd1, 0xcd, 0xaa, 0x81, 0x0e, 0x21,
- 0x6e, 0x64, 0x2a, 0x10, 0x3a, 0x84, 0x80, 0x45, 0xec, 0xbd, 0x0f, 0x43, 0x3c, 0x09, 0x59, 0xdd,
- 0xda, 0xff, 0x8b, 0xd8, 0xfb, 0x1c, 0xdc, 0x22, 0xb9, 0xe4, 0x91, 0x2c, 0x05, 0xf7, 0x7b, 0x9b,
- 0xe7, 0x1f, 0xb2, 0xeb, 0x83, 0x42, 0x84, 0x23, 0x14, 0x09, 0x4b, 0xc1, 0x29, 0x25, 0x38, 0x5b,
- 0x15, 0x5a, 0x5e, 0x7b, 0xd6, 0x25, 0x84, 0xd8, 0x0f, 0x61, 0xa2, 0xd9, 0x31, 0xbf, 0x4a, 0x56,
- 0xdc, 0x14, 0x98, 0x31, 0x61, 0x87, 0x04, 0xb5, 0x5c, 0x39, 0x6c, 0xb9, 0xd2, 0xfb, 0x18, 0xc6,
- 0x26, 0x6a, 0x1a, 0x8e, 0x06, 0x0d, 0x91, 0x40, 0x1d, 0x39, 0x6e, 0x2b, 0x72, 0x3c, 0xe8, 0x29,
- 0xac, 0x22, 0xa0, 0xab, 0x08, 0xae, 0xf1, 0xc6, 0x89, 0x8a, 0xce, 0x4a, 0x21, 0xa8, 0xdc, 0x8c,
- 0xc2, 0x41, 0xa2, 0x9e, 0x97, 0x42, 0x78, 0x3b, 0x30, 0x11, 0x49, 0x7a, 0x11, 0x59, 0x7b, 0x4c,
- 0x48, 0x47, 0x40, 0x8c, 0xd2, 0x30, 0x0e, 0x7e, 0x09, 0x33, 0x63, 0xe7, 0xe4, 0x92, 0xe3, 0x45,
- 0xdf, 0xa9, 0x42, 0x7f, 0xd8, 0xb4, 0xa4, 0xc9, 0x16, 0x6b, 0xb7, 0xe0, 0x05, 0x0c, 0xb4, 0x2d,
- 0xbd, 0x39, 0x74, 0x63, 0x76, 0x6d, 0x1a, 0x07, 0x2e, 0xbd, 0x3d, 0x00, 0xfd, 0x47, 0x96, 0xae,
- 0xb9, 0x89, 0x81, 0x7b, 0x8d, 0x38, 0xc1, 0x3d, 0x90, 0x15, 0xd2, 0xfe, 0xb4, 0x0c, 0x9e, 0x82,
- 0x5b, 0xe1, 0x58, 0xf8, 0x54, 0xc1, 0x64, 0x61, 0x23, 0x94, 0x08, 0x3c, 0x88, 0xa7, 0x36, 0x12,
- 0x70, 0x19, 0xbc, 0x82, 0xe1, 0x71, 0x26, 0xae, 0xd7, 0x59, 0xfa, 0x4e, 0x17, 0xfa, 0x14, 0x06,
- 0x79, 0x96, 0xa4, 0x05, 0xf6, 0x1c, 0xd4, 0xe9, 0x4e, 0xad, 0xd3, 0x31, 0xe2, 0xa1, 0x61, 0x07,
- 0xab, 0xca, 0x5e, 0x4c, 0x5d, 0xec, 0xcb, 0xb5, 0x6a, 0xc7, 0xa2, 0xb3, 0x11, 0x8b, 0xcf, 0xc0,
- 0x25, 0xdb, 0x33, 0xb9, 0xb6, 0x21, 0xff, 0x7e, 0x3b, 0x2d, 0x7e, 0x26, 0xb3, 0x32, 0xc7, 0x8d,
- 0x74, 0x31, 0xc2, 0x55, 0x70, 0x05, 0xd3, 0x16, 0xab, 0x19, 0xd2, 0x4e, 0x2b, 0xa4, 0x9f, 0xc1,
- 0x78, 0x8d, 0x52, 0xe4, 0x09, 0x75, 0xd3, 0xa0, 0xb4, 0x05, 0x7a, 0x25, 0x84, 0xb5, 0x5d, 0xaa,
- 0x46, 0x6c, 0x75, 0x9b, 0xb1, 0x15, 0xfc, 0xc5, 0x01, 0xb7, 0xfa, 0x07, 0x46, 0xaf, 0xde, 0xbb,
- 0x3a, 0x75, 0x48, 0xf4, 0x82, 0x9a, 0x89, 0x66, 0x15, 0xfc, 0xeb, 0xc2, 0x18, 0xd2, 0x25, 0xe4,
- 0x94, 0x7f, 0x5d, 0x60, 0x70, 0x53, 0x69, 0x8b, 0x04, 0xbf, 0xe2, 0x82, 0x0e, 0xe9, 0x87, 0x40,
- 0xd0, 0x97, 0x88, 0x60, 0x41, 0xd7, 0x0a, 0xf7, 0x36, 0x0b, 0x3a, 0xe9, 0xaa, 0x99, 0x54, 0x77,
- 0x78, 0x11, 0x55, 0x2d, 0x1d, 0xeb, 0x0e, 0x2f, 0xa8, 0xe9, 0xfc, 0x00, 0xa6, 0x31, 0x3f, 0xe3,
- 0xe9, 0x8a, 0x47, 0xaa, 0x60, 0x85, 0x2d, 0xaf, 0x13, 0x03, 0x9e, 0x20, 0x16, 0xfc, 0xab, 0x03,
- 0xbd, 0xf0, 0xb6, 0x90, 0x7e, 0x04, 0x33, 0xe3, 0x32, 0x6b, 0x55, 0x7d, 0x85, 0xc9, 0xaa, 0x72,
- 0xed, 0x62, 0xa3, 0xc8, 0x74, 0x37, 0x1c, 0xfb, 0x11, 0x40, 0xae, 0xe3, 0x0b, 0xb9, 0xba, 0x27,
- 0xb8, 0x06, 0x59, 0xc4, 0x58, 0x49, 0xb1, 0x64, 0x26, 0xb1, 0x51, 0xbc, 0xaf, 0x62, 0xdc, 0x32,
- 0x80, 0x29, 0xc2, 0x4c, 0xae, 0x23, 0x3d, 0xe1, 0x98, 0xa2, 0xa1, 0x62, 0x74, 0xfc, 0x3e, 0xcd,
- 0x39, 0x0f, 0x60, 0x94, 0xe5, 0x5c, 0xb2, 0x22, 0x93, 0x54, 0x34, 0xdc, 0xb0, 0xa2, 0xf1, 0xda,
- 0x76, 0xad, 0xcd, 0x32, 0xd2, 0x7a, 0x5b, 0xd0, 0x36, 0x64, 0x7b, 0xc8, 0x15, 0x13, 0xa5, 0x2e,
- 0x20, 0xd5, 0x21, 0xaf, 0x10, 0xba, 0xb5, 0x8a, 0x50, 0x23, 0x17, 0x3c, 0xfa, 0x2a, 0x29, 0xce,
- 0xa3, 0x5c, 0x72, 0x33, 0xba, 0x8c, 0x11, 0xfc, 0x55, 0x52, 0x9c, 0x1f, 0xcb, 0x76, 0x4c, 0x4c,
- 0x5a, 0x31, 0x11, 0xfc, 0xb1, 0x03, 0xdd, 0x93, 0xf8, 0x66, 0xad, 0xae, 0x9b, 0x4a, 0xe7, 0x6d,
- 0x4d, 0xa5, 0xdb, 0x6a, 0x2a, 0x96, 0x45, 0x49, 0xda, 0xab, 0x58, 0x2f, 0x30, 0x4f, 0x1f, 0x41,
- 0x8f, 0x52, 0xa9, 0x7f, 0x4b, 0xf7, 0xd8, 0x97, 0xeb, 0x90, 0xb8, 0x78, 0xbb, 0x64, 0x95, 0xa5,
- 0x76, 0xe6, 0xc3, 0x35, 0x96, 0x08, 0x9c, 0x1a, 0xb5, 0x45, 0x71, 0x89, 0x51, 0x6a, 0xba, 0x3a,
- 0xd6, 0x1a, 0x63, 0x4a, 0xd0, 0x10, 0x16, 0x9c, 0x46, 0x8d, 0x26, 0x01, 0x6d, 0x46, 0x53, 0xa3,
- 0x49, 0xa0, 0x35, 0x17, 0xc0, 0xc6, 0x5c, 0x50, 0x27, 0xd9, 0x78, 0xb3, 0xf5, 0x57, 0x4d, 0x41,
- 0x8f, 0x82, 0x55, 0x7f, 0xcf, 0xaa, 0xfe, 0x4e, 0x61, 0x6b, 0xe6, 0x98, 0xc5, 0x66, 0xd2, 0xd7,
- 0x3b, 0x77, 0x5a, 0x3b, 0xff, 0x98, 0xec, 0x46, 0x29, 0x6e, 0xca, 0xd8, 0xfd, 0x8d, 0xf6, 0x2a,
- 0xf8, 0x09, 0x2f, 0xc2, 0x4a, 0x2a, 0x28, 0x01, 0x6a, 0x9c, 0x6a, 0x6b, 0x5c, 0x1f, 0x67, 0x62,
- 0xf6, 0x3e, 0x68, 0x8f, 0xb5, 0xdd, 0xf7, 0xa9, 0xcd, 0x60, 0x7d, 0xd0, 0xdd, 0x1b, 0x07, 0xd9,
- 0x24, 0xb6, 0x91, 0xd6, 0xab, 0x23, 0x2d, 0xf8, 0x0d, 0x0c, 0xed, 0x1d, 0x37, 0xa3, 0xe5, 0x46,
- 0x86, 0x74, 0xbe, 0x3b, 0x43, 0xba, 0x1b, 0x19, 0x72, 0x23, 0xf8, 0x7b, 0x37, 0x82, 0x3f, 0xf8,
- 0xa7, 0x43, 0x13, 0xcf, 0xbe, 0x5c, 0xd7, 0x4f, 0x0d, 0xa7, 0xf9, 0xd4, 0xb8, 0xad, 0x43, 0xd8,
- 0xb7, 0x85, 0x79, 0xd7, 0xd8, 0xb7, 0xc5, 0x65, 0xa9, 0xf4, 0xdd, 0x46, 0x21, 0xad, 0x11, 0x2b,
- 0xd3, 0xc4, 0x4e, 0x82, 0xb4, 0xc6, 0x53, 0x74, 0xc3, 0xd3, 0x01, 0xa9, 0x09, 0x53, 0xc3, 0x58,
- 0x29, 0x0a, 0xa3, 0xaa, 0x8e, 0xcd, 0x89, 0x01, 0x75, 0xa2, 0xfe, 0x10, 0xe6, 0x56, 0xa8, 0xba,
- 0xb3, 0x8e, 0xd4, 0x3b, 0x06, 0xff, 0x85, 0xbd, 0xba, 0xb5, 0xb4, 0xdb, 0xb0, 0xf4, 0xef, 0x1c,
- 0xb8, 0x73, 0xb8, 0x3c, 0x38, 0xc7, 0x03, 0x7f, 0xce, 0x95, 0x62, 0x6b, 0xee, 0x7d, 0x86, 0xd3,
- 0x34, 0x46, 0x0f, 0xde, 0x79, 0xb6, 0xf7, 0x5e, 0xb3, 0x1f, 0x2d, 0x05, 0xd7, 0xc2, 0x71, 0xa8,
- 0x85, 0x8c, 0x83, 0x3a, 0x95, 0x83, 0x1e, 0xc3, 0x80, 0xad, 0x8a, 0x24, 0x4b, 0xc9, 0x12, 0xb3,
- 0x3d, 0xaf, 0x31, 0x41, 0x2d, 0xf7, 0x89, 0x13, 0x1a, 0x09, 0xca, 0xc3, 0xf4, 0x2c, 0x33, 0x3e,
- 0xa0, 0x75, 0xf0, 0x6f, 0x07, 0xa6, 0xba, 0x83, 0xbe, 0xad, 0x3f, 0x7f, 0xe7, 0x70, 0x77, 0xcb,
- 0xf3, 0xd2, 0xf3, 0x61, 0x68, 0x2a, 0xaf, 0x2d, 0x17, 0x86, 0xc4, 0x19, 0xad, 0x90, 0xc9, 0x7a,
- 0xcd, 0x65, 0x24, 0x92, 0xd4, 0x76, 0x91, 0xb1, 0xc1, 0xbe, 0x4c, 0x52, 0xee, 0x7d, 0x02, 0xb3,
- 0x38, 0x91, 0x9c, 0x14, 0xd6, 0x42, 0xda, 0x49, 0xd3, 0x0a, 0x25, 0x31, 0xeb, 0xfe, 0x61, 0xc3,
- 0xfd, 0x37, 0x9a, 0xd0, 0x88, 0x2c, 0xdf, 0x6e, 0x42, 0x7f, 0x70, 0x60, 0xfa, 0x2a, 0x89, 0x79,
- 0x56, 0xb0, 0x9c, 0xd3, 0xd8, 0xfe, 0x00, 0x46, 0x5c, 0x1d, 0xb2, 0x82, 0x55, 0x99, 0x56, 0xd1,
- 0xc8, 0xb3, 0x57, 0xbd, 0x71, 0xf5, 0xba, 0x1c, 0xb4, 0xc7, 0x5a, 0x4c, 0xd0, 0xcb, 0xf5, 0x42,
- 0x77, 0xa1, 0x6e, 0xa8, 0x09, 0x94, 0xa6, 0xfc, 0xd5, 0xb5, 0xd2, 0x0d, 0x0d, 0x55, 0x5d, 0x64,
- 0x50, 0xbf, 0x91, 0x83, 0xff, 0x74, 0x60, 0x7c, 0x90, 0x5d, 0xe2, 0x1b, 0x9e, 0xc6, 0x0d, 0x7a,
- 0x28, 0x2d, 0x05, 0xc7, 0x7f, 0x3b, 0xf4, 0xef, 0x8a, 0xf6, 0x1e, 0xc3, 0x7c, 0xa5, 0x45, 0x4f,
- 0xcf, 0x25, 0x57, 0xe7, 0x99, 0xd0, 0x9a, 0x76, 0xc2, 0x1b, 0xb8, 0xb7, 0x03, 0xe3, 0x33, 0xb6,
- 0xe2, 0xcf, 0x39, 0x2b, 0x4a, 0xa9, 0x7d, 0x36, 0x09, 0x9b, 0x10, 0xea, 0xae, 0x5f, 0x76, 0x3d,
- 0x3a, 0x46, 0x13, 0xf8, 0x0e, 0x2f, 0x24, 0xe7, 0x2f, 0xb2, 0x98, 0x5b, 0xf5, 0x6b, 0x80, 0x6e,
- 0xc0, 0x96, 0xd8, 0x3b, 0xbb, 0xe4, 0x0a, 0xb6, 0x54, 0xde, 0x36, 0x34, 0xc6, 0x0b, 0x7f, 0x48,
- 0x9c, 0xe6, 0xc0, 0xb1, 0x0d, 0xa0, 0x38, 0x93, 0xab, 0xf3, 0x53, 0x5d, 0xea, 0x89, 0x5f, 0x23,
- 0xc8, 0x4f, 0xd2, 0xbc, 0xd4, 0x49, 0x67, 0x2b, 0x7d, 0x8d, 0x20, 0x7f, 0x95, 0x09, 0xa1, 0x03,
- 0xc2, 0x94, 0xfa, 0x06, 0x42, 0xd6, 0xce, 0x4a, 0xb9, 0xaa, 0x8a, 0xbd, 0xa6, 0xbc, 0x47, 0x30,
- 0x65, 0x29, 0x13, 0xd7, 0xf6, 0x25, 0x6c, 0x9a, 0x66, 0x1b, 0x0c, 0x7e, 0x0d, 0xb3, 0x93, 0xf8,
- 0xc2, 0x78, 0xe0, 0x88, 0xad, 0xce, 0x6f, 0xe4, 0x84, 0x8f, 0x03, 0xe0, 0x52, 0xf0, 0x2a, 0x23,
- 0x2c, 0xe9, 0x05, 0x30, 0x31, 0x76, 0x3f, 0x59, 0x65, 0xc6, 0xc8, 0x9d, 0xb0, 0x85, 0x05, 0x21,
- 0xcc, 0xeb, 0xfd, 0x43, 0xae, 0x4a, 0x51, 0x78, 0x3f, 0x85, 0xe9, 0xaa, 0x09, 0x90, 0xa3, 0xc7,
- 0x7b, 0x7e, 0xab, 0x90, 0x37, 0x54, 0x0a, 0xdb, 0xe2, 0xc1, 0x6f, 0xbb, 0xe0, 0x1e, 0x5d, 0xf1,
- 0xb4, 0x38, 0x2e, 0xd5, 0xf9, 0x3b, 0xcd, 0xd8, 0x1f, 0x99, 0xd9, 0x5f, 0xcf, 0xef, 0x3a, 0x86,
- 0x69, 0xcc, 0x3f, 0xa1, 0x19, 0xfe, 0x03, 0xa0, 0x27, 0x44, 0x84, 0x83, 0xbc, 0x49, 0x63, 0xa4,
- 0x8f, 0x52, 0x9a, 0xd7, 0x12, 0x15, 0x29, 0x56, 0x24, 0xea, 0xec, 0x3a, 0x62, 0x42, 0x50, 0x22,
- 0x8f, 0xc2, 0x49, 0xa2, 0x4e, 0x34, 0xb8, 0x2f, 0x04, 0xd6, 0x0d, 0x9a, 0x5f, 0x68, 0x26, 0x1d,
- 0x98, 0xcf, 0x1f, 0xa5, 0xe0, 0x34, 0x92, 0xd6, 0x3d, 0x73, 0xd8, 0xea, 0x99, 0x1f, 0x82, 0xab,
- 0x5f, 0x48, 0xf5, 0x34, 0x35, 0xa2, 0xe7, 0x11, 0x26, 0xf8, 0xc7, 0x30, 0x26, 0xa6, 0x79, 0xe1,
- 0xb9, 0xf5, 0xeb, 0xc9, 0x3c, 0xf0, 0x7e, 0x04, 0xa3, 0x24, 0x8f, 0xf2, 0x4c, 0x16, 0xca, 0x87,
- 0xcd, 0x8e, 0x8b, 0x86, 0x59, 0xe4, 0xc7, 0x99, 0x2c, 0xc2, 0x61, 0x42, 0xbf, 0xca, 0xfb, 0x04,
- 0x7a, 0xa5, 0x14, 0xca, 0x1f, 0x6f, 0x76, 0x4d, 0x14, 0x7e, 0x29, 0x45, 0x48, 0x6c, 0xef, 0x73,
- 0xdb, 0x5d, 0x27, 0x9b, 0x4f, 0x86, 0xca, 0xe4, 0x8d, 0x1e, 0x1b, 0x7c, 0xeb, 0xc0, 0xb4, 0xc5,
- 0xb8, 0xe1, 0x0f, 0xb4, 0x7d, 0x96, 0x27, 0xab, 0xe6, 0x23, 0xde, 0x25, 0x84, 0x2e, 0x8a, 0xef,
- 0x39, 0x62, 0x33, 0xb9, 0xae, 0xde, 0x73, 0x08, 0x60, 0x8f, 0x6c, 0xb6, 0xdb, 0xde, 0xf7, 0x0d,
- 0xa4, 0xfd, 0x5b, 0x06, 0x52, 0xfa, 0xb6, 0x24, 0xb8, 0xe9, 0x72, 0x03, 0xf3, 0x90, 0x2e, 0x05,
- 0xd7, 0xb9, 0x15, 0xc0, 0x94, 0xa3, 0xf2, 0x51, 0x5e, 0xaa, 0xf3, 0xc8, 0x7c, 0x94, 0x73, 0xc3,
- 0x31, 0xb7, 0x37, 0x5a, 0xc4, 0xc1, 0x4b, 0x80, 0xda, 0x9c, 0xa8, 0xae, 0xfd, 0xdc, 0x94, 0xdb,
- 0x12, 0xaa, 0x81, 0x45, 0xfd, 0x99, 0xad, 0xd3, 0xf8, 0xcc, 0xf6, 0xb6, 0x07, 0xcf, 0x53, 0x18,
- 0x1a, 0xc3, 0xdb, 0xf9, 0xd0, 0xa9, 0xe7, 0xc3, 0xb7, 0x8c, 0x59, 0xc1, 0xdf, 0x1c, 0xb8, 0x77,
- 0xa4, 0x8e, 0xb9, 0x54, 0x59, 0x7a, 0xc0, 0x56, 0xe7, 0xa6, 0x63, 0x7a, 0x9f, 0x99, 0xca, 0xaa,
- 0xdb, 0x6a, 0x23, 0x91, 0x8e, 0x54, 0x43, 0x2c, 0x36, 0xcd, 0xe3, 0x03, 0x53, 0x63, 0x75, 0x93,
- 0xeb, 0x56, 0x29, 0xad, 0x1f, 0x1e, 0x39, 0xed, 0xde, 0x78, 0x78, 0x68, 0x60, 0x41, 0x95, 0xe0,
- 0xcc, 0xd4, 0x53, 0x93, 0x25, 0x86, 0x6c, 0x74, 0xe6, 0xfe, 0xf7, 0x76, 0xe6, 0xf6, 0x77, 0xa9,
- 0xbe, 0xbd, 0xdb, 0xe3, 0x3f, 0x39, 0x30, 0x69, 0x4e, 0x01, 0xde, 0x04, 0x46, 0xa7, 0x91, 0xee,
- 0xd7, 0xf3, 0x2d, 0x6f, 0x0e, 0x13, 0x4b, 0xe1, 0xa0, 0x3a, 0x77, 0xbc, 0xfb, 0x30, 0x6f, 0x22,
- 0xd8, 0x3e, 0xe6, 0x1d, 0x0f, 0x60, 0x70, 0x1a, 0x91, 0x44, 0xd7, 0x9b, 0x82, 0xab, 0xd7, 0x27,
- 0xf1, 0xc5, 0xbc, 0xe7, 0xdd, 0x85, 0x69, 0x45, 0x62, 0xa8, 0xce, 0xfb, 0x9e, 0x0b, 0xfd, 0xd3,
- 0x08, 0xb9, 0x03, 0xef, 0x1e, 0xdc, 0xb1, 0xdb, 0x99, 0xf1, 0x60, 0x3e, 0xf4, 0x66, 0x00, 0xa7,
- 0xd1, 0xa9, 0xf9, 0xbc, 0x30, 0x1f, 0x69, 0x9d, 0x74, 0xf1, 0x9c, 0xbb, 0x5a, 0xa7, 0xe3, 0x4c,
- 0x88, 0x83, 0x2c, 0x3d, 0x4b, 0xd6, 0x73, 0x78, 0xfc, 0x04, 0x46, 0xf6, 0xc2, 0xa8, 0xc9, 0x22,
- 0x55, 0x5c, 0x16, 0xf3, 0x2d, 0x5c, 0xbf, 0xa4, 0xe1, 0x7d, 0xee, 0xe0, 0xfa, 0x90, 0x0b, 0x5e,
- 0xf0, 0x79, 0xe7, 0xf1, 0x33, 0x98, 0xb5, 0x5d, 0xa4, 0x75, 0x3e, 0x5c, 0x92, 0x25, 0xe6, 0x5b,
- 0x5a, 0x2b, 0x43, 0x6a, 0xbf, 0xcf, 0x9d, 0x2f, 0xfc, 0x3f, 0xbf, 0xde, 0x76, 0xbe, 0x79, 0xbd,
- 0xed, 0xfc, 0xfd, 0xf5, 0xb6, 0xf3, 0xfb, 0x37, 0xdb, 0x5b, 0xdf, 0xbc, 0xd9, 0xde, 0xfa, 0xeb,
- 0x9b, 0xed, 0xad, 0xe5, 0x80, 0xec, 0xfe, 0xf4, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x4b,
- 0x19, 0x2d, 0x65, 0x17, 0x00, 0x00,
+ 0x52, 0xb2, 0x34, 0xf6, 0xef, 0x68, 0x13, 0x11, 0x81, 0x5f, 0x48, 0xae, 0xb8, 0xbc, 0xe2, 0xb1,
+ 0x3f, 0xd7, 0x5f, 0x58, 0xda, 0xfb, 0x08, 0x20, 0x51, 0x91, 0x2c, 0xd3, 0x34, 0x49, 0xd7, 0xfe,
+ 0xdd, 0x1d, 0x67, 0x77, 0x14, 0xba, 0x89, 0x0a, 0x35, 0x80, 0x6c, 0x59, 0xa6, 0x11, 0x4f, 0xd9,
+ 0x52, 0x70, 0xdf, 0xd3, 0x6c, 0x59, 0xa6, 0x47, 0x04, 0x78, 0x1f, 0xc0, 0x08, 0xd9, 0x64, 0xdd,
+ 0x7b, 0xa4, 0xff, 0x50, 0x96, 0xe9, 0x29, 0x1a, 0x38, 0x80, 0x29, 0xb2, 0xe8, 0x18, 0x19, 0x25,
+ 0xb1, 0x7f, 0x5f, 0x3b, 0x46, 0x96, 0xe9, 0x09, 0x61, 0x8b, 0x38, 0x58, 0xc1, 0x5d, 0xed, 0xff,
+ 0xfd, 0x34, 0x3e, 0x65, 0xea, 0x62, 0x91, 0x9e, 0x65, 0xde, 0x2e, 0x0c, 0x56, 0x04, 0x52, 0x38,
+ 0x8c, 0xf7, 0xe6, 0x4f, 0xaa, 0xa0, 0xd4, 0xc2, 0xa1, 0xe1, 0x7b, 0x8f, 0xa0, 0x5f, 0x30, 0x75,
+ 0xa1, 0xfc, 0xce, 0x4e, 0x77, 0x77, 0xbc, 0x37, 0xab, 0x05, 0x71, 0xb3, 0x50, 0x33, 0x83, 0x6f,
+ 0x1d, 0xe8, 0x21, 0x8d, 0xee, 0x45, 0xa4, 0x8a, 0x33, 0x43, 0xa1, 0x79, 0x70, 0xd5, 0x88, 0xb7,
+ 0x8a, 0xf6, 0x3e, 0x04, 0x77, 0x25, 0x39, 0x2b, 0x78, 0xc4, 0x0a, 0x13, 0x77, 0x23, 0x0d, 0xec,
+ 0x17, 0x0d, 0xe6, 0xf2, 0xda, 0xc4, 0x9d, 0x61, 0x7e, 0x71, 0x8d, 0xcc, 0x32, 0x8f, 0xcd, 0x97,
+ 0x7d, 0xe3, 0x43, 0x02, 0xf6, 0x0b, 0x54, 0xc5, 0x98, 0x74, 0x40, 0x26, 0x35, 0x14, 0xda, 0x33,
+ 0x51, 0x11, 0x13, 0x4c, 0x5e, 0x52, 0x0c, 0x8e, 0xc2, 0x61, 0xa2, 0xf6, 0x91, 0x44, 0x56, 0xcc,
+ 0x45, 0x74, 0x26, 0xd8, 0x9a, 0x62, 0x70, 0x14, 0x0e, 0x63, 0x2e, 0x9e, 0x0b, 0xb6, 0x0e, 0x4e,
+ 0x61, 0x8c, 0x17, 0x3c, 0x89, 0xb5, 0x01, 0x03, 0xe8, 0xa1, 0xfe, 0xc6, 0x7c, 0x9b, 0x56, 0x21,
+ 0x9e, 0xf7, 0x10, 0x7a, 0x2a, 0xae, 0x2c, 0x37, 0xad, 0x65, 0x4e, 0xe2, 0x8b, 0x90, 0x58, 0xc1,
+ 0x4f, 0x60, 0x80, 0x44, 0x99, 0x7a, 0xff, 0x07, 0x83, 0x24, 0x5f, 0x45, 0x95, 0xe1, 0xfa, 0x49,
+ 0xbe, 0x5a, 0xc4, 0xa8, 0x91, 0x8a, 0x2f, 0xb4, 0xf3, 0xb5, 0xdd, 0x86, 0x2a, 0xbe, 0x40, 0xe7,
+ 0x07, 0xaf, 0x00, 0x8c, 0x46, 0xf8, 0xfd, 0xbb, 0x28, 0xf4, 0xa8, 0xa5, 0xd0, 0xbc, 0xad, 0x50,
+ 0x99, 0x1a, 0x9d, 0xfe, 0xd1, 0x01, 0xd0, 0x41, 0x40, 0x1e, 0xdd, 0xac, 0x1a, 0xe8, 0x10, 0xe2,
+ 0x46, 0xa6, 0x02, 0xa1, 0x43, 0x08, 0x58, 0xc4, 0xde, 0xfb, 0x30, 0xc4, 0x93, 0x90, 0xd5, 0xad,
+ 0xfd, 0xbf, 0x88, 0xbd, 0xcf, 0xc1, 0x2d, 0x92, 0x4b, 0x1e, 0xc9, 0x52, 0x70, 0xbf, 0xb7, 0x79,
+ 0xfe, 0x21, 0xbb, 0x3e, 0x28, 0x44, 0x38, 0x42, 0x91, 0xb0, 0x14, 0x9c, 0x52, 0x82, 0xb3, 0x55,
+ 0xa1, 0xe5, 0xb5, 0x67, 0x5d, 0x42, 0x88, 0xfd, 0x10, 0x26, 0x9a, 0x1d, 0xf3, 0xab, 0x64, 0xc5,
+ 0x4d, 0x81, 0x19, 0x13, 0x76, 0x48, 0x50, 0xcb, 0x95, 0xc3, 0x96, 0x2b, 0xbd, 0x8f, 0x61, 0x6c,
+ 0xa2, 0xa6, 0xe1, 0x68, 0xd0, 0x10, 0x09, 0xd4, 0x91, 0xe3, 0xb6, 0x22, 0xc7, 0x83, 0x9e, 0xc2,
+ 0x2a, 0x02, 0xba, 0x8a, 0xe0, 0x1a, 0x6f, 0x9c, 0xa8, 0xe8, 0xac, 0x14, 0x82, 0xca, 0xcd, 0x28,
+ 0x1c, 0x24, 0xea, 0x79, 0x29, 0x84, 0xb7, 0x03, 0x13, 0x91, 0xa4, 0x17, 0x91, 0xb5, 0xc7, 0x84,
+ 0x74, 0x04, 0xc4, 0x28, 0x0d, 0xe3, 0xe0, 0x97, 0x30, 0x33, 0x76, 0x4e, 0x2e, 0x39, 0x5e, 0xf4,
+ 0x9d, 0x2a, 0xf4, 0x87, 0x4d, 0x4b, 0x9a, 0x6c, 0xb1, 0x76, 0x0b, 0x5e, 0xc0, 0x40, 0xdb, 0xd2,
+ 0x9b, 0x43, 0x37, 0x66, 0xd7, 0xa6, 0x71, 0xe0, 0xd2, 0xdb, 0x03, 0xd0, 0x1f, 0xb2, 0x74, 0xcd,
+ 0x4d, 0x0c, 0xdc, 0x6b, 0xc4, 0x09, 0xee, 0x81, 0xac, 0x90, 0xf6, 0xa7, 0x65, 0xf0, 0x14, 0xdc,
+ 0x0a, 0xc7, 0xc2, 0xa7, 0x0a, 0x26, 0x0b, 0x1b, 0xa1, 0x44, 0xe0, 0x41, 0x3c, 0xb5, 0x91, 0x80,
+ 0xcb, 0xe0, 0x15, 0x0c, 0x8f, 0x33, 0x71, 0xbd, 0xce, 0xd2, 0x77, 0xba, 0xd0, 0xa7, 0x30, 0xc8,
+ 0xb3, 0x24, 0x2d, 0xb0, 0xe7, 0xa0, 0x4e, 0x77, 0x6a, 0x9d, 0x8e, 0x11, 0x0f, 0x0d, 0x3b, 0x58,
+ 0x55, 0xf6, 0x62, 0xea, 0x62, 0x5f, 0xae, 0x55, 0x3b, 0x16, 0x9d, 0x8d, 0x58, 0x7c, 0x06, 0x2e,
+ 0xd9, 0x9e, 0xc9, 0xb5, 0x0d, 0xf9, 0xf7, 0xdb, 0x69, 0xf1, 0x33, 0x99, 0x95, 0x39, 0x6e, 0xa4,
+ 0x8b, 0x11, 0xae, 0x82, 0x2b, 0x98, 0xb6, 0x58, 0xcd, 0x90, 0x76, 0x5a, 0x21, 0xfd, 0x0c, 0xc6,
+ 0x6b, 0x94, 0x22, 0x4f, 0xa8, 0x9b, 0x06, 0xa5, 0x2d, 0xd0, 0x2b, 0x21, 0xac, 0xed, 0x52, 0x35,
+ 0x62, 0xab, 0xdb, 0x8c, 0xad, 0xe0, 0x2f, 0x0e, 0xb8, 0xd5, 0x17, 0x18, 0xbd, 0x7a, 0xef, 0xea,
+ 0xd4, 0x21, 0xd1, 0x0b, 0x6a, 0x26, 0x9a, 0x55, 0xf0, 0xaf, 0x0b, 0x63, 0x48, 0x97, 0x90, 0x53,
+ 0xfe, 0x75, 0x81, 0xc1, 0x4d, 0xa5, 0x2d, 0x12, 0xfc, 0x8a, 0x0b, 0x3a, 0xa4, 0x1f, 0x02, 0x41,
+ 0x5f, 0x22, 0x82, 0x05, 0x5d, 0x2b, 0xdc, 0xdb, 0x2c, 0xe8, 0xa4, 0xab, 0x66, 0x52, 0xdd, 0xe1,
+ 0x45, 0x54, 0xb5, 0x74, 0xac, 0x3b, 0xbc, 0xa0, 0xa6, 0xf3, 0x03, 0x98, 0xc6, 0xfc, 0x8c, 0xa7,
+ 0x2b, 0x1e, 0xa9, 0x82, 0x15, 0xb6, 0xbc, 0x4e, 0x0c, 0x78, 0x82, 0x58, 0xf0, 0xaf, 0x0e, 0xf4,
+ 0xc2, 0xdb, 0x42, 0xfa, 0x11, 0xcc, 0x8c, 0xcb, 0xac, 0x55, 0xf5, 0x15, 0x26, 0xab, 0xca, 0xb5,
+ 0x8b, 0x8d, 0x22, 0xd3, 0xdd, 0x70, 0xec, 0x47, 0x00, 0xb9, 0x8e, 0x2f, 0xe4, 0xea, 0x9e, 0xe0,
+ 0x1a, 0x64, 0x11, 0x63, 0x25, 0xc5, 0x92, 0x99, 0xc4, 0x46, 0xf1, 0xbe, 0x8a, 0x71, 0xcb, 0x00,
+ 0xa6, 0x08, 0x33, 0xb9, 0x8e, 0xf4, 0x84, 0x63, 0x8a, 0x86, 0x8a, 0xd1, 0xf1, 0xfb, 0x34, 0xe7,
+ 0x3c, 0x80, 0x51, 0x96, 0x73, 0xc9, 0x8a, 0x4c, 0x52, 0xd1, 0x70, 0xc3, 0x8a, 0xc6, 0x6b, 0xdb,
+ 0xb5, 0x36, 0xcb, 0x48, 0xeb, 0x6d, 0x41, 0xdb, 0x90, 0xed, 0x21, 0x57, 0x4c, 0x94, 0xba, 0x80,
+ 0x54, 0x87, 0xbc, 0x42, 0xe8, 0xd6, 0x2a, 0x42, 0x8d, 0x5c, 0xf0, 0xe8, 0xab, 0xa4, 0x38, 0x8f,
+ 0x72, 0xc9, 0xcd, 0xe8, 0x32, 0x46, 0xf0, 0x57, 0x49, 0x71, 0x7e, 0x2c, 0xdb, 0x31, 0x31, 0x69,
+ 0xc5, 0x44, 0xf0, 0xc7, 0x0e, 0x74, 0x4f, 0xe2, 0x9b, 0xb5, 0xba, 0x6e, 0x2a, 0x9d, 0xb7, 0x35,
+ 0x95, 0x6e, 0xab, 0xa9, 0x58, 0x16, 0x25, 0x69, 0xaf, 0x62, 0xbd, 0xc0, 0x3c, 0x7d, 0x04, 0x3d,
+ 0x4a, 0xa5, 0xfe, 0x2d, 0xdd, 0x63, 0x5f, 0xae, 0x43, 0xe2, 0xe2, 0xed, 0x92, 0x55, 0x96, 0xda,
+ 0x99, 0x0f, 0xd7, 0x58, 0x22, 0x70, 0x6a, 0xd4, 0x16, 0xc5, 0x25, 0x46, 0xa9, 0xe9, 0xea, 0x58,
+ 0x6b, 0x8c, 0x29, 0x41, 0x43, 0x58, 0x70, 0x1a, 0x35, 0x9a, 0x04, 0xb4, 0x19, 0x4d, 0x8d, 0x26,
+ 0x81, 0xd6, 0x5c, 0x00, 0x1b, 0x73, 0x41, 0x9d, 0x64, 0xe3, 0xcd, 0xd6, 0x5f, 0x35, 0x05, 0x3d,
+ 0x0a, 0x56, 0xfd, 0x3d, 0xab, 0xfa, 0x3b, 0x85, 0xad, 0x99, 0x63, 0x16, 0x9b, 0x49, 0x5f, 0xef,
+ 0xdc, 0x69, 0xed, 0xfc, 0x63, 0xb2, 0x1b, 0xa5, 0xb8, 0x29, 0x63, 0xf7, 0x37, 0xda, 0xab, 0xe0,
+ 0x27, 0xbc, 0x08, 0x2b, 0xa9, 0xa0, 0x04, 0xa8, 0x71, 0xaa, 0xad, 0x71, 0x7d, 0x9c, 0x89, 0xd9,
+ 0xfb, 0xa0, 0x3d, 0xd6, 0x76, 0xdf, 0xa7, 0x36, 0x83, 0xf5, 0x41, 0x77, 0x6f, 0x1c, 0x64, 0x93,
+ 0xd8, 0x46, 0x5a, 0xaf, 0x8e, 0xb4, 0xe0, 0x37, 0x30, 0xb4, 0x77, 0xdc, 0x8c, 0x96, 0x1b, 0x19,
+ 0xd2, 0xf9, 0xee, 0x0c, 0xe9, 0x6e, 0x64, 0xc8, 0x8d, 0xe0, 0xef, 0xdd, 0x08, 0xfe, 0xe0, 0x9f,
+ 0x0e, 0x4d, 0x3c, 0xfb, 0x72, 0x5d, 0x3f, 0x35, 0x9c, 0xe6, 0x53, 0xe3, 0xb6, 0x0e, 0x61, 0xdf,
+ 0x16, 0xe6, 0x5d, 0x63, 0xdf, 0x16, 0x97, 0xa5, 0xd2, 0x77, 0x1b, 0x85, 0xb4, 0x46, 0xac, 0x4c,
+ 0x13, 0x3b, 0x09, 0xd2, 0x1a, 0x4f, 0xd1, 0x0d, 0x4f, 0x07, 0xa4, 0x26, 0x4c, 0x0d, 0x63, 0xa5,
+ 0x28, 0x8c, 0xaa, 0x3a, 0x36, 0x27, 0x06, 0xd4, 0x89, 0xfa, 0x43, 0x98, 0x5b, 0xa1, 0xea, 0xce,
+ 0x3a, 0x52, 0xef, 0x18, 0xfc, 0x17, 0xf6, 0xea, 0xd6, 0xd2, 0x6e, 0xc3, 0xd2, 0xbf, 0x73, 0xe0,
+ 0xce, 0xe1, 0xf2, 0xe0, 0x1c, 0x0f, 0xfc, 0x39, 0x57, 0x8a, 0xad, 0xb9, 0xf7, 0x19, 0x4e, 0xd3,
+ 0x18, 0x3d, 0x78, 0xe7, 0xd9, 0xde, 0x7b, 0xcd, 0x7e, 0xb4, 0x14, 0x5c, 0x0b, 0xc7, 0xa1, 0x16,
+ 0x32, 0x0e, 0xea, 0x54, 0x0e, 0x7a, 0x0c, 0x03, 0xb6, 0x2a, 0x92, 0x2c, 0x25, 0x4b, 0xcc, 0xf6,
+ 0xbc, 0xc6, 0x04, 0xb5, 0xdc, 0x27, 0x4e, 0x68, 0x24, 0x28, 0x0f, 0xd3, 0xb3, 0xcc, 0xf8, 0x80,
+ 0xd6, 0xc1, 0xbf, 0x1d, 0x98, 0xea, 0x0e, 0xfa, 0xb6, 0xfe, 0xfc, 0x9d, 0xc3, 0xdd, 0x2d, 0xcf,
+ 0x4b, 0xcf, 0x87, 0xa1, 0xa9, 0xbc, 0xb6, 0x5c, 0x18, 0x12, 0x67, 0xb4, 0x42, 0x26, 0xeb, 0x35,
+ 0x97, 0x91, 0x48, 0x52, 0xdb, 0x45, 0xc6, 0x06, 0xfb, 0x32, 0x49, 0xb9, 0xf7, 0x09, 0xcc, 0xe2,
+ 0x44, 0x72, 0x52, 0x58, 0x0b, 0x69, 0x27, 0x4d, 0x2b, 0x94, 0xc4, 0xac, 0xfb, 0x87, 0x0d, 0xf7,
+ 0xdf, 0x68, 0x42, 0x23, 0xb2, 0x7c, 0xbb, 0x09, 0xfd, 0xc1, 0x81, 0xe9, 0xab, 0x24, 0xe6, 0x59,
+ 0xc1, 0x72, 0x4e, 0x63, 0xfb, 0x03, 0x18, 0x71, 0x75, 0xc8, 0x0a, 0x56, 0x65, 0x5a, 0x45, 0x23,
+ 0xcf, 0x5e, 0xf5, 0xc6, 0xd5, 0xeb, 0x72, 0xd0, 0x1e, 0x6b, 0x31, 0x41, 0x2f, 0xd7, 0x0b, 0xdd,
+ 0x85, 0xba, 0xa1, 0x26, 0x50, 0x9a, 0xf2, 0x57, 0xd7, 0x4a, 0x37, 0x34, 0x54, 0x75, 0x91, 0x41,
+ 0xfd, 0x46, 0x0e, 0xfe, 0xd3, 0x81, 0xf1, 0x41, 0x76, 0x89, 0x6f, 0x78, 0x1a, 0x37, 0xe8, 0xa1,
+ 0xb4, 0x14, 0x1c, 0xbf, 0x76, 0xe8, 0xeb, 0x8a, 0xf6, 0x1e, 0xc3, 0x7c, 0xa5, 0x45, 0x4f, 0xcf,
+ 0x25, 0x57, 0xe7, 0x99, 0xd0, 0x9a, 0x76, 0xc2, 0x1b, 0xb8, 0xb7, 0x03, 0xe3, 0x33, 0xb6, 0xe2,
+ 0xcf, 0x39, 0x2b, 0x4a, 0xa9, 0x7d, 0x36, 0x09, 0x9b, 0x10, 0xea, 0xae, 0x5f, 0x76, 0x3d, 0x3a,
+ 0x46, 0x13, 0xf8, 0x0e, 0x2f, 0x24, 0xe7, 0x2f, 0xb2, 0x98, 0x5b, 0xf5, 0x6b, 0x80, 0x6e, 0xc0,
+ 0x96, 0xd8, 0x3b, 0xbb, 0xe4, 0x0a, 0xb6, 0x54, 0xde, 0x36, 0x34, 0xc6, 0x0b, 0x7f, 0xb8, 0xd3,
+ 0xdd, 0x18, 0x38, 0xb6, 0x01, 0x14, 0x67, 0x72, 0x75, 0x7e, 0xaa, 0x4b, 0x3d, 0x7e, 0xd9, 0x40,
+ 0x90, 0x9f, 0xa4, 0x79, 0xa9, 0x93, 0xce, 0x56, 0xfa, 0x1a, 0x41, 0xfe, 0x2a, 0x13, 0x42, 0x07,
+ 0x84, 0x29, 0xf5, 0x0d, 0x84, 0xac, 0x9d, 0x95, 0x72, 0x55, 0x15, 0x7b, 0x4d, 0x79, 0x8f, 0x60,
+ 0xca, 0x52, 0x26, 0xae, 0xed, 0x4b, 0xd8, 0x34, 0xcd, 0x36, 0x18, 0xfc, 0x1a, 0x66, 0x27, 0xf1,
+ 0x85, 0xf1, 0xc0, 0x11, 0x5b, 0x9d, 0xdf, 0xc8, 0x09, 0x1f, 0x07, 0xc0, 0xa5, 0xe0, 0x55, 0x46,
+ 0x58, 0xd2, 0x0b, 0x60, 0x62, 0xec, 0x7e, 0xb2, 0xca, 0x8c, 0x91, 0x3b, 0x61, 0x0b, 0x0b, 0x42,
+ 0x98, 0xd7, 0xfb, 0x87, 0x5c, 0x95, 0xa2, 0xf0, 0x7e, 0x0a, 0xd3, 0x55, 0x13, 0x20, 0x47, 0x8f,
+ 0xf7, 0xfc, 0x56, 0x21, 0x6f, 0xa8, 0x14, 0xb6, 0xc5, 0x83, 0xdf, 0x76, 0xc1, 0x3d, 0xba, 0xe2,
+ 0x69, 0x71, 0x5c, 0xaa, 0xf3, 0x77, 0x9a, 0xb1, 0x3f, 0x32, 0xb3, 0xbf, 0x9e, 0xdf, 0x75, 0x0c,
+ 0xd3, 0x98, 0x7f, 0x42, 0x33, 0xfc, 0x07, 0x40, 0x4f, 0x88, 0x08, 0x07, 0x79, 0x93, 0xc6, 0x48,
+ 0x1f, 0xa5, 0x34, 0xaf, 0x25, 0x2a, 0x52, 0xac, 0x48, 0xd4, 0xd9, 0x75, 0xc4, 0x84, 0xa0, 0x44,
+ 0x1e, 0x85, 0x93, 0x44, 0x9d, 0x68, 0x70, 0x5f, 0x08, 0xac, 0x1b, 0x34, 0xbf, 0xd0, 0x4c, 0x3a,
+ 0x30, 0x7f, 0x7f, 0x94, 0x82, 0xd3, 0x48, 0x5a, 0xf7, 0xcc, 0x61, 0xab, 0x67, 0x7e, 0x08, 0xae,
+ 0x7e, 0x21, 0xd5, 0xd3, 0xd4, 0x88, 0x9e, 0x47, 0x98, 0xe0, 0x1f, 0xc3, 0x98, 0x98, 0xe6, 0x85,
+ 0xe7, 0xd6, 0xaf, 0x27, 0xf3, 0xc0, 0xfb, 0x11, 0x8c, 0x92, 0x3c, 0xca, 0x33, 0x59, 0x28, 0x1f,
+ 0x36, 0x3b, 0x2e, 0x1a, 0x66, 0x91, 0x1f, 0x67, 0xb2, 0x08, 0x87, 0x09, 0xfd, 0x2a, 0xef, 0x13,
+ 0xe8, 0x95, 0x52, 0x28, 0x7f, 0xbc, 0xd9, 0x35, 0x51, 0xf8, 0xa5, 0x14, 0x21, 0xb1, 0xbd, 0xcf,
+ 0x6d, 0x77, 0x9d, 0x6c, 0x3e, 0x19, 0x2a, 0x93, 0x37, 0x7a, 0x6c, 0xf0, 0xad, 0x03, 0xd3, 0x16,
+ 0xe3, 0x86, 0x3f, 0xd0, 0xf6, 0x59, 0x9e, 0xac, 0x9a, 0x8f, 0x78, 0x97, 0x10, 0xba, 0x28, 0xbe,
+ 0xe7, 0x88, 0xcd, 0xe4, 0xba, 0x7a, 0xcf, 0x21, 0x80, 0x3d, 0xb2, 0xd9, 0x6e, 0x7b, 0xdf, 0x37,
+ 0x90, 0xf6, 0x6f, 0x19, 0x48, 0xe9, 0xbf, 0x25, 0xc1, 0x4d, 0x97, 0x1b, 0x98, 0x87, 0x74, 0x29,
+ 0xb8, 0xce, 0xad, 0x00, 0xa6, 0x1c, 0x95, 0x8f, 0xf2, 0x52, 0x9d, 0x47, 0xe6, 0x4f, 0x39, 0x37,
+ 0x1c, 0x73, 0x7b, 0xa3, 0x45, 0x1c, 0xbc, 0x04, 0xa8, 0xcd, 0x89, 0xea, 0xda, 0xbf, 0x9b, 0x72,
+ 0x5b, 0x42, 0x35, 0xb0, 0xa8, 0xff, 0x66, 0xeb, 0x34, 0xfe, 0x66, 0x7b, 0xdb, 0x83, 0xe7, 0x29,
+ 0x0c, 0x8d, 0xe1, 0xed, 0x7c, 0xe8, 0xd4, 0xf3, 0xe1, 0x5b, 0xc6, 0xac, 0xe0, 0x6f, 0x0e, 0xdc,
+ 0x3b, 0x52, 0xc7, 0x5c, 0xaa, 0x2c, 0x3d, 0x60, 0xab, 0x73, 0xd3, 0x31, 0xbd, 0xcf, 0x4c, 0x65,
+ 0xd5, 0x6d, 0xb5, 0x91, 0x48, 0x47, 0xaa, 0x21, 0x16, 0x9b, 0xe6, 0xf1, 0x81, 0xa9, 0xb1, 0xba,
+ 0xc9, 0x75, 0xab, 0x94, 0xd6, 0x0f, 0x8f, 0x9c, 0x76, 0x6f, 0x3c, 0x3c, 0x34, 0xb0, 0xa0, 0x4a,
+ 0x70, 0x66, 0xea, 0xa9, 0xc9, 0x12, 0x43, 0x36, 0x3a, 0x73, 0xff, 0x7b, 0x3b, 0x73, 0xfb, 0x7f,
+ 0xa9, 0xbe, 0xbd, 0xdb, 0xe3, 0x3f, 0x39, 0x30, 0x69, 0x4e, 0x01, 0xde, 0x04, 0x46, 0xa7, 0x91,
+ 0xee, 0xd7, 0xf3, 0x2d, 0x6f, 0x0e, 0x13, 0x4b, 0xe1, 0xa0, 0x3a, 0x77, 0xbc, 0xfb, 0x30, 0x6f,
+ 0x22, 0xd8, 0x3e, 0xe6, 0x1d, 0x0f, 0x60, 0x70, 0x1a, 0x91, 0x44, 0xd7, 0x9b, 0x82, 0xab, 0xd7,
+ 0x27, 0xf1, 0xc5, 0xbc, 0xe7, 0xdd, 0x85, 0x69, 0x45, 0x62, 0xa8, 0xce, 0xfb, 0x9e, 0x0b, 0xfd,
+ 0xd3, 0x08, 0xb9, 0x03, 0xef, 0x1e, 0xdc, 0xb1, 0xdb, 0x99, 0xf1, 0x60, 0x3e, 0xf4, 0x66, 0x00,
+ 0xa7, 0xd1, 0xa9, 0xf9, 0x7b, 0x61, 0x3e, 0xd2, 0x3a, 0xe9, 0xe2, 0x39, 0x77, 0xb5, 0x4e, 0xc7,
+ 0x99, 0x10, 0x07, 0x59, 0x7a, 0x96, 0xac, 0xe7, 0xf0, 0xf8, 0x09, 0x8c, 0xec, 0x85, 0x51, 0x93,
+ 0x45, 0xaa, 0xb8, 0x2c, 0xe6, 0x5b, 0xb8, 0x7e, 0x49, 0xc3, 0xfb, 0xdc, 0xc1, 0xf5, 0x21, 0x17,
+ 0xbc, 0xe0, 0xf3, 0xce, 0xe3, 0x67, 0x30, 0x6b, 0xbb, 0x48, 0xeb, 0x7c, 0xb8, 0x24, 0x4b, 0xcc,
+ 0xb7, 0xb4, 0x56, 0x86, 0xd4, 0x7e, 0x9f, 0x3b, 0x5f, 0xf8, 0x7f, 0x7e, 0xbd, 0xed, 0x7c, 0xf3,
+ 0x7a, 0xdb, 0xf9, 0xfb, 0xeb, 0x6d, 0xe7, 0xf7, 0x6f, 0xb6, 0xb7, 0xbe, 0x79, 0xb3, 0xbd, 0xf5,
+ 0xd7, 0x37, 0xdb, 0x5b, 0xcb, 0x01, 0xd9, 0xfd, 0xe9, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xb6,
+ 0xbc, 0xae, 0x51, 0x65, 0x17, 0x00, 0x00,
}
func (m *Area) Marshal() (dAtA []byte, err error) {
@@ -4393,19 +4393,22 @@
}
}
if len(m.AlarmLevel) > 0 {
- for _, s := range m.AlarmLevel {
- dAtA[i] = 0x3a
- i++
- l = len(s)
- for l >= 1<<7 {
- dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
- l >>= 7
- i++
+ 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++
}
- dAtA[i] = uint8(l)
- i++
- i += copy(dAtA[i:], s)
+ dAtA5[j4] = uint8(num)
+ j4++
}
+ dAtA[i] = 0x3a
+ i++
+ i = encodeVarintProtomsg(dAtA, i, uint64(j4))
+ i += copy(dAtA[i:], dAtA5[:j4])
}
if len(m.SearchTime) > 0 {
for _, s := range m.SearchTime {
@@ -5619,10 +5622,11 @@
}
}
if len(m.AlarmLevel) > 0 {
- for _, s := range m.AlarmLevel {
- l = len(s)
- n += 1 + l + sovProtomsg(uint64(l))
+ l = 0
+ for _, e := range m.AlarmLevel {
+ l += sovProtomsg(uint64(e))
}
+ n += 1 + sovProtomsg(uint64(l)) + l
}
if len(m.SearchTime) > 0 {
for _, s := range m.SearchTime {
@@ -11209,37 +11213,81 @@
m.Tabs = append(m.Tabs, string(dAtA[iNdEx:postIndex]))
iNdEx = postIndex
case 7:
- 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 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
+ }
}
- if iNdEx >= l {
+ 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
}
- b := dAtA[iNdEx]
- iNdEx++
- stringLen |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
+ 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 {
+ return fmt.Errorf("proto: wrong wireType = %d for field AlarmLevel", wireType)
}
- intStringLen := int(stringLen)
- if intStringLen < 0 {
- return ErrInvalidLengthProtomsg
- }
- postIndex := iNdEx + intStringLen
- if postIndex < 0 {
- return ErrInvalidLengthProtomsg
- }
- if postIndex > l {
- return io.ErrUnexpectedEOF
- }
- m.AlarmLevel = append(m.AlarmLevel, string(dAtA[iNdEx:postIndex]))
- iNdEx = postIndex
case 8:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field SearchTime", wireType)
diff --git a/protomsg.proto b/protomsg.proto
index 99cdcc3..8432f1b 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -250,11 +250,10 @@
repeated string tableIds = 1;
float compareThreshold = 2;
bytes faceFeature = 3;
-
repeated string tasks = 4;
repeated string treeNodes = 5;
repeated string tabs = 6;
- repeated string alarmLevel = 7;
+ repeated int32 alarmLevel = 7;
repeated string searchTime = 8;
string inputValue = 9;
string collection = 10;
--
Gitblit v1.8.0