From bd1d8f822f8f911922296f17a724989294a6c6ae Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期四, 21 十一月 2019 10:38:47 +0800 Subject: [PATCH] update --- sdk.pb.go | 311 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 184 insertions(+), 127 deletions(-) diff --git a/sdk.pb.go b/sdk.pb.go index 80bafa4..638b087 100644 --- a/sdk.pb.go +++ b/sdk.pb.go @@ -1274,7 +1274,7 @@ License string `protobuf:"bytes,4,opt,name=license,proto3" json:"license,omitempty"` NConfidence int32 `protobuf:"varint,5,opt,name=nConfidence,proto3" json:"nConfidence,omitempty"` NCharNum int32 `protobuf:"varint,6,opt,name=nCharNum,proto3" json:"nCharNum,omitempty"` - NCharConfidence []byte `protobuf:"bytes,7,opt,name=nCharConfidence,proto3" json:"nCharConfidence,omitempty"` + NCharConfidence []int32 `protobuf:"varint,7,rep,packed,name=nCharConfidence,proto3" json:"nCharConfidence,omitempty"` RcLocation *Rect `protobuf:"bytes,8,opt,name=rcLocation,proto3" json:"rcLocation,omitempty"` RcCarLocation *Rect `protobuf:"bytes,9,opt,name=rcCarLocation,proto3" json:"rcCarLocation,omitempty"` VehicleType string `protobuf:"bytes,10,opt,name=vehicleType,proto3" json:"vehicleType,omitempty"` @@ -1364,7 +1364,7 @@ return 0 } -func (m *PlateVehicleID) GetNCharConfidence() []byte { +func (m *PlateVehicleID) GetNCharConfidence() []int32 { if m != nil { return m.NCharConfidence } @@ -1523,91 +1523,91 @@ func init() { proto.RegisterFile("sdk.proto", fileDescriptor_70decb0fb6f436df) } var fileDescriptor_70decb0fb6f436df = []byte{ - // 1329 bytes of a gzipped FileDescriptorProto + // 1331 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0x5d, 0x6f, 0x13, 0x47, - 0x17, 0x66, 0xed, 0xf8, 0xeb, 0x24, 0x24, 0x61, 0x40, 0x68, 0x15, 0xbd, 0xb2, 0xa2, 0x7d, 0x2b, - 0x30, 0x2d, 0x4d, 0x21, 0x45, 0xad, 0xd4, 0xab, 0x36, 0x31, 0x08, 0x4b, 0x10, 0xa2, 0x01, 0x51, - 0xf5, 0x72, 0xbc, 0x3b, 0xb6, 0x37, 0xec, 0xee, 0x6c, 0x77, 0xc7, 0x80, 0xd5, 0x5f, 0xd0, 0xbb, - 0xfe, 0x88, 0x5e, 0xf7, 0x77, 0xf4, 0x92, 0xcb, 0x5e, 0x56, 0xa4, 0xfd, 0x09, 0xbd, 0xaf, 0xce, - 0x99, 0xd9, 0x0f, 0x3b, 0x06, 0x54, 0xa9, 0x97, 0xbd, 0x62, 0xce, 0x33, 0xcf, 0xce, 0xf9, 0x7a, - 0xce, 0x71, 0x80, 0x5e, 0x1e, 0xbc, 0x38, 0x48, 0x33, 0xa5, 0x15, 0xeb, 0xd2, 0x3f, 0x71, 0x3e, - 0xdd, 0x83, 0xb1, 0xc8, 0xa5, 0x41, 0xbd, 0x1f, 0x1d, 0x68, 0x8d, 0x62, 0x31, 0x95, 0xec, 0x1a, - 0xb4, 0x5e, 0x85, 0x81, 0x9e, 0xb9, 0xce, 0xbe, 0x33, 0x68, 0x71, 0x63, 0xb0, 0xeb, 0xd0, 0x9e, - 0xc9, 0x70, 0x3a, 0xd3, 0x6e, 0x83, 0x60, 0x6b, 0x31, 0x06, 0x1b, 0x81, 0xd0, 0xc2, 0x6d, 0xee, - 0x3b, 0x83, 0x2d, 0x4e, 0x67, 0xf6, 0x3f, 0xe8, 0xe9, 0x30, 0x96, 0xb9, 0x16, 0x71, 0xea, 0x6e, - 0xec, 0x3b, 0x83, 0x1e, 0xaf, 0x00, 0xb6, 0x0d, 0x8d, 0x30, 0x70, 0x5b, 0xfb, 0xce, 0xa0, 0xc9, - 0x1b, 0x61, 0xc0, 0x76, 0xa1, 0xe9, 0x87, 0x81, 0xdb, 0x26, 0x1e, 0x1e, 0xbd, 0x29, 0xf4, 0x1e, - 0x08, 0x5f, 0x7e, 0x93, 0x4c, 0x23, 0x89, 0xd7, 0x0b, 0xf1, 0xca, 0x06, 0x83, 0x47, 0x0c, 0x30, - 0x0d, 0xb5, 0x3f, 0xb3, 0x91, 0x18, 0x03, 0x03, 0xc9, 0x54, 0x14, 0x51, 0x20, 0x2d, 0x4e, 0x67, - 0xd6, 0x07, 0xf0, 0x55, 0x32, 0x09, 0x03, 0x99, 0xf8, 0x92, 0x22, 0x69, 0xf0, 0x1a, 0xe2, 0xbd, - 0x06, 0x78, 0x36, 0x9b, 0x68, 0x2e, 0xf3, 0x79, 0xa4, 0x31, 0xc5, 0xa9, 0x4c, 0x02, 0x99, 0x59, - 0x67, 0xd6, 0xc2, 0x08, 0xc4, 0x54, 0x5a, 0x6f, 0x78, 0x24, 0x5f, 0xc2, 0x97, 0xa5, 0x2f, 0xe1, - 0x4b, 0xfc, 0x7a, 0x2c, 0xc5, 0x5c, 0x2f, 0xc8, 0x4f, 0x8b, 0x5b, 0x0b, 0xa3, 0xcd, 0xe3, 0x30, - 0x92, 0x94, 0x71, 0x8b, 0x1b, 0xc3, 0xfb, 0xa3, 0x01, 0x1d, 0xcc, 0xf1, 0x54, 0xe5, 0xec, 0x06, - 0xb4, 0x33, 0x1f, 0x0d, 0xf2, 0xbb, 0x79, 0xb8, 0x7d, 0x50, 0x74, 0xe8, 0x80, 0x4b, 0x5f, 0x73, - 0x7b, 0xcb, 0x3e, 0x85, 0x5e, 0xaa, 0x1f, 0xc9, 0x89, 0xbe, 0xbf, 0x30, 0xd1, 0x6c, 0x1e, 0xee, - 0x54, 0xd4, 0x53, 0x15, 0x26, 0x9a, 0x57, 0x0c, 0xf6, 0x19, 0x40, 0xaa, 0x39, 0x36, 0x09, 0xf9, - 0xcd, 0xf5, 0xfc, 0x1a, 0x85, 0xdd, 0x82, 0x4e, 0xaa, 0x1f, 0xab, 0xb9, 0x9e, 0x51, 0x0a, 0x6b, - 0xd8, 0xc5, 0x3d, 0xbb, 0x09, 0xed, 0x54, 0x9f, 0xa8, 0xdc, 0x64, 0xb5, 0x86, 0x69, 0xaf, 0xd9, - 0x27, 0xd0, 0x9e, 0x50, 0x1f, 0xa9, 0xbf, 0x9b, 0x87, 0x57, 0x2b, 0x62, 0xd9, 0x62, 0x6e, 0x29, - 0xcc, 0x85, 0xce, 0xf7, 0x73, 0x11, 0x85, 0x7a, 0xe1, 0x76, 0xa8, 0x58, 0x85, 0x89, 0x8d, 0x9c, - 0x08, 0x3f, 0x14, 0xd1, 0x10, 0xb5, 0xd6, 0x25, 0xad, 0xd5, 0x10, 0x2c, 0xfe, 0x44, 0xf8, 0x72, - 0x34, 0x74, 0x7b, 0xfb, 0xce, 0x60, 0x83, 0x5b, 0xcb, 0xfb, 0xb3, 0x01, 0x5d, 0xf4, 0x33, 0x4a, - 0x26, 0xea, 0xbf, 0x3a, 0xff, 0xdb, 0x75, 0x6e, 0x96, 0x75, 0x7e, 0x01, 0x9d, 0x27, 0xe3, 0x33, - 0xaa, 0xf2, 0x47, 0xd0, 0xca, 0xfc, 0x27, 0xe3, 0xb3, 0x77, 0x14, 0xd9, 0x5c, 0xe2, 0x4c, 0xe9, - 0x45, 0x5a, 0xcc, 0x94, 0x5e, 0xa4, 0x38, 0x53, 0x69, 0xa6, 0xc6, 0x54, 0xc0, 0x06, 0xa7, 0x33, - 0xce, 0x8e, 0x1a, 0x9f, 0x8d, 0x86, 0x54, 0xa7, 0x0d, 0x6e, 0x0c, 0xef, 0x07, 0xd8, 0x35, 0x13, - 0x8b, 0x99, 0x0d, 0xa5, 0x96, 0xbe, 0x66, 0xff, 0x87, 0x66, 0xaa, 0x72, 0xeb, 0xf3, 0xca, 0x72, - 0xf2, 0xa7, 0x2a, 0xe7, 0x78, 0xcb, 0x6e, 0x43, 0x3b, 0xa3, 0x0f, 0x6d, 0x57, 0xaf, 0x55, 0xbc, - 0x6a, 0x0d, 0x70, 0xcb, 0x41, 0xe7, 0x13, 0x29, 0x74, 0x6e, 0x57, 0x9b, 0x31, 0xbc, 0xaf, 0x61, - 0xeb, 0x54, 0x64, 0x22, 0x2e, 0x86, 0xf7, 0x0e, 0xb4, 0xb0, 0x06, 0xe8, 0xba, 0x39, 0xd8, 0x3c, - 0xdc, 0xab, 0xa7, 0xbb, 0x1c, 0x23, 0x37, 0x44, 0xef, 0xac, 0x1e, 0xfe, 0xfd, 0xd7, 0xfa, 0x58, - 0xc5, 0x95, 0x2f, 0xa7, 0xe6, 0x0b, 0x4b, 0xe2, 0xab, 0xd8, 0x54, 0x69, 0x8b, 0xd3, 0x99, 0xdd, - 0x36, 0x89, 0x1a, 0x99, 0xbd, 0xcf, 0x1b, 0xd2, 0xbc, 0x87, 0xb0, 0x5b, 0x46, 0xfb, 0x40, 0x0a, - 0x3d, 0xcf, 0x24, 0xbb, 0x07, 0x1d, 0x49, 0x5e, 0xf1, 0xe1, 0x77, 0xc6, 0x6c, 0x02, 0xe3, 0x05, - 0xd5, 0xfb, 0xd2, 0xe6, 0xfd, 0x9d, 0x8a, 0x14, 0x36, 0xf0, 0x26, 0xb4, 0xc2, 0x64, 0xa2, 0x8a, - 0xbc, 0x6b, 0x25, 0xb7, 0x42, 0xe0, 0xe6, 0xde, 0x7b, 0x00, 0xed, 0xa7, 0x8a, 0x94, 0x61, 0x16, - 0xbf, 0x43, 0x7b, 0x1e, 0x17, 0x3f, 0x6e, 0xc6, 0xe0, 0xc5, 0x28, 0xa0, 0xfc, 0x7a, 0xdc, 0x18, - 0x28, 0xb1, 0x5c, 0x9d, 0x88, 0xd8, 0x8c, 0x52, 0x8f, 0x5b, 0xcb, 0xfb, 0x6b, 0x03, 0x3a, 0xa7, - 0x91, 0xd0, 0x72, 0x34, 0x44, 0x01, 0x47, 0xa1, 0x2f, 0x93, 0x5c, 0xda, 0xe7, 0x0a, 0x13, 0xdf, - 0xf4, 0x55, 0xa4, 0xb2, 0xe2, 0x4d, 0x32, 0xf0, 0xcd, 0xe4, 0x98, 0x60, 0xb3, 0xb1, 0xad, 0x85, - 0xec, 0xe4, 0xd9, 0x22, 0x95, 0x76, 0x65, 0x1b, 0x83, 0xed, 0xc3, 0x66, 0x72, 0x5c, 0xfd, 0x6c, - 0x98, 0xbd, 0x5d, 0x87, 0xd0, 0x7f, 0x72, 0x94, 0xd1, 0xaf, 0x61, 0xdb, 0x0c, 0x90, 0x35, 0x71, - 0x80, 0x92, 0x61, 0x98, 0x49, 0x5f, 0x87, 0x2a, 0xb1, 0xd3, 0x55, 0x43, 0xd8, 0x01, 0x40, 0xe6, - 0x3f, 0x52, 0xbe, 0xa0, 0xfb, 0xee, 0xda, 0x11, 0xa9, 0x31, 0x4c, 0x84, 0x61, 0x2c, 0x69, 0xde, - 0x28, 0xc2, 0x30, 0x96, 0xe4, 0xe5, 0x58, 0x64, 0x36, 0x04, 0xb0, 0x5e, 0x4a, 0x04, 0x7f, 0x80, - 0x4f, 0x8e, 0x45, 0x66, 0x52, 0xde, 0xa4, 0xeb, 0x0a, 0x60, 0x7b, 0xd0, 0x45, 0xee, 0x23, 0x35, - 0x55, 0xee, 0x16, 0x5d, 0x96, 0x76, 0x71, 0x47, 0x45, 0xb9, 0x5c, 0xdd, 0x51, 0x5d, 0xf6, 0xa0, - 0x9b, 0x62, 0x03, 0x8e, 0xc2, 0xc4, 0xdd, 0x26, 0x49, 0x96, 0x36, 0xbb, 0x01, 0xdb, 0xc9, 0x51, - 0x98, 0x50, 0x83, 0xbe, 0xa5, 0xbf, 0x1e, 0x76, 0x88, 0xb1, 0x82, 0xb2, 0x01, 0xec, 0x94, 0xc8, - 0x43, 0xf3, 0xf7, 0xc4, 0x2e, 0x11, 0x57, 0x61, 0xf6, 0x05, 0x6c, 0x63, 0x1d, 0xa6, 0xaa, 0xac, - 0xd6, 0x95, 0xb5, 0xd5, 0x5a, 0x61, 0x61, 0xee, 0x18, 0xf1, 0x63, 0x15, 0xc8, 0xc8, 0x65, 0xf4, - 0x76, 0x05, 0xb0, 0x3b, 0x70, 0xb5, 0x34, 0x6a, 0x3d, 0xbe, 0x4a, 0xbc, 0x75, 0x57, 0xde, 0x57, - 0x70, 0xd9, 0xca, 0xce, 0xfe, 0x99, 0x70, 0xab, 0xdc, 0x22, 0x17, 0xa4, 0x5f, 0x10, 0x2d, 0xc1, - 0xfb, 0xb9, 0x09, 0x5b, 0x84, 0x1d, 0x47, 0x6a, 0x1e, 0xbc, 0x57, 0xb8, 0xcb, 0xc2, 0x68, 0x7c, - 0x50, 0x18, 0x2b, 0x22, 0x6d, 0x5e, 0x14, 0xe9, 0x7a, 0x71, 0x2f, 0x0b, 0xb4, 0x75, 0x41, 0xa0, - 0xb6, 0x7c, 0x46, 0x3a, 0x46, 0xdc, 0x15, 0x50, 0x08, 0x8f, 0x8c, 0xbb, 0xa5, 0xbc, 0x4b, 0x64, - 0x45, 0x98, 0xdd, 0x0b, 0xc2, 0x74, 0xa1, 0x33, 0xc9, 0x44, 0x2c, 0x4f, 0x94, 0x15, 0x74, 0x61, - 0xa2, 0x5f, 0x5c, 0x8f, 0x46, 0x3b, 0x46, 0xd1, 0x15, 0x60, 0x7f, 0x97, 0x0a, 0xc5, 0x18, 0x45, - 0xd7, 0x10, 0xe6, 0xc1, 0xd6, 0x34, 0x13, 0x0b, 0x5a, 0x73, 0x91, 0x98, 0x5a, 0x59, 0x2f, 0x61, - 0xe8, 0xdb, 0x9f, 0x89, 0xec, 0x64, 0x1e, 0x5b, 0x65, 0x17, 0xa6, 0x37, 0x04, 0x56, 0xef, 0x92, - 0xed, 0xf3, 0xc1, 0x4a, 0x9f, 0xaf, 0xaf, 0xf4, 0xb9, 0x60, 0x17, 0xcd, 0xfe, 0xa5, 0x05, 0xdb, - 0x74, 0xf1, 0x5c, 0xce, 0x42, 0x3f, 0xc2, 0x3d, 0x85, 0xe5, 0x20, 0x88, 0x82, 0x72, 0x6c, 0x39, - 0x4a, 0xa4, 0xb6, 0x97, 0x1a, 0xeb, 0xf7, 0x52, 0xb3, 0xde, 0xba, 0x9a, 0x78, 0x36, 0x96, 0xc5, - 0xf3, 0xe1, 0x8d, 0x45, 0x73, 0x6d, 0xb3, 0x6f, 0x17, 0x73, 0x6d, 0x6c, 0x9a, 0x49, 0x3c, 0xd7, - 0x5e, 0xe8, 0xd8, 0x99, 0x5c, 0x86, 0xff, 0xf1, 0xf6, 0xba, 0x07, 0x97, 0x33, 0x9f, 0x56, 0x8b, - 0xfd, 0xa4, 0xb7, 0xf6, 0x93, 0x65, 0x12, 0x66, 0xf3, 0xd2, 0x94, 0x90, 0x6a, 0x00, 0x94, 0x6b, - 0x1d, 0xc2, 0x76, 0x5b, 0xf3, 0x28, 0x13, 0x49, 0x40, 0x82, 0xe8, 0xf1, 0x25, 0x0c, 0x6b, 0x6f, - 0xed, 0xa7, 0xf3, 0x31, 0x09, 0xa2, 0xc7, 0x6b, 0x48, 0xed, 0x0d, 0x7c, 0xf2, 0x2e, 0x69, 0xa2, - 0x7a, 0x83, 0x30, 0x92, 0xeb, 0xcb, 0x00, 0x0b, 0x40, 0x0b, 0xaf, 0xc1, 0x0b, 0x93, 0x04, 0x89, - 0x07, 0x53, 0xae, 0x1d, 0xf3, 0x3f, 0x8b, 0x0a, 0x61, 0x1f, 0xc3, 0x6e, 0xf2, 0xbc, 0x74, 0x66, - 0x96, 0xd1, 0x2e, 0xd5, 0xfd, 0x02, 0x4e, 0xbb, 0xf3, 0x79, 0x11, 0x3a, 0x09, 0xfc, 0x0a, 0x31, - 0x57, 0xd0, 0x3a, 0xcf, 0x0e, 0x20, 0x5b, 0xe6, 0xd9, 0x21, 0x5c, 0xe5, 0x1d, 0xd2, 0x7a, 0x5b, - 0xe5, 0x1d, 0x7a, 0x0f, 0xe1, 0xda, 0xb2, 0x5e, 0xad, 0xf0, 0xef, 0xac, 0x08, 0xdf, 0x5d, 0x11, - 0x7e, 0xc5, 0xb7, 0xbc, 0x23, 0xf7, 0xd7, 0xb7, 0x7d, 0xe7, 0xcd, 0xdb, 0xbe, 0xf3, 0xfb, 0xdb, - 0xbe, 0xf3, 0xd3, 0x79, 0xff, 0xd2, 0x9b, 0xf3, 0xfe, 0xa5, 0xdf, 0xce, 0xfb, 0x97, 0xc6, 0x6d, - 0xfa, 0xf4, 0xf3, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xc1, 0xe6, 0x0e, 0xd2, 0x80, 0x0e, 0x00, - 0x00, + 0x17, 0xc6, 0x76, 0xfc, 0x75, 0x12, 0x92, 0x30, 0x20, 0xb4, 0x8a, 0x5e, 0x59, 0xd6, 0xbe, 0x15, + 0x98, 0x96, 0xa6, 0x90, 0xa2, 0x56, 0xea, 0x55, 0x9b, 0x18, 0x44, 0x24, 0x08, 0xd1, 0x80, 0xa8, + 0x7a, 0x39, 0xde, 0x1d, 0xdb, 0x1b, 0x76, 0x77, 0xb6, 0xbb, 0x63, 0xc0, 0xea, 0x2f, 0xe8, 0x5d, + 0x7f, 0x44, 0xaf, 0xfb, 0x3b, 0x7a, 0xc9, 0x65, 0x2f, 0x2b, 0xd2, 0xfe, 0x84, 0xde, 0x57, 0xe7, + 0xcc, 0xec, 0x87, 0x37, 0x06, 0x54, 0xa9, 0x97, 0xbd, 0x62, 0xce, 0x33, 0xcf, 0xce, 0xf9, 0x7a, + 0xce, 0x71, 0x80, 0x7e, 0xe6, 0xbf, 0xd8, 0x4f, 0x52, 0xa5, 0x15, 0xeb, 0xd1, 0x3f, 0x51, 0x36, + 0xdb, 0x83, 0x89, 0xc8, 0xa4, 0x41, 0xdd, 0x1f, 0x1b, 0xd0, 0x3e, 0x8e, 0xc4, 0x4c, 0xb2, 0x6b, + 0xd0, 0x7e, 0x15, 0xf8, 0x7a, 0xee, 0x34, 0x86, 0x8d, 0x51, 0x9b, 0x1b, 0x83, 0x5d, 0x87, 0xce, + 0x5c, 0x06, 0xb3, 0xb9, 0x76, 0x9a, 0x04, 0x5b, 0x8b, 0x31, 0xd8, 0xf0, 0x85, 0x16, 0x4e, 0x6b, + 0xd8, 0x18, 0x6d, 0x71, 0x3a, 0xb3, 0xff, 0x41, 0x5f, 0x07, 0x91, 0xcc, 0xb4, 0x88, 0x12, 0x67, + 0x63, 0xd8, 0x18, 0xf5, 0x79, 0x09, 0xb0, 0x6d, 0x68, 0x06, 0xbe, 0xd3, 0x1e, 0x36, 0x46, 0x2d, + 0xde, 0x0c, 0x7c, 0xb6, 0x0b, 0x2d, 0x2f, 0xf0, 0x9d, 0x0e, 0xf1, 0xf0, 0xe8, 0xce, 0xa0, 0xff, + 0x40, 0x78, 0xf2, 0x9b, 0x78, 0x16, 0x4a, 0xbc, 0x5e, 0x8a, 0x57, 0x36, 0x18, 0x3c, 0x62, 0x80, + 0x49, 0xa0, 0xbd, 0xb9, 0x8d, 0xc4, 0x18, 0x18, 0x48, 0xaa, 0xc2, 0x90, 0x02, 0x69, 0x73, 0x3a, + 0xb3, 0x01, 0x80, 0xa7, 0xe2, 0x69, 0xe0, 0xcb, 0xd8, 0x93, 0x14, 0x49, 0x93, 0x57, 0x10, 0xf7, + 0x35, 0xc0, 0xb3, 0xf9, 0x54, 0x73, 0x99, 0x2d, 0x42, 0x8d, 0x29, 0xce, 0x64, 0xec, 0xcb, 0xd4, + 0x3a, 0xb3, 0x16, 0x46, 0x20, 0x66, 0xd2, 0x7a, 0xc3, 0x23, 0xf9, 0x12, 0x9e, 0x2c, 0x7c, 0x09, + 0x4f, 0xe2, 0xd7, 0x13, 0x29, 0x16, 0x7a, 0x49, 0x7e, 0xda, 0xdc, 0x5a, 0x18, 0x6d, 0x16, 0x05, + 0xa1, 0xa4, 0x8c, 0xdb, 0xdc, 0x18, 0xee, 0x1f, 0x4d, 0xe8, 0x62, 0x8e, 0xa7, 0x2a, 0x63, 0x37, + 0xa0, 0x93, 0x7a, 0x68, 0x90, 0xdf, 0xcd, 0x83, 0xed, 0xfd, 0xbc, 0x43, 0xfb, 0x5c, 0x7a, 0x9a, + 0xdb, 0x5b, 0xf6, 0x29, 0xf4, 0x13, 0xfd, 0x48, 0x4e, 0xf5, 0xfd, 0xa5, 0x89, 0x66, 0xf3, 0x60, + 0xa7, 0xa4, 0x9e, 0xaa, 0x20, 0xd6, 0xbc, 0x64, 0xb0, 0xcf, 0x00, 0x12, 0xcd, 0xb1, 0x49, 0xc8, + 0x6f, 0xad, 0xe7, 0x57, 0x28, 0xec, 0x16, 0x74, 0x13, 0xfd, 0x58, 0x2d, 0xf4, 0x9c, 0x52, 0x58, + 0xc3, 0xce, 0xef, 0xd9, 0x4d, 0xe8, 0x24, 0xfa, 0x44, 0x65, 0x26, 0xab, 0x35, 0x4c, 0x7b, 0xcd, + 0x3e, 0x81, 0xce, 0x94, 0xfa, 0x48, 0xfd, 0xdd, 0x3c, 0xb8, 0x5a, 0x12, 0x8b, 0x16, 0x73, 0x4b, + 0x61, 0x0e, 0x74, 0xbf, 0x5f, 0x88, 0x30, 0xd0, 0x4b, 0xa7, 0x4b, 0xc5, 0xca, 0x4d, 0x6c, 0xe4, + 0x54, 0x78, 0x81, 0x08, 0xc7, 0xa8, 0xb5, 0x1e, 0x69, 0xad, 0x82, 0x60, 0xf1, 0xa7, 0xc2, 0x93, + 0xc7, 0x63, 0xa7, 0x3f, 0x6c, 0x8c, 0x36, 0xb8, 0xb5, 0xdc, 0x3f, 0x9b, 0xd0, 0x43, 0x3f, 0xc7, + 0xf1, 0x54, 0xfd, 0x57, 0xe7, 0x7f, 0xbb, 0xce, 0xad, 0xa2, 0xce, 0x2f, 0xa0, 0xfb, 0x64, 0x72, + 0x46, 0x55, 0xfe, 0x08, 0xda, 0xa9, 0xf7, 0x64, 0x72, 0xf6, 0x8e, 0x22, 0x9b, 0x4b, 0x9c, 0x29, + 0xbd, 0x4c, 0xf2, 0x99, 0xd2, 0xcb, 0x04, 0x67, 0x2a, 0x49, 0xd5, 0x84, 0x0a, 0xd8, 0xe4, 0x74, + 0xc6, 0xd9, 0x51, 0x93, 0xb3, 0xe3, 0x31, 0xd5, 0x69, 0x83, 0x1b, 0xc3, 0xfd, 0x01, 0x76, 0xcd, + 0xc4, 0x62, 0x66, 0x63, 0xa9, 0xa5, 0xa7, 0xd9, 0xff, 0xa1, 0x95, 0xa8, 0xcc, 0xfa, 0xbc, 0xb2, + 0x9a, 0xfc, 0xa9, 0xca, 0x38, 0xde, 0xb2, 0xdb, 0xd0, 0x49, 0xe9, 0x43, 0xdb, 0xd5, 0x6b, 0x25, + 0xaf, 0x5c, 0x03, 0xdc, 0x72, 0xd0, 0xf9, 0x54, 0x0a, 0x9d, 0xd9, 0xd5, 0x66, 0x0c, 0xf7, 0x6b, + 0xd8, 0x3a, 0x15, 0xa9, 0x88, 0xf2, 0xe1, 0xbd, 0x03, 0x6d, 0xac, 0x01, 0xba, 0x6e, 0x8d, 0x36, + 0x0f, 0xf6, 0xaa, 0xe9, 0xae, 0xc6, 0xc8, 0x0d, 0xd1, 0x3d, 0xab, 0x86, 0x7f, 0xff, 0xb5, 0x3e, + 0x52, 0x51, 0xe9, 0xab, 0x51, 0xf1, 0x85, 0x25, 0xf1, 0x54, 0x64, 0xaa, 0xb4, 0xc5, 0xe9, 0xcc, + 0x6e, 0x9b, 0x44, 0x8d, 0xcc, 0xde, 0xe7, 0x0d, 0x69, 0xee, 0x43, 0xd8, 0x2d, 0xa2, 0x7d, 0x20, + 0x85, 0x5e, 0xa4, 0x92, 0xdd, 0x83, 0xae, 0x24, 0xaf, 0xf8, 0xf0, 0x3b, 0x63, 0x36, 0x81, 0xf1, + 0x9c, 0xea, 0x7e, 0x69, 0xf3, 0xfe, 0x4e, 0x85, 0x0a, 0x1b, 0x78, 0x13, 0xda, 0x41, 0x3c, 0x55, + 0x79, 0xde, 0x95, 0x92, 0x5b, 0x21, 0x70, 0x73, 0xef, 0x3e, 0x80, 0xce, 0x53, 0x45, 0xca, 0x30, + 0x8b, 0xbf, 0x41, 0x7b, 0x1e, 0x17, 0x3f, 0x6e, 0x46, 0xff, 0xc5, 0xb1, 0x4f, 0xf9, 0xf5, 0xb9, + 0x31, 0x50, 0x62, 0x99, 0x3a, 0x11, 0x91, 0x19, 0xa5, 0x3e, 0xb7, 0x96, 0xfb, 0xd7, 0x06, 0x74, + 0x4f, 0x43, 0xa1, 0xe5, 0xf1, 0x18, 0x05, 0x1c, 0x06, 0x9e, 0x8c, 0x33, 0x69, 0x9f, 0xcb, 0x4d, + 0x7c, 0xd3, 0x53, 0xa1, 0x4a, 0xf3, 0x37, 0xc9, 0xc0, 0x37, 0xe3, 0x23, 0x82, 0xcd, 0xc6, 0xb6, + 0x16, 0xb2, 0xe3, 0x67, 0xcb, 0x44, 0xda, 0x95, 0x6d, 0x0c, 0x36, 0x84, 0xcd, 0xf8, 0xa8, 0xfc, + 0xd9, 0x30, 0x7b, 0xbb, 0x0a, 0xa1, 0xff, 0xf8, 0x30, 0xa5, 0x5f, 0xc3, 0x8e, 0x19, 0x20, 0x6b, + 0xe2, 0x00, 0xc5, 0xe3, 0x20, 0x95, 0x9e, 0x0e, 0x54, 0x6c, 0xa7, 0xab, 0x82, 0xb0, 0x7d, 0x80, + 0xd4, 0x7b, 0xa4, 0x3c, 0x41, 0xf7, 0xbd, 0xb5, 0x23, 0x52, 0x61, 0x98, 0x08, 0x83, 0x48, 0xd2, + 0xbc, 0x51, 0x84, 0x41, 0x24, 0xc9, 0xcb, 0x91, 0x48, 0x6d, 0x08, 0x60, 0xbd, 0x14, 0x08, 0xfe, + 0x00, 0x9f, 0x1c, 0x89, 0xd4, 0xa4, 0xbc, 0x49, 0xd7, 0x25, 0xc0, 0xf6, 0xa0, 0x87, 0xdc, 0x47, + 0x6a, 0xa6, 0x9c, 0x2d, 0xba, 0x2c, 0xec, 0xfc, 0x8e, 0x8a, 0x72, 0xb9, 0xbc, 0xa3, 0xba, 0xec, + 0x41, 0x2f, 0xc1, 0x06, 0x1c, 0x06, 0xb1, 0xb3, 0x4d, 0x92, 0x2c, 0x6c, 0x76, 0x03, 0xb6, 0xe3, + 0xc3, 0x20, 0xa6, 0x06, 0x7d, 0x4b, 0x7f, 0x3d, 0xec, 0x10, 0xa3, 0x86, 0xb2, 0x11, 0xec, 0x14, + 0xc8, 0x43, 0xf3, 0xf7, 0xc4, 0x2e, 0x11, 0xeb, 0x30, 0xfb, 0x02, 0xb6, 0xb1, 0x0e, 0x33, 0x55, + 0x54, 0xeb, 0xca, 0xda, 0x6a, 0xd5, 0x58, 0x98, 0x3b, 0x46, 0xfc, 0x58, 0xf9, 0x32, 0x74, 0x18, + 0xbd, 0x5d, 0x02, 0xec, 0x0e, 0x5c, 0x2d, 0x8c, 0x4a, 0x8f, 0xaf, 0x12, 0x6f, 0xdd, 0x95, 0xfb, + 0x15, 0x5c, 0xb6, 0xb2, 0xb3, 0x7f, 0x26, 0xdc, 0x2a, 0xb6, 0xc8, 0x05, 0xe9, 0xe7, 0x44, 0x4b, + 0x70, 0x7f, 0x6e, 0xc1, 0x16, 0x61, 0x47, 0xa1, 0x5a, 0xf8, 0xef, 0x15, 0xee, 0xaa, 0x30, 0x9a, + 0x1f, 0x14, 0x46, 0x4d, 0xa4, 0xad, 0x8b, 0x22, 0x5d, 0x2f, 0xee, 0x55, 0x81, 0xb6, 0x2f, 0x08, + 0xd4, 0x96, 0xcf, 0x48, 0xc7, 0x88, 0xbb, 0x04, 0x72, 0xe1, 0x91, 0x71, 0xb7, 0x90, 0x77, 0x81, + 0xd4, 0x84, 0xd9, 0xbb, 0x20, 0x4c, 0x07, 0xba, 0xd3, 0x54, 0x44, 0xf2, 0x44, 0x59, 0x41, 0xe7, + 0x26, 0xfa, 0xc5, 0xf5, 0x68, 0xb4, 0x63, 0x14, 0x5d, 0x02, 0xf6, 0x77, 0x29, 0x57, 0x8c, 0x51, + 0x74, 0x05, 0x61, 0x2e, 0x6c, 0xcd, 0x52, 0xb1, 0xa4, 0x35, 0x17, 0x8a, 0x99, 0x95, 0xf5, 0x0a, + 0x86, 0xbe, 0xbd, 0xb9, 0x48, 0x4f, 0x16, 0x91, 0x55, 0x76, 0x6e, 0xba, 0x63, 0x60, 0xd5, 0x2e, + 0xd9, 0x3e, 0xef, 0xd7, 0xfa, 0x7c, 0xbd, 0xd6, 0xe7, 0x9c, 0x9d, 0x37, 0xfb, 0x97, 0x36, 0x6c, + 0xd3, 0xc5, 0x73, 0x39, 0x0f, 0xbc, 0x10, 0xf7, 0x14, 0x96, 0x83, 0x20, 0x0a, 0xaa, 0x61, 0xcb, + 0x51, 0x20, 0x95, 0xbd, 0xd4, 0x5c, 0xbf, 0x97, 0x5a, 0xd5, 0xd6, 0x55, 0xc4, 0xb3, 0xb1, 0x2a, + 0x9e, 0x0f, 0x6f, 0x2c, 0x9a, 0x6b, 0x9b, 0x7d, 0x27, 0x9f, 0x6b, 0x63, 0xd3, 0x4c, 0xe2, 0xb9, + 0xf2, 0x42, 0x77, 0xd8, 0x1a, 0xb5, 0x79, 0x1d, 0xfe, 0xc7, 0xdb, 0xeb, 0x1e, 0x5c, 0x4e, 0x3d, + 0x5a, 0x2d, 0xf6, 0x93, 0xfe, 0xda, 0x4f, 0x56, 0x49, 0x98, 0xcd, 0x4b, 0x53, 0x42, 0xaa, 0x01, + 0x50, 0xae, 0x55, 0x08, 0xdb, 0x6d, 0xcd, 0xc3, 0x54, 0xc4, 0x3e, 0x09, 0xa2, 0xcf, 0x57, 0x30, + 0xac, 0xbd, 0xb5, 0x9f, 0x2e, 0x26, 0x24, 0x88, 0x3e, 0xaf, 0x20, 0x95, 0x37, 0xf0, 0xc9, 0xbb, + 0xa4, 0x89, 0xf2, 0x0d, 0xc2, 0x48, 0xae, 0x2f, 0x7d, 0x2c, 0x00, 0x2d, 0xbc, 0x26, 0xcf, 0x4d, + 0x12, 0x24, 0x1e, 0x4c, 0xb9, 0x76, 0xcc, 0xff, 0x2c, 0x4a, 0x84, 0x7d, 0x0c, 0xbb, 0xf1, 0xf3, + 0xc2, 0x99, 0x59, 0x46, 0xbb, 0x54, 0xf7, 0x0b, 0x38, 0xed, 0xce, 0xe7, 0x79, 0xe8, 0x24, 0xf0, + 0x2b, 0xc4, 0xac, 0xa1, 0x55, 0x9e, 0x1d, 0x40, 0xb6, 0xca, 0xb3, 0x43, 0x58, 0xe7, 0x1d, 0xd0, + 0x7a, 0xab, 0xf3, 0x0e, 0xdc, 0x87, 0x70, 0x6d, 0x55, 0xaf, 0x56, 0xf8, 0x77, 0x6a, 0xc2, 0x77, + 0x6a, 0xc2, 0x2f, 0xf9, 0x96, 0x77, 0xe8, 0xfc, 0xfa, 0x76, 0xd0, 0x78, 0xf3, 0x76, 0xd0, 0xf8, + 0xfd, 0xed, 0xa0, 0xf1, 0xd3, 0xf9, 0xe0, 0xd2, 0x9b, 0xf3, 0xc1, 0xa5, 0xdf, 0xce, 0x07, 0x97, + 0x26, 0x1d, 0xfa, 0xf4, 0xf3, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x9c, 0xfb, 0x8f, 0x26, 0x80, + 0x0e, 0x00, 0x00, } func (m *Image) Marshal() (dAtA []byte, err error) { @@ -2519,30 +2519,42 @@ i = encodeVarintSdk(dAtA, i, uint64(m.NCharNum)) } if len(m.NCharConfidence) > 0 { + dAtA21 := make([]byte, len(m.NCharConfidence)*10) + var j20 int + for _, num1 := range m.NCharConfidence { + num := uint64(num1) + for num >= 1<<7 { + dAtA21[j20] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j20++ + } + dAtA21[j20] = uint8(num) + j20++ + } dAtA[i] = 0x3a i++ - i = encodeVarintSdk(dAtA, i, uint64(len(m.NCharConfidence))) - i += copy(dAtA[i:], m.NCharConfidence) + i = encodeVarintSdk(dAtA, i, uint64(j20)) + i += copy(dAtA[i:], dAtA21[:j20]) } if m.RcLocation != nil { dAtA[i] = 0x42 i++ i = encodeVarintSdk(dAtA, i, uint64(m.RcLocation.Size())) - n20, err20 := m.RcLocation.MarshalTo(dAtA[i:]) - if err20 != nil { - return 0, err20 + n22, err22 := m.RcLocation.MarshalTo(dAtA[i:]) + if err22 != nil { + return 0, err22 } - i += n20 + i += n22 } if m.RcCarLocation != nil { dAtA[i] = 0x4a i++ i = encodeVarintSdk(dAtA, i, uint64(m.RcCarLocation.Size())) - n21, err21 := m.RcCarLocation.MarshalTo(dAtA[i:]) - if err21 != nil { - return 0, err21 + n23, err23 := m.RcCarLocation.MarshalTo(dAtA[i:]) + if err23 != nil { + return 0, err23 } - i += n21 + i += n23 } if len(m.VehicleType) > 0 { dAtA[i] = 0x52 @@ -3121,9 +3133,12 @@ if m.NCharNum != 0 { n += 1 + sovSdk(uint64(m.NCharNum)) } - l = len(m.NCharConfidence) - if l > 0 { - n += 1 + l + sovSdk(uint64(l)) + if len(m.NCharConfidence) > 0 { + l = 0 + for _, e := range m.NCharConfidence { + l += sovSdk(uint64(e)) + } + n += 1 + sovSdk(uint64(l)) + l } if m.RcLocation != nil { l = m.RcLocation.Size() @@ -6431,39 +6446,81 @@ } } case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field NCharConfidence", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSdk + if wireType == 0 { + var v int32 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSdk + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int32(b&0x7F) << shift + if b < 0x80 { + break + } } - if iNdEx >= l { + m.NCharConfidence = append(m.NCharConfidence, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSdk + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthSdk + } + postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthSdk + } + if postIndex > l { return io.ErrUnexpectedEOF } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(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.NCharConfidence) == 0 { + m.NCharConfidence = make([]int32, 0, elementCount) + } + for iNdEx < postIndex { + var v int32 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSdk + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.NCharConfidence = append(m.NCharConfidence, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field NCharConfidence", wireType) } - if byteLen < 0 { - return ErrInvalidLengthSdk - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthSdk - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.NCharConfidence = append(m.NCharConfidence[:0], dAtA[iNdEx:postIndex]...) - if m.NCharConfidence == nil { - m.NCharConfidence = []byte{} - } - iNdEx = postIndex case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field RcLocation", wireType) -- Gitblit v1.8.0