From 80cf78e0ebea53d79dd2ea87cf5525ff87e0b28f Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 15 十一月 2019 11:05:36 +0800
Subject: [PATCH] add carcolor
---
sdk.pb.go | 211 +++++++++++++++++++++++++++++++---------------------
1 files changed, 124 insertions(+), 87 deletions(-)
diff --git a/sdk.pb.go b/sdk.pb.go
index b669e4b..b1b88cd 100644
--- a/sdk.pb.go
+++ b/sdk.pb.go
@@ -861,14 +861,15 @@
RcLocation *Rect `protobuf:"bytes,8,opt,name=rcLocation,proto3" json:"rcLocation,omitempty"`
NTime int32 `protobuf:"varint,9,opt,name=nTime,proto3" json:"nTime,omitempty"`
NCarBright int32 `protobuf:"varint,10,opt,name=nCarBright,proto3" json:"nCarBright,omitempty"`
- NCarLogo int32 `protobuf:"varint,11,opt,name=nCarLogo,proto3" json:"nCarLogo,omitempty"`
- NCarType int32 `protobuf:"varint,12,opt,name=nCarType,proto3" json:"nCarType,omitempty"`
- PlateBin []byte `protobuf:"bytes,13,opt,name=plateBin,proto3" json:"plateBin,omitempty"`
- NBinPlateWidth []byte `protobuf:"bytes,14,opt,name=nBinPlateWidth,proto3" json:"nBinPlateWidth,omitempty"`
- NBinPlateHeight []byte `protobuf:"bytes,15,opt,name=nBinPlateHeight,proto3" json:"nBinPlateHeight,omitempty"`
- RcLogoLocation *Rect `protobuf:"bytes,16,opt,name=rcLogoLocation,proto3" json:"rcLogoLocation,omitempty"`
- NCarModel []byte `protobuf:"bytes,17,opt,name=nCarModel,proto3" json:"nCarModel,omitempty"`
- NCarModelConfidence []byte `protobuf:"bytes,18,opt,name=nCarModelConfidence,proto3" json:"nCarModelConfidence,omitempty"`
+ NCarColor int32 `protobuf:"varint,11,opt,name=NCarColor,proto3" json:"NCarColor,omitempty"`
+ NCarLogo int32 `protobuf:"varint,12,opt,name=nCarLogo,proto3" json:"nCarLogo,omitempty"`
+ NCarType int32 `protobuf:"varint,13,opt,name=nCarType,proto3" json:"nCarType,omitempty"`
+ PlateBin []byte `protobuf:"bytes,14,opt,name=plateBin,proto3" json:"plateBin,omitempty"`
+ NBinPlateWidth []byte `protobuf:"bytes,15,opt,name=nBinPlateWidth,proto3" json:"nBinPlateWidth,omitempty"`
+ NBinPlateHeight []byte `protobuf:"bytes,16,opt,name=nBinPlateHeight,proto3" json:"nBinPlateHeight,omitempty"`
+ RcLogoLocation *Rect `protobuf:"bytes,17,opt,name=rcLogoLocation,proto3" json:"rcLogoLocation,omitempty"`
+ NCarModel []byte `protobuf:"bytes,18,opt,name=nCarModel,proto3" json:"nCarModel,omitempty"`
+ NCarModelConfidence []byte `protobuf:"bytes,19,opt,name=nCarModelConfidence,proto3" json:"nCarModelConfidence,omitempty"`
}
func (m *PlateID) Reset() { *m = PlateID{} }
@@ -970,6 +971,13 @@
func (m *PlateID) GetNCarBright() int32 {
if m != nil {
return m.NCarBright
+ }
+ return 0
+}
+
+func (m *PlateID) GetNCarColor() int32 {
+ if m != nil {
+ return m.NCarColor
}
return 0
}
@@ -1094,69 +1102,69 @@
func init() { proto.RegisterFile("sdk.proto", fileDescriptor_70decb0fb6f436df) }
var fileDescriptor_70decb0fb6f436df = []byte{
- // 979 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0x4f, 0x6f, 0x1b, 0x45,
- 0x14, 0xcf, 0xda, 0xf1, 0xbf, 0xe7, 0x34, 0x49, 0xa7, 0x15, 0x5a, 0x45, 0xc8, 0xb2, 0x16, 0xd4,
- 0xba, 0xa2, 0x84, 0x2a, 0x20, 0x90, 0x38, 0x41, 0xe2, 0x46, 0xb5, 0x94, 0xb6, 0xd1, 0x50, 0x09,
- 0x71, 0x1c, 0xef, 0x8e, 0xed, 0x49, 0x76, 0x77, 0x96, 0xdd, 0x89, 0x5a, 0x8b, 0x4f, 0xc0, 0x8d,
- 0x8f, 0xc5, 0xb1, 0x37, 0x38, 0xa2, 0x04, 0xbe, 0x07, 0x7a, 0x6f, 0x66, 0xff, 0x34, 0xb8, 0x9c,
- 0x38, 0x72, 0xf2, 0xfc, 0xde, 0xfb, 0xed, 0xbc, 0xff, 0xcf, 0x03, 0x83, 0x22, 0xba, 0x3c, 0xcc,
- 0x72, 0x6d, 0x34, 0xeb, 0xd3, 0x4f, 0x52, 0x2c, 0x0f, 0x60, 0x2e, 0x0a, 0x69, 0xa5, 0xc1, 0xcf,
- 0x1e, 0x74, 0x66, 0x89, 0x58, 0x4a, 0x76, 0x1f, 0x3a, 0xaf, 0x55, 0x64, 0x56, 0xbe, 0x37, 0xf6,
- 0x26, 0x1d, 0x6e, 0x01, 0xfb, 0x00, 0xba, 0x2b, 0xa9, 0x96, 0x2b, 0xe3, 0xb7, 0x48, 0xec, 0x10,
- 0x63, 0xb0, 0x1d, 0x09, 0x23, 0xfc, 0xf6, 0xd8, 0x9b, 0xec, 0x70, 0x3a, 0xb3, 0x0f, 0x61, 0x60,
- 0x54, 0x22, 0x0b, 0x23, 0x92, 0xcc, 0xdf, 0x1e, 0x7b, 0x93, 0x01, 0xaf, 0x05, 0x6c, 0x17, 0x5a,
- 0x2a, 0xf2, 0x3b, 0x63, 0x6f, 0xd2, 0xe6, 0x2d, 0x15, 0xb1, 0x7d, 0x68, 0x87, 0x2a, 0xf2, 0xbb,
- 0xc4, 0xc3, 0x63, 0xb0, 0x84, 0xc1, 0xa9, 0x08, 0xe5, 0xb7, 0xe9, 0x32, 0x96, 0xa8, 0x5e, 0x8b,
- 0xd7, 0xce, 0x19, 0x3c, 0xa2, 0x83, 0x99, 0x32, 0xe1, 0xca, 0x79, 0x62, 0x01, 0x3a, 0x92, 0xeb,
- 0x38, 0x26, 0x47, 0x3a, 0x9c, 0xce, 0x6c, 0x04, 0x10, 0xea, 0x74, 0xa1, 0x22, 0x99, 0x86, 0x92,
- 0x3c, 0x69, 0xf1, 0x86, 0x24, 0x78, 0x03, 0xf0, 0x6a, 0xb5, 0x30, 0x5c, 0x16, 0x57, 0xb1, 0xc1,
- 0x10, 0x97, 0x32, 0x8d, 0x64, 0xee, 0x8c, 0x39, 0x84, 0x1e, 0x88, 0xa5, 0x74, 0xd6, 0xf0, 0x48,
- 0xb6, 0x44, 0x28, 0x2b, 0x5b, 0x22, 0x94, 0xf8, 0xf5, 0x5c, 0x8a, 0x2b, 0xb3, 0x26, 0x3b, 0x1d,
- 0xee, 0x10, 0x7a, 0x5b, 0x24, 0x2a, 0x96, 0x14, 0x71, 0x87, 0x5b, 0x10, 0xfc, 0xd9, 0x82, 0x1e,
- 0xc6, 0x78, 0xae, 0x0b, 0xf6, 0x00, 0xba, 0x79, 0x88, 0x80, 0xec, 0x0e, 0x8f, 0x76, 0x0f, 0xcb,
- 0x0a, 0x1d, 0x72, 0x19, 0x1a, 0xee, 0xb4, 0xec, 0x53, 0x18, 0x64, 0xe6, 0x4c, 0x2e, 0xcc, 0xd3,
- 0xb5, 0xf5, 0x66, 0x78, 0xb4, 0x57, 0x53, 0xcf, 0xb5, 0x4a, 0x0d, 0xaf, 0x19, 0xec, 0x33, 0x80,
- 0xcc, 0x70, 0x2c, 0x12, 0xf2, 0xdb, 0x9b, 0xf9, 0x0d, 0x0a, 0x7b, 0x04, 0xbd, 0xcc, 0x3c, 0xd7,
- 0x57, 0x66, 0x45, 0x21, 0x6c, 0x60, 0x97, 0x7a, 0xf6, 0x10, 0xba, 0x99, 0x79, 0xa1, 0x0b, 0x1b,
- 0xd5, 0x06, 0xa6, 0x53, 0xb3, 0x4f, 0xa0, 0xbb, 0xa0, 0x3a, 0x52, 0x7d, 0x87, 0x47, 0xf7, 0x6a,
- 0x62, 0x55, 0x62, 0xee, 0x28, 0xcc, 0x87, 0xde, 0x8f, 0x57, 0x22, 0x56, 0x66, 0xed, 0xf7, 0x28,
- 0x59, 0x25, 0xc4, 0x42, 0x2e, 0x44, 0xa8, 0x44, 0x3c, 0xc5, 0x5e, 0xeb, 0x53, 0xaf, 0x35, 0x24,
- 0x98, 0xfc, 0x85, 0x08, 0xe5, 0x6c, 0xea, 0x0f, 0xc6, 0xde, 0x64, 0x9b, 0x3b, 0x14, 0xfc, 0xd5,
- 0x82, 0x3e, 0xda, 0x99, 0xa5, 0x0b, 0xfd, 0x7f, 0x9e, 0xff, 0xeb, 0x3c, 0xb7, 0xab, 0x3c, 0x5f,
- 0x42, 0xef, 0xe5, 0xfc, 0x82, 0xb2, 0xfc, 0x31, 0x74, 0xf2, 0xf0, 0xe5, 0xfc, 0xe2, 0x3d, 0x49,
- 0xb6, 0x4a, 0x9c, 0x29, 0xb3, 0xce, 0xca, 0x99, 0x32, 0xeb, 0x0c, 0x67, 0x2a, 0xcb, 0xf5, 0x9c,
- 0x12, 0xd8, 0xe2, 0x74, 0xc6, 0xd9, 0xd1, 0xf3, 0x8b, 0xd9, 0x94, 0xf2, 0xb4, 0xcd, 0x2d, 0x08,
- 0x7e, 0x82, 0x7d, 0x3b, 0xb1, 0x18, 0xd9, 0x54, 0x1a, 0x19, 0x1a, 0xf6, 0x11, 0xb4, 0x33, 0x5d,
- 0x38, 0x9b, 0x77, 0xdf, 0x0d, 0xfe, 0x5c, 0x17, 0x1c, 0xb5, 0xec, 0x31, 0x74, 0x73, 0xfa, 0xd0,
- 0x55, 0xf5, 0x7e, 0xcd, 0xab, 0xd7, 0x00, 0x77, 0x1c, 0x34, 0xbe, 0x90, 0xc2, 0x14, 0x6e, 0xb5,
- 0x59, 0x10, 0x7c, 0x03, 0x3b, 0xe7, 0x22, 0x17, 0x49, 0x39, 0xbc, 0x4f, 0xa0, 0x83, 0x39, 0x40,
- 0xd3, 0xed, 0xc9, 0xf0, 0xe8, 0xa0, 0x19, 0xee, 0xbb, 0x3e, 0x72, 0x4b, 0x0c, 0x2e, 0x9a, 0xee,
- 0x3f, 0x7d, 0x63, 0x4e, 0x74, 0x52, 0xdb, 0xf2, 0x1a, 0xb6, 0x30, 0x25, 0xa1, 0x4e, 0x6c, 0x96,
- 0x76, 0x38, 0x9d, 0xd9, 0x63, 0x1b, 0xa8, 0x6d, 0xb3, 0x7f, 0xb3, 0x86, 0xb4, 0xe0, 0x19, 0xec,
- 0x57, 0xde, 0x9e, 0x4a, 0x61, 0xae, 0x72, 0xc9, 0xbe, 0x80, 0x9e, 0x24, 0xab, 0x78, 0xf1, 0x7b,
- 0x7d, 0xb6, 0x8e, 0xf1, 0x92, 0x1a, 0x7c, 0xe5, 0xe2, 0xfe, 0x41, 0xc7, 0x1a, 0x0b, 0xf8, 0x10,
- 0x3a, 0x2a, 0x5d, 0xe8, 0x32, 0xee, 0x46, 0xca, 0x5d, 0x23, 0x70, 0xab, 0x0f, 0x4e, 0xa1, 0xfb,
- 0x9d, 0xa6, 0xce, 0xb0, 0x8b, 0xdf, 0xa3, 0x3d, 0x8f, 0x8b, 0x1f, 0x37, 0x63, 0x74, 0x39, 0x8b,
- 0x28, 0xbe, 0x01, 0xb7, 0x00, 0x5b, 0xac, 0xd0, 0x2f, 0x44, 0x62, 0x47, 0x69, 0xc0, 0x1d, 0x0a,
- 0x7e, 0xdb, 0x86, 0xde, 0x79, 0x2c, 0x8c, 0x9c, 0x4d, 0xb1, 0x81, 0x63, 0x15, 0xca, 0xb4, 0x90,
- 0xee, 0xba, 0x12, 0xe2, 0x9d, 0xa1, 0x8e, 0x75, 0x5e, 0xde, 0x49, 0x00, 0xef, 0x4c, 0x4f, 0x48,
- 0x6c, 0x37, 0xb6, 0x43, 0xc8, 0x4e, 0x5f, 0xad, 0x33, 0xe9, 0x56, 0xb6, 0x05, 0x6c, 0x0c, 0xc3,
- 0xf4, 0xa4, 0xfe, 0xdb, 0xb0, 0x7b, 0xbb, 0x29, 0x42, 0xfb, 0xe9, 0x71, 0x4e, 0xff, 0x86, 0x5d,
- 0x3b, 0x40, 0x0e, 0xe2, 0x00, 0xa5, 0x53, 0x95, 0xcb, 0xd0, 0x28, 0x9d, 0xba, 0xe9, 0x6a, 0x48,
- 0xd8, 0x21, 0x40, 0x1e, 0x9e, 0xe9, 0x50, 0x90, 0xbe, 0xbf, 0x71, 0x44, 0x1a, 0x0c, 0xeb, 0xa1,
- 0x4a, 0x24, 0xcd, 0x1b, 0x79, 0xa8, 0x12, 0x49, 0x56, 0x4e, 0x44, 0xee, 0x5c, 0x00, 0x67, 0xa5,
- 0x92, 0xb0, 0x03, 0xe8, 0x23, 0x3a, 0xd3, 0x4b, 0xed, 0x0f, 0x49, 0x5b, 0xe1, 0x52, 0x47, 0x61,
- 0xef, 0xd4, 0x3a, 0x8a, 0xfc, 0x00, 0xfa, 0x19, 0xa6, 0xf8, 0x58, 0xa5, 0xfe, 0x1d, 0x6a, 0xba,
- 0x0a, 0xb3, 0x07, 0xb0, 0x9b, 0x1e, 0xab, 0x94, 0x4a, 0xf0, 0x3d, 0xbd, 0x0f, 0x76, 0x89, 0x71,
- 0x4b, 0xca, 0x26, 0xb0, 0x57, 0x49, 0x9e, 0xd9, 0x17, 0xc3, 0x1e, 0x11, 0x6f, 0x8b, 0xd9, 0x97,
- 0xb0, 0x8b, 0x91, 0x2e, 0x75, 0x95, 0x8f, 0xfd, 0x8d, 0xf9, 0xb8, 0xc5, 0xc2, 0xe7, 0x05, 0x7a,
- 0xfc, 0x5c, 0x47, 0x32, 0xf6, 0xef, 0xd2, 0xdd, 0xb5, 0x80, 0x3d, 0x81, 0x7b, 0x15, 0x68, 0x54,
- 0x91, 0x11, 0x6f, 0x93, 0x2a, 0xf8, 0x1a, 0xee, 0xb8, 0xc6, 0x72, 0x0f, 0x81, 0x47, 0xd5, 0x9e,
- 0xf8, 0x47, 0x73, 0x97, 0x44, 0x47, 0x38, 0xf6, 0x7f, 0xbd, 0x1e, 0x79, 0x6f, 0xaf, 0x47, 0xde,
- 0x1f, 0xd7, 0x23, 0xef, 0x97, 0x9b, 0xd1, 0xd6, 0xdb, 0x9b, 0xd1, 0xd6, 0xef, 0x37, 0xa3, 0xad,
- 0x79, 0x97, 0xbe, 0xf9, 0xfc, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb8, 0xdb, 0xc5, 0x0c, 0x7a,
- 0x09, 0x00, 0x00,
+ // 992 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0x4f, 0x6f, 0xdc, 0x44,
+ 0x14, 0x8f, 0x77, 0xe3, 0xfd, 0xf3, 0x36, 0x4d, 0xd2, 0x49, 0x85, 0xac, 0x08, 0xad, 0x56, 0x06,
+ 0xb5, 0x5b, 0x51, 0x42, 0x15, 0x10, 0x48, 0x9c, 0x20, 0xd9, 0x46, 0x5d, 0x29, 0x4d, 0xa3, 0xa1,
+ 0x12, 0xe2, 0x38, 0x6b, 0xcf, 0xee, 0x3a, 0xb1, 0x3d, 0xc6, 0x9e, 0x55, 0xbb, 0xe2, 0x13, 0x70,
+ 0xe3, 0x63, 0x71, 0xec, 0x91, 0x23, 0x4a, 0xe0, 0x23, 0x70, 0x47, 0xef, 0xcd, 0xf8, 0x4f, 0xc3,
+ 0x96, 0x13, 0x47, 0x4e, 0x9e, 0xdf, 0x7b, 0x3f, 0xcf, 0xfb, 0xff, 0x6c, 0xe8, 0x17, 0xe1, 0xf5,
+ 0x51, 0x96, 0x2b, 0xad, 0x58, 0x8f, 0x1e, 0x49, 0xb1, 0x38, 0x84, 0x99, 0x28, 0xa4, 0x91, 0xfa,
+ 0x3f, 0x3b, 0xe0, 0x4e, 0x13, 0xb1, 0x90, 0xec, 0x01, 0xb8, 0xaf, 0xa3, 0x50, 0x2f, 0x3d, 0x67,
+ 0xe4, 0x8c, 0x5d, 0x6e, 0x00, 0xfb, 0x00, 0x3a, 0x4b, 0x19, 0x2d, 0x96, 0xda, 0x6b, 0x91, 0xd8,
+ 0x22, 0xc6, 0x60, 0x3b, 0x14, 0x5a, 0x78, 0xed, 0x91, 0x33, 0xde, 0xe1, 0x74, 0x66, 0x1f, 0x42,
+ 0x5f, 0x47, 0x89, 0x2c, 0xb4, 0x48, 0x32, 0x6f, 0x7b, 0xe4, 0x8c, 0xfb, 0xbc, 0x16, 0xb0, 0x5d,
+ 0x68, 0x45, 0xa1, 0xe7, 0x8e, 0x9c, 0x71, 0x9b, 0xb7, 0xa2, 0x90, 0xed, 0x43, 0x3b, 0x88, 0x42,
+ 0xaf, 0x43, 0x3c, 0x3c, 0xfa, 0x0b, 0xe8, 0x9f, 0x89, 0x40, 0x7e, 0x9b, 0x2e, 0x62, 0x89, 0xea,
+ 0xb5, 0x78, 0x6d, 0x9d, 0xc1, 0x23, 0x3a, 0x98, 0x45, 0x3a, 0x58, 0x5a, 0x4f, 0x0c, 0x40, 0x47,
+ 0x72, 0x15, 0xc7, 0xe4, 0x88, 0xcb, 0xe9, 0xcc, 0x86, 0x00, 0x81, 0x4a, 0xe7, 0x51, 0x28, 0xd3,
+ 0x40, 0x92, 0x27, 0x2d, 0xde, 0x90, 0xf8, 0x6f, 0x00, 0x5e, 0x2d, 0xe7, 0x9a, 0xcb, 0x62, 0x15,
+ 0x6b, 0x0c, 0x71, 0x21, 0xd3, 0x50, 0xe6, 0xd6, 0x98, 0x45, 0xe8, 0x81, 0x58, 0x48, 0x6b, 0x0d,
+ 0x8f, 0x64, 0x4b, 0x04, 0xb2, 0xb2, 0x25, 0x02, 0x89, 0x6f, 0xcf, 0xa4, 0x58, 0xe9, 0x35, 0xd9,
+ 0x71, 0xb9, 0x45, 0xe8, 0x6d, 0x91, 0x44, 0xb1, 0xa4, 0x88, 0x5d, 0x6e, 0x80, 0xff, 0x47, 0x0b,
+ 0xba, 0x18, 0xe3, 0xa5, 0x2a, 0xd8, 0x43, 0xe8, 0xe4, 0x01, 0x02, 0xb2, 0x3b, 0x38, 0xde, 0x3d,
+ 0x2a, 0x2b, 0x74, 0xc4, 0x65, 0xa0, 0xb9, 0xd5, 0xb2, 0x4f, 0xa1, 0x9f, 0xe9, 0x73, 0x39, 0xd7,
+ 0xcf, 0xd6, 0xc6, 0x9b, 0xc1, 0xf1, 0x5e, 0x4d, 0xbd, 0x54, 0x51, 0xaa, 0x79, 0xcd, 0x60, 0x9f,
+ 0x01, 0x64, 0x9a, 0x63, 0x91, 0x90, 0xdf, 0xde, 0xcc, 0x6f, 0x50, 0xd8, 0x63, 0xe8, 0x66, 0xfa,
+ 0x85, 0x5a, 0xe9, 0x25, 0x85, 0xb0, 0x81, 0x5d, 0xea, 0xd9, 0x23, 0xe8, 0x64, 0xfa, 0x42, 0x15,
+ 0x26, 0xaa, 0x0d, 0x4c, 0xab, 0x66, 0x9f, 0x40, 0x67, 0x4e, 0x75, 0xa4, 0xfa, 0x0e, 0x8e, 0x0f,
+ 0x6a, 0x62, 0x55, 0x62, 0x6e, 0x29, 0xcc, 0x83, 0xee, 0x8f, 0x2b, 0x11, 0x47, 0x7a, 0xed, 0x75,
+ 0x29, 0x59, 0x25, 0xc4, 0x42, 0xce, 0x45, 0x10, 0x89, 0x78, 0x82, 0xbd, 0xd6, 0xa3, 0x5e, 0x6b,
+ 0x48, 0x30, 0xf9, 0x73, 0x11, 0xc8, 0xe9, 0xc4, 0xeb, 0x8f, 0x9c, 0xf1, 0x36, 0xb7, 0xc8, 0xff,
+ 0xb3, 0x05, 0x3d, 0xb4, 0x33, 0x4d, 0xe7, 0xea, 0xff, 0x3c, 0xff, 0xd7, 0x79, 0x6e, 0x57, 0x79,
+ 0xbe, 0x86, 0xee, 0xcb, 0xd9, 0x15, 0x65, 0xf9, 0x63, 0x70, 0xf3, 0xe0, 0xe5, 0xec, 0xea, 0x3d,
+ 0x49, 0x36, 0x4a, 0x9c, 0x29, 0xbd, 0xce, 0xca, 0x99, 0xd2, 0xeb, 0x0c, 0x67, 0x2a, 0xcb, 0xd5,
+ 0x8c, 0x12, 0xd8, 0xe2, 0x74, 0xc6, 0xd9, 0x51, 0xb3, 0xab, 0xe9, 0x84, 0xf2, 0xb4, 0xcd, 0x0d,
+ 0xf0, 0x7f, 0x82, 0x7d, 0x33, 0xb1, 0x18, 0xd9, 0x44, 0x6a, 0x19, 0x68, 0xf6, 0x11, 0xb4, 0x33,
+ 0x55, 0x58, 0x9b, 0xf7, 0xdf, 0x0d, 0xfe, 0x52, 0x15, 0x1c, 0xb5, 0xec, 0x09, 0x74, 0x72, 0x7a,
+ 0xd1, 0x56, 0xf5, 0x41, 0xcd, 0xab, 0xd7, 0x00, 0xb7, 0x1c, 0x34, 0x3e, 0x97, 0x42, 0x17, 0x76,
+ 0xb5, 0x19, 0xe0, 0x7f, 0x03, 0x3b, 0x97, 0x22, 0x17, 0x49, 0x39, 0xbc, 0x4f, 0xc1, 0xc5, 0x1c,
+ 0xa0, 0xe9, 0xf6, 0x78, 0x70, 0x7c, 0xd8, 0x0c, 0xf7, 0x5d, 0x1f, 0xb9, 0x21, 0xfa, 0x57, 0x4d,
+ 0xf7, 0x9f, 0xbd, 0xd1, 0xa7, 0x2a, 0xa9, 0x6d, 0x39, 0x0d, 0x5b, 0x98, 0x92, 0x40, 0x25, 0x26,
+ 0x4b, 0x3b, 0x9c, 0xce, 0xec, 0x89, 0x09, 0xd4, 0xb4, 0xd9, 0xbf, 0x59, 0x43, 0x9a, 0xff, 0x1c,
+ 0xf6, 0x2b, 0x6f, 0xcf, 0xa4, 0xd0, 0xab, 0x5c, 0xb2, 0x2f, 0xa0, 0x2b, 0xc9, 0x2a, 0x5e, 0xfc,
+ 0x5e, 0x9f, 0x8d, 0x63, 0xbc, 0xa4, 0xfa, 0x5f, 0xd9, 0xb8, 0x7f, 0x50, 0xb1, 0xc2, 0x02, 0x3e,
+ 0x02, 0x37, 0x4a, 0xe7, 0xaa, 0x8c, 0xbb, 0x91, 0x72, 0xdb, 0x08, 0xdc, 0xe8, 0xfd, 0x33, 0xe8,
+ 0x7c, 0xa7, 0xa8, 0x33, 0xcc, 0xe2, 0x77, 0x68, 0xcf, 0xe3, 0xe2, 0xc7, 0xcd, 0x18, 0x5e, 0x4f,
+ 0x43, 0x8a, 0xaf, 0xcf, 0x0d, 0xc0, 0x16, 0x2b, 0xd4, 0x85, 0x48, 0xcc, 0x28, 0xf5, 0xb9, 0x45,
+ 0xfe, 0x5f, 0xdb, 0xd0, 0xbd, 0x8c, 0x85, 0x96, 0xd3, 0x09, 0x36, 0x70, 0x1c, 0x05, 0x32, 0x2d,
+ 0xa4, 0xbd, 0xae, 0x84, 0x78, 0x67, 0xa0, 0x62, 0x95, 0x97, 0x77, 0x12, 0xc0, 0x3b, 0xd3, 0x53,
+ 0x12, 0x9b, 0x8d, 0x6d, 0x11, 0xb2, 0xd3, 0x57, 0xeb, 0x4c, 0xda, 0x95, 0x6d, 0x00, 0x1b, 0xc1,
+ 0x20, 0x3d, 0xad, 0x3f, 0x1b, 0x66, 0x6f, 0x37, 0x45, 0x68, 0x3f, 0x3d, 0xc9, 0xe9, 0x6b, 0xd8,
+ 0x31, 0x03, 0x64, 0x21, 0x0e, 0x50, 0x3a, 0x89, 0x72, 0x19, 0xe8, 0x48, 0xa5, 0x76, 0xba, 0x1a,
+ 0x12, 0x76, 0x04, 0x90, 0x07, 0xe7, 0x2a, 0x10, 0xa4, 0xef, 0x6d, 0x1c, 0x91, 0x06, 0xc3, 0x78,
+ 0x18, 0x25, 0x92, 0xe6, 0x8d, 0x3c, 0x8c, 0x12, 0x49, 0x56, 0x4e, 0x45, 0x6e, 0x5d, 0x00, 0x6b,
+ 0xa5, 0x92, 0xe0, 0x07, 0xf8, 0xe2, 0x54, 0xe4, 0x26, 0xe4, 0x01, 0xa9, 0x6b, 0x01, 0x3b, 0x84,
+ 0x1e, 0x72, 0xcf, 0xd5, 0x42, 0x79, 0x3b, 0xa4, 0xac, 0x70, 0xa9, 0xa3, 0xa4, 0xdc, 0xab, 0x75,
+ 0x94, 0x97, 0x43, 0xe8, 0x65, 0x58, 0x80, 0x93, 0x28, 0xf5, 0x76, 0xa9, 0x25, 0x2b, 0xcc, 0x1e,
+ 0xc2, 0x6e, 0x7a, 0x12, 0xa5, 0x54, 0xa0, 0xef, 0xe9, 0xef, 0x61, 0x8f, 0x18, 0x77, 0xa4, 0x6c,
+ 0x0c, 0x7b, 0x95, 0xe4, 0xb9, 0xf9, 0x9f, 0xd8, 0x27, 0xe2, 0x5d, 0x31, 0xfb, 0x12, 0x76, 0x31,
+ 0x0f, 0x0b, 0x55, 0x65, 0xeb, 0xfe, 0xc6, 0x6c, 0xdd, 0x61, 0x61, 0xec, 0xe8, 0xf1, 0x0b, 0x15,
+ 0xca, 0xd8, 0x63, 0x74, 0x77, 0x2d, 0x60, 0x4f, 0xe1, 0xa0, 0x02, 0x8d, 0x1a, 0x1f, 0x10, 0x6f,
+ 0x93, 0xca, 0xff, 0x1a, 0xee, 0xd9, 0xb6, 0xb3, 0xbf, 0x09, 0x8f, 0xab, 0x2d, 0xf2, 0x8f, 0xd6,
+ 0x2f, 0x89, 0x96, 0x70, 0xe2, 0xfd, 0x7a, 0x33, 0x74, 0xde, 0xde, 0x0c, 0x9d, 0xdf, 0x6f, 0x86,
+ 0xce, 0x2f, 0xb7, 0xc3, 0xad, 0xb7, 0xb7, 0xc3, 0xad, 0xdf, 0x6e, 0x87, 0x5b, 0xb3, 0x0e, 0xbd,
+ 0xf3, 0xf9, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x6b, 0x7d, 0x39, 0x98, 0x09, 0x00, 0x00,
}
func (m *Image) Marshal() (dAtA []byte, err error) {
@@ -1806,36 +1814,43 @@
i++
i = encodeVarintSdk(dAtA, i, uint64(m.NCarBright))
}
- if m.NCarLogo != 0 {
+ if m.NCarColor != 0 {
dAtA[i] = 0x58
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(m.NCarColor))
+ }
+ if m.NCarLogo != 0 {
+ dAtA[i] = 0x60
i++
i = encodeVarintSdk(dAtA, i, uint64(m.NCarLogo))
}
if m.NCarType != 0 {
- dAtA[i] = 0x60
+ dAtA[i] = 0x68
i++
i = encodeVarintSdk(dAtA, i, uint64(m.NCarType))
}
if len(m.PlateBin) > 0 {
- dAtA[i] = 0x6a
+ dAtA[i] = 0x72
i++
i = encodeVarintSdk(dAtA, i, uint64(len(m.PlateBin)))
i += copy(dAtA[i:], m.PlateBin)
}
if len(m.NBinPlateWidth) > 0 {
- dAtA[i] = 0x72
+ dAtA[i] = 0x7a
i++
i = encodeVarintSdk(dAtA, i, uint64(len(m.NBinPlateWidth)))
i += copy(dAtA[i:], m.NBinPlateWidth)
}
if len(m.NBinPlateHeight) > 0 {
- dAtA[i] = 0x7a
+ dAtA[i] = 0x82
+ i++
+ dAtA[i] = 0x1
i++
i = encodeVarintSdk(dAtA, i, uint64(len(m.NBinPlateHeight)))
i += copy(dAtA[i:], m.NBinPlateHeight)
}
if m.RcLogoLocation != nil {
- dAtA[i] = 0x82
+ dAtA[i] = 0x8a
i++
dAtA[i] = 0x1
i++
@@ -1847,7 +1862,7 @@
i += n18
}
if len(m.NCarModel) > 0 {
- dAtA[i] = 0x8a
+ dAtA[i] = 0x92
i++
dAtA[i] = 0x1
i++
@@ -1855,7 +1870,7 @@
i += copy(dAtA[i:], m.NCarModel)
}
if len(m.NCarModelConfidence) > 0 {
- dAtA[i] = 0x92
+ dAtA[i] = 0x9a
i++
dAtA[i] = 0x1
i++
@@ -2234,6 +2249,9 @@
if m.NCarBright != 0 {
n += 1 + sovSdk(uint64(m.NCarBright))
}
+ if m.NCarColor != 0 {
+ n += 1 + sovSdk(uint64(m.NCarColor))
+ }
if m.NCarLogo != 0 {
n += 1 + sovSdk(uint64(m.NCarLogo))
}
@@ -2250,7 +2268,7 @@
}
l = len(m.NBinPlateHeight)
if l > 0 {
- n += 1 + l + sovSdk(uint64(l))
+ n += 2 + l + sovSdk(uint64(l))
}
if m.RcLogoLocation != nil {
l = m.RcLogoLocation.Size()
@@ -4582,6 +4600,25 @@
}
case 11:
if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field NCarColor", wireType)
+ }
+ m.NCarColor = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSdk
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.NCarColor |= int32(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ case 12:
+ if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field NCarLogo", wireType)
}
m.NCarLogo = 0
@@ -4599,7 +4636,7 @@
break
}
}
- case 12:
+ case 13:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field NCarType", wireType)
}
@@ -4618,7 +4655,7 @@
break
}
}
- case 13:
+ case 14:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PlateBin", wireType)
}
@@ -4652,7 +4689,7 @@
m.PlateBin = []byte{}
}
iNdEx = postIndex
- case 14:
+ case 15:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field NBinPlateWidth", wireType)
}
@@ -4686,7 +4723,7 @@
m.NBinPlateWidth = []byte{}
}
iNdEx = postIndex
- case 15:
+ case 16:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field NBinPlateHeight", wireType)
}
@@ -4720,7 +4757,7 @@
m.NBinPlateHeight = []byte{}
}
iNdEx = postIndex
- case 16:
+ case 17:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field RcLogoLocation", wireType)
}
@@ -4756,7 +4793,7 @@
return err
}
iNdEx = postIndex
- case 17:
+ case 18:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field NCarModel", wireType)
}
@@ -4790,7 +4827,7 @@
m.NCarModel = []byte{}
}
iNdEx = postIndex
- case 18:
+ case 19:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field NCarModelConfidence", wireType)
}
--
Gitblit v1.8.0