From 950d89112665bead13fa79ae7e37b8addc188ca8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 13 十月 2020 10:47:43 +0800
Subject: [PATCH] isTriggerByPreSdk set 0:非触发，1：必要触发，2：非必要触发
---
es.pb.go | 482 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 435 insertions(+), 47 deletions(-)
diff --git a/es.pb.go b/es.pb.go
index c4da703..014f371 100644
--- a/es.pb.go
+++ b/es.pb.go
@@ -30,6 +30,7 @@
CompareScore float32 `protobuf:"fixed32,4,opt,name=compareScore,proto3" json:"compareScore,omitempty"`
Enable int32 `protobuf:"varint,5,opt,name=enable,proto3" json:"enable,omitempty"`
AnalyServerId string `protobuf:"bytes,6,opt,name=analyServerId,proto3" json:"analyServerId,omitempty"`
+ CarNo string `protobuf:"bytes,7,opt,name=carNo,proto3" json:"carNo,omitempty"`
}
func (m *Esinfo) Reset() { *m = Esinfo{} }
@@ -107,11 +108,19 @@
return ""
}
+func (m *Esinfo) GetCarNo() string {
+ if m != nil {
+ return m.CarNo
+ }
+ return ""
+}
+
type MultiFeaCache struct {
- EsInfo *Esinfo `protobuf:"bytes,1,opt,name=esInfo,proto3" json:"esInfo,omitempty"`
- AttachFeature string `protobuf:"bytes,2,opt,name=attachFeature,proto3" json:"attachFeature,omitempty"`
- CameraId string `protobuf:"bytes,3,opt,name=cameraId,proto3" json:"cameraId,omitempty"`
- LinkEsInfo []*LinkEsInfo `protobuf:"bytes,4,rep,name=linkEsInfo,proto3" json:"linkEsInfo,omitempty"`
+ EsInfo *Esinfo `protobuf:"bytes,1,opt,name=esInfo,proto3" json:"esInfo,omitempty"`
+ AttachFeature string `protobuf:"bytes,2,opt,name=attachFeature,proto3" json:"attachFeature,omitempty"`
+ CameraId string `protobuf:"bytes,3,opt,name=cameraId,proto3" json:"cameraId,omitempty"`
+ LinkEsInfo []*LinkEsInfo `protobuf:"bytes,4,rep,name=linkEsInfo,proto3" json:"linkEsInfo,omitempty"`
+ TargetLocation *TargetLocation `protobuf:"bytes,5,opt,name=targetLocation,proto3" json:"targetLocation,omitempty"`
}
func (m *MultiFeaCache) Reset() { *m = MultiFeaCache{} }
@@ -175,10 +184,18 @@
return nil
}
+func (m *MultiFeaCache) GetTargetLocation() *TargetLocation {
+ if m != nil {
+ return m.TargetLocation
+ }
+ return nil
+}
+
type LinkEsInfo struct {
- CameraId string `protobuf:"bytes,1,opt,name=cameraId,proto3" json:"cameraId,omitempty"`
- Feature string `protobuf:"bytes,2,opt,name=feature,proto3" json:"feature,omitempty"`
- AttachFeature string `protobuf:"bytes,3,opt,name=attachFeature,proto3" json:"attachFeature,omitempty"`
+ CameraId string `protobuf:"bytes,1,opt,name=cameraId,proto3" json:"cameraId,omitempty"`
+ Feature string `protobuf:"bytes,2,opt,name=feature,proto3" json:"feature,omitempty"`
+ AttachFeature string `protobuf:"bytes,3,opt,name=attachFeature,proto3" json:"attachFeature,omitempty"`
+ TargetLocation *TargetLocation `protobuf:"bytes,4,opt,name=targetLocation,proto3" json:"targetLocation,omitempty"`
}
func (m *LinkEsInfo) Reset() { *m = LinkEsInfo{} }
@@ -235,6 +252,13 @@
return ""
}
+func (m *LinkEsInfo) GetTargetLocation() *TargetLocation {
+ if m != nil {
+ return m.TargetLocation
+ }
+ return nil
+}
+
type Dbperson struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
TableId string `protobuf:"bytes,2,opt,name=tableId,proto3" json:"tableId,omitempty"`
@@ -253,6 +277,11 @@
MonitorLevel string `protobuf:"bytes,15,opt,name=monitorLevel,proto3" json:"monitorLevel,omitempty"`
Enable int32 `protobuf:"varint,16,opt,name=enable,proto3" json:"enable,omitempty"`
Reserved string `protobuf:"bytes,17,opt,name=reserved,proto3" json:"reserved,omitempty"`
+ CarNo string `protobuf:"bytes,18,opt,name=carNo,proto3" json:"carNo,omitempty"`
+ CarPicUrls string `protobuf:"bytes,19,opt,name=carPicUrls,proto3" json:"carPicUrls,omitempty"`
+ CarType int32 `protobuf:"varint,20,opt,name=carType,proto3" json:"carType,omitempty"`
+ CarBrand int32 `protobuf:"varint,21,opt,name=carBrand,proto3" json:"carBrand,omitempty"`
+ CarColor int32 `protobuf:"varint,22,opt,name=carColor,proto3" json:"carColor,omitempty"`
}
func (m *Dbperson) Reset() { *m = Dbperson{} }
@@ -405,6 +434,41 @@
return m.Reserved
}
return ""
+}
+
+func (m *Dbperson) GetCarNo() string {
+ if m != nil {
+ return m.CarNo
+ }
+ return ""
+}
+
+func (m *Dbperson) GetCarPicUrls() string {
+ if m != nil {
+ return m.CarPicUrls
+ }
+ return ""
+}
+
+func (m *Dbperson) GetCarType() int32 {
+ if m != nil {
+ return m.CarType
+ }
+ return 0
+}
+
+func (m *Dbperson) GetCarBrand() int32 {
+ if m != nil {
+ return m.CarBrand
+ }
+ return 0
+}
+
+func (m *Dbperson) GetCarColor() int32 {
+ if m != nil {
+ return m.CarColor
+ }
+ return 0
}
type Dbtable struct {
@@ -574,46 +638,53 @@
func init() { proto.RegisterFile("es.proto", fileDescriptor_718db5c20d0f3738) }
var fileDescriptor_718db5c20d0f3738 = []byte{
- // 624 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xcd, 0x4e, 0xdb, 0x4e,
- 0x14, 0xc5, 0x71, 0x0c, 0x89, 0x7d, 0x43, 0x80, 0xff, 0xe8, 0xaf, 0x6a, 0x84, 0x90, 0x15, 0x45,
- 0x5d, 0x64, 0xc5, 0x82, 0xf6, 0x09, 0x20, 0x20, 0x45, 0xa2, 0xa8, 0x32, 0xf4, 0x01, 0x26, 0xf6,
- 0x0d, 0x19, 0xd5, 0x5f, 0x9a, 0x71, 0x28, 0x79, 0x8b, 0xbe, 0x49, 0xd5, 0x4d, 0x9f, 0xa1, 0x4b,
- 0x96, 0x5d, 0x74, 0x51, 0xc1, 0x8b, 0x54, 0xf3, 0xe1, 0xd8, 0x06, 0x4a, 0xbb, 0x4a, 0xce, 0x39,
- 0xf6, 0xcc, 0x9d, 0xfb, 0xbb, 0x1e, 0xf0, 0x50, 0x1e, 0x16, 0x22, 0x2f, 0x73, 0xe2, 0xe9, 0x9f,
- 0x54, 0x5e, 0x8f, 0xbe, 0x39, 0xd0, 0x3d, 0x95, 0x3c, 0x9b, 0xe7, 0x64, 0x07, 0x3a, 0x3c, 0xa6,
- 0xce, 0xd0, 0x19, 0xfb, 0x61, 0x87, 0xc7, 0x84, 0x42, 0xaf, 0x64, 0xb3, 0x04, 0x79, 0x4c, 0x3b,
- 0xda, 0xac, 0x24, 0x19, 0x42, 0x7f, 0xce, 0x22, 0x3c, 0x43, 0x56, 0x2e, 0x05, 0x52, 0x57, 0xa7,
- 0x4d, 0x8b, 0x8c, 0x60, 0x3b, 0xca, 0xd3, 0x82, 0x09, 0xbc, 0x8c, 0x72, 0x81, 0x74, 0x73, 0xe8,
- 0x8c, 0x3b, 0x61, 0xcb, 0x23, 0xaf, 0xa0, 0x8b, 0x99, 0x5a, 0x91, 0x6e, 0x0d, 0x9d, 0xf1, 0x56,
- 0x68, 0x15, 0x79, 0x0d, 0x03, 0x96, 0xb1, 0x64, 0x75, 0x89, 0xe2, 0x06, 0xc5, 0x34, 0xa6, 0x5d,
- 0xbd, 0x7e, 0xdb, 0x1c, 0x7d, 0x75, 0x60, 0xf0, 0x6e, 0x99, 0x94, 0xfc, 0x0c, 0xd9, 0x09, 0x8b,
- 0x16, 0x48, 0xc6, 0xd0, 0x45, 0x39, 0xcd, 0xe6, 0xb9, 0x3e, 0x43, 0xff, 0x68, 0xef, 0xb0, 0x3a,
- 0xe5, 0xa1, 0x39, 0x61, 0x68, 0x73, 0xbd, 0x43, 0x59, 0xb2, 0x68, 0x51, 0x9d, 0xa0, 0x63, 0x77,
- 0x68, 0x9a, 0x64, 0x1f, 0xbc, 0x88, 0xa5, 0x28, 0xd8, 0x34, 0xb6, 0x47, 0x5c, 0x6b, 0xf2, 0x16,
- 0x20, 0xe1, 0xd9, 0xc7, 0x53, 0xb3, 0xdf, 0xe6, 0xd0, 0x1d, 0xf7, 0x8f, 0xfe, 0xaf, 0xf7, 0x3b,
- 0x5f, 0x67, 0x61, 0xe3, 0xb9, 0xd1, 0x02, 0xa0, 0x4e, 0x5a, 0xeb, 0x3b, 0x8f, 0xd6, 0xa7, 0xd0,
- 0x9b, 0xb7, 0x6a, 0xab, 0xe4, 0xd3, 0xda, 0xdd, 0x67, 0x6a, 0x1f, 0xfd, 0x74, 0xc1, 0x9b, 0xcc,
- 0x0a, 0x14, 0x32, 0xcf, 0xfe, 0x08, 0x76, 0xda, 0x06, 0x3b, 0xfd, 0x47, 0xb0, 0x66, 0xd5, 0xf7,
- 0x3c, 0xfa, 0x20, 0x12, 0x0d, 0xd6, 0x0f, 0x5b, 0x1e, 0x09, 0x00, 0x8c, 0xbe, 0x60, 0xa9, 0x81,
- 0xeb, 0x87, 0x0d, 0x87, 0xec, 0x81, 0xcb, 0xae, 0xd1, 0x62, 0x55, 0x7f, 0x95, 0x23, 0xf1, 0x96,
- 0xf6, 0x8c, 0x23, 0xf1, 0x56, 0x0d, 0x07, 0x8f, 0x4f, 0x98, 0x88, 0xa9, 0xa7, 0x4d, 0xab, 0x54,
- 0xed, 0x05, 0x8f, 0x26, 0x28, 0x23, 0xea, 0x9b, 0xda, 0xad, 0x54, 0xed, 0x2c, 0x16, 0x79, 0x86,
- 0x17, 0xcb, 0x94, 0x82, 0x69, 0x67, 0xa5, 0x55, 0x45, 0x91, 0x40, 0x56, 0xe2, 0x15, 0x4f, 0x91,
- 0xf6, 0x4d, 0x45, 0xb5, 0xa3, 0xf2, 0x65, 0x11, 0x57, 0xf9, 0xb6, 0xc9, 0x6b, 0x47, 0xa3, 0xd2,
- 0x4f, 0x1f, 0xaf, 0xe8, 0xc0, 0xa2, 0xb2, 0x5a, 0x65, 0x5c, 0x4e, 0x30, 0xc1, 0x12, 0xe9, 0x8e,
- 0x1e, 0xe4, 0xb5, 0x56, 0xdd, 0x4a, 0xf3, 0x8c, 0x97, 0xb9, 0x38, 0xc7, 0x1b, 0x4c, 0xe8, 0xae,
- 0xe9, 0x56, 0xd3, 0x6b, 0x7c, 0x06, 0x7b, 0xad, 0xcf, 0x60, 0x1f, 0x3c, 0x81, 0x52, 0x8d, 0x7b,
- 0x4c, 0xff, 0x33, 0x7b, 0x56, 0x7a, 0xf4, 0xc5, 0x85, 0xde, 0x64, 0xa6, 0xa9, 0x3d, 0xa1, 0x7b,
- 0x00, 0xbe, 0x0e, 0x74, 0xf3, 0x0d, 0xdf, 0xda, 0x58, 0xa7, 0xba, 0x83, 0x6e, 0x23, 0xd5, 0x3d,
- 0xac, 0xd2, 0xab, 0x55, 0x81, 0x16, 0x6d, 0x6d, 0xa8, 0x4a, 0x67, 0x9f, 0x74, 0x64, 0x98, 0x5a,
- 0xa5, 0xde, 0x92, 0x25, 0x13, 0xa5, 0x6e, 0x9e, 0xa1, 0x5a, 0x1b, 0x8a, 0x18, 0x66, 0xb1, 0xce,
- 0x0c, 0xdf, 0x4a, 0x3e, 0xa2, 0xe2, 0xfd, 0x85, 0x8a, 0xff, 0x22, 0x15, 0x78, 0x81, 0x4a, 0xff,
- 0x11, 0x95, 0x03, 0xf0, 0xb9, 0x3c, 0xcb, 0x05, 0xde, 0xa0, 0xb0, 0xb0, 0x6b, 0xa3, 0xc1, 0x63,
- 0xd0, 0xe2, 0xa1, 0x26, 0x52, 0x5e, 0xae, 0xb2, 0x48, 0x53, 0x56, 0x13, 0xa9, 0xd5, 0xd3, 0xeb,
- 0x6a, 0xf7, 0x99, 0xeb, 0xea, 0x98, 0x7e, 0xbf, 0x0f, 0x9c, 0xbb, 0xfb, 0xc0, 0xf9, 0x75, 0x1f,
- 0x38, 0x9f, 0x1f, 0x82, 0x8d, 0xbb, 0x87, 0x60, 0xe3, 0xc7, 0x43, 0xb0, 0x31, 0xeb, 0xea, 0x5b,
- 0xe3, 0xcd, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6d, 0xfd, 0x87, 0xc8, 0x9e, 0x05, 0x00, 0x00,
+ // 732 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x4e, 0xdb, 0x4a,
+ 0x14, 0xc6, 0x49, 0xc8, 0xcf, 0x09, 0x01, 0xee, 0x5c, 0x2e, 0x1a, 0x21, 0x14, 0x45, 0xd1, 0x5d,
+ 0x64, 0xc5, 0x82, 0x7b, 0x1f, 0xa0, 0x82, 0x80, 0x14, 0x89, 0xa2, 0xca, 0xd0, 0x07, 0x98, 0x8c,
+ 0x4f, 0x60, 0x54, 0xc7, 0x13, 0x8d, 0x1d, 0xda, 0xbc, 0x45, 0x9f, 0xa3, 0x9b, 0xbe, 0x46, 0x17,
+ 0x5d, 0xb0, 0xec, 0xb2, 0x82, 0xbe, 0x41, 0x5f, 0xa0, 0x9a, 0x33, 0x76, 0x6c, 0x27, 0x94, 0xb6,
+ 0xab, 0xe4, 0xfb, 0x3e, 0x7b, 0xce, 0xf9, 0xe6, 0x7c, 0xc7, 0xd0, 0xc4, 0xf8, 0x68, 0x66, 0x74,
+ 0xa2, 0x59, 0x93, 0x7e, 0xa6, 0xf1, 0xcd, 0x41, 0x47, 0x28, 0x2d, 0x51, 0x44, 0x4e, 0xe8, 0x7f,
+ 0xf6, 0xa0, 0x7e, 0x16, 0xab, 0x68, 0xa2, 0xd9, 0x36, 0x54, 0x54, 0xc0, 0xbd, 0x9e, 0x37, 0x68,
+ 0xf9, 0x15, 0x15, 0x30, 0x0e, 0x8d, 0x44, 0x8c, 0x43, 0x54, 0x01, 0xaf, 0x10, 0x99, 0x41, 0xd6,
+ 0x83, 0xf6, 0x44, 0x48, 0x3c, 0x47, 0x91, 0xcc, 0x0d, 0xf2, 0x2a, 0xa9, 0x45, 0x8a, 0xf5, 0x61,
+ 0x4b, 0xea, 0xe9, 0x4c, 0x18, 0xbc, 0x92, 0xda, 0x20, 0xaf, 0xf5, 0xbc, 0x41, 0xc5, 0x2f, 0x71,
+ 0x6c, 0x1f, 0xea, 0x18, 0xd9, 0x13, 0xf9, 0x66, 0xcf, 0x1b, 0x6c, 0xfa, 0x29, 0x62, 0xff, 0x42,
+ 0x47, 0x44, 0x22, 0x5c, 0x5c, 0xa1, 0xb9, 0x43, 0x33, 0x0a, 0x78, 0x9d, 0xce, 0x2f, 0x93, 0x6c,
+ 0x0f, 0x36, 0xa5, 0x30, 0x97, 0x9a, 0x37, 0x48, 0x75, 0xa0, 0xff, 0xdd, 0x83, 0xce, 0xcb, 0x79,
+ 0x98, 0xa8, 0x73, 0x14, 0xa7, 0x42, 0xde, 0x22, 0x1b, 0x40, 0x1d, 0xe3, 0x51, 0x34, 0xd1, 0xe4,
+ 0xac, 0x7d, 0xbc, 0x7b, 0x94, 0x5d, 0xc5, 0x91, 0xf3, 0xed, 0xa7, 0x3a, 0xd5, 0x4d, 0x12, 0x21,
+ 0x6f, 0x33, 0x5f, 0x95, 0xb4, 0x6e, 0x91, 0x64, 0x07, 0xd0, 0x94, 0x62, 0x8a, 0x46, 0x8c, 0x82,
+ 0xd4, 0xf8, 0x12, 0xb3, 0xff, 0x01, 0x42, 0x15, 0xbd, 0x39, 0x73, 0xf5, 0x6a, 0xbd, 0xea, 0xa0,
+ 0x7d, 0xbc, 0x97, 0xd7, 0xbb, 0x58, 0x6a, 0x7e, 0xe1, 0x39, 0xf6, 0x02, 0xb6, 0x13, 0x61, 0x6e,
+ 0x30, 0xb9, 0xd0, 0x52, 0x24, 0x4a, 0x47, 0x74, 0x1f, 0xed, 0x63, 0x9e, 0xbf, 0x79, 0x5d, 0xd2,
+ 0xfd, 0x95, 0xe7, 0xfb, 0x1f, 0x3c, 0x80, 0xfc, 0xf0, 0x52, 0x8b, 0xde, 0x4a, 0x8b, 0x1c, 0x1a,
+ 0x93, 0x92, 0xbd, 0x0c, 0xae, 0xdb, 0xaf, 0x3e, 0x65, 0x7f, 0xbd, 0xd9, 0xda, 0x1f, 0x36, 0xfb,
+ 0xad, 0x06, 0xcd, 0xe1, 0x78, 0x86, 0x26, 0xd6, 0xd1, 0x4f, 0x33, 0x37, 0x2a, 0x67, 0x6e, 0xf4,
+ 0x9b, 0x99, 0x73, 0xa7, 0xbe, 0x52, 0xf2, 0xb5, 0x09, 0xa9, 0xb1, 0x96, 0x5f, 0xe2, 0x58, 0x17,
+ 0xc0, 0xe1, 0x4b, 0x31, 0x75, 0xb9, 0x6b, 0xf9, 0x05, 0x86, 0xed, 0x42, 0x55, 0xdc, 0x60, 0x9a,
+ 0x38, 0xfb, 0xd7, 0x32, 0x31, 0xbe, 0x4b, 0x53, 0x66, 0xff, 0xda, 0xdc, 0xaa, 0xe0, 0x54, 0x98,
+ 0x80, 0x37, 0x89, 0x4c, 0x91, 0xed, 0x7d, 0xa6, 0xe4, 0x10, 0x63, 0xc9, 0x5b, 0xae, 0xf7, 0x14,
+ 0xda, 0x81, 0xcc, 0x6e, 0x75, 0x84, 0x97, 0xf3, 0x29, 0x07, 0x37, 0x90, 0x0c, 0xdb, 0x8e, 0xa4,
+ 0x41, 0x91, 0xe0, 0xb5, 0x9a, 0x22, 0x6f, 0xbb, 0x8e, 0x72, 0xc6, 0xea, 0xf3, 0x59, 0x90, 0xe9,
+ 0x5b, 0x4e, 0xcf, 0x19, 0x1a, 0x36, 0x3d, 0x7d, 0xb2, 0xe0, 0x9d, 0x74, 0xd8, 0x29, 0xb6, 0x9a,
+ 0x8a, 0x87, 0x18, 0x62, 0x82, 0x7c, 0x9b, 0x76, 0x6c, 0x89, 0xed, 0x6d, 0x4d, 0x75, 0xa4, 0x12,
+ 0x6d, 0x2e, 0xf0, 0x0e, 0x43, 0xbe, 0xe3, 0x6e, 0xab, 0xc8, 0x15, 0x36, 0x74, 0xb7, 0xb4, 0xa1,
+ 0x07, 0xd0, 0x34, 0x18, 0xdb, 0x4d, 0x0c, 0xf8, 0x5f, 0xae, 0x66, 0x86, 0xf3, 0xbd, 0x64, 0x85,
+ 0xbd, 0x24, 0x97, 0xc2, 0xb8, 0x21, 0xc4, 0xfc, 0xef, 0xd4, 0xe5, 0x92, 0xb1, 0x77, 0x27, 0x85,
+ 0xb9, 0x5e, 0xcc, 0x90, 0xef, 0x51, 0xa9, 0x0c, 0xba, 0x30, 0x9b, 0x13, 0x23, 0xa2, 0x80, 0xff,
+ 0xe3, 0x3c, 0x64, 0x38, 0xd5, 0x4e, 0x75, 0xa8, 0x0d, 0xdf, 0x5f, 0x6a, 0x84, 0xfb, 0x1f, 0xab,
+ 0xd0, 0x18, 0x8e, 0x29, 0x3d, 0x6b, 0x29, 0x3b, 0x84, 0x16, 0x09, 0x14, 0x02, 0x97, 0xb3, 0x9c,
+ 0x58, 0xaa, 0x34, 0xc9, 0x6a, 0x41, 0xa5, 0x59, 0x66, 0x2a, 0xf5, 0x5a, 0x2b, 0xa8, 0xd4, 0xed,
+ 0x3e, 0xd4, 0xc7, 0x6f, 0x49, 0x72, 0xd9, 0x4a, 0x91, 0x7d, 0x2b, 0x4e, 0x84, 0x49, 0x68, 0x88,
+ 0x2e, 0x5d, 0x39, 0x61, 0xdd, 0x63, 0x14, 0x90, 0xe6, 0x72, 0x96, 0xc1, 0x95, 0x74, 0x34, 0x7f,
+ 0x91, 0x8e, 0xd6, 0xb3, 0xe9, 0x80, 0x67, 0xd2, 0xd1, 0x5e, 0x49, 0xc7, 0x21, 0xb4, 0x54, 0x7c,
+ 0xae, 0x0d, 0xde, 0xa1, 0x49, 0x43, 0x97, 0x13, 0x85, 0x5c, 0x74, 0x4a, 0xb9, 0xb0, 0x9b, 0x11,
+ 0x5f, 0x2d, 0x22, 0x49, 0x69, 0xb3, 0x9b, 0x41, 0x68, 0xfd, 0x8b, 0xbe, 0xf3, 0xc4, 0x17, 0xfd,
+ 0x84, 0x7f, 0x7a, 0xe8, 0x7a, 0xf7, 0x0f, 0x5d, 0xef, 0xeb, 0x43, 0xd7, 0x7b, 0xff, 0xd8, 0xdd,
+ 0xb8, 0x7f, 0xec, 0x6e, 0x7c, 0x79, 0xec, 0x6e, 0x8c, 0xeb, 0xf4, 0x6d, 0xf9, 0xef, 0x47, 0x00,
+ 0x00, 0x00, 0xff, 0xff, 0x61, 0x99, 0xc4, 0x66, 0xd0, 0x06, 0x00, 0x00,
}
func (m *Esinfo) Marshal() (dAtA []byte, err error) {
@@ -665,6 +736,12 @@
i++
i = encodeVarintEs(dAtA, i, uint64(len(m.AnalyServerId)))
i += copy(dAtA[i:], m.AnalyServerId)
+ }
+ if len(m.CarNo) > 0 {
+ dAtA[i] = 0x3a
+ i++
+ i = encodeVarintEs(dAtA, i, uint64(len(m.CarNo)))
+ i += copy(dAtA[i:], m.CarNo)
}
return i, nil
}
@@ -718,6 +795,16 @@
i += n
}
}
+ if m.TargetLocation != nil {
+ dAtA[i] = 0x2a
+ i++
+ i = encodeVarintEs(dAtA, i, uint64(m.TargetLocation.Size()))
+ n2, err2 := m.TargetLocation.MarshalTo(dAtA[i:])
+ if err2 != nil {
+ return 0, err2
+ }
+ i += n2
+ }
return i, nil
}
@@ -753,6 +840,16 @@
i++
i = encodeVarintEs(dAtA, i, uint64(len(m.AttachFeature)))
i += copy(dAtA[i:], m.AttachFeature)
+ }
+ if m.TargetLocation != nil {
+ dAtA[i] = 0x22
+ i++
+ i = encodeVarintEs(dAtA, i, uint64(m.TargetLocation.Size()))
+ n3, err3 := m.TargetLocation.MarshalTo(dAtA[i:])
+ if err3 != nil {
+ return 0, err3
+ }
+ i += n3
}
return i, nil
}
@@ -875,6 +972,43 @@
i++
i = encodeVarintEs(dAtA, i, uint64(len(m.Reserved)))
i += copy(dAtA[i:], m.Reserved)
+ }
+ if len(m.CarNo) > 0 {
+ dAtA[i] = 0x92
+ i++
+ dAtA[i] = 0x1
+ i++
+ i = encodeVarintEs(dAtA, i, uint64(len(m.CarNo)))
+ i += copy(dAtA[i:], m.CarNo)
+ }
+ if len(m.CarPicUrls) > 0 {
+ dAtA[i] = 0x9a
+ i++
+ dAtA[i] = 0x1
+ i++
+ i = encodeVarintEs(dAtA, i, uint64(len(m.CarPicUrls)))
+ i += copy(dAtA[i:], m.CarPicUrls)
+ }
+ if m.CarType != 0 {
+ dAtA[i] = 0xa0
+ i++
+ dAtA[i] = 0x1
+ i++
+ i = encodeVarintEs(dAtA, i, uint64(m.CarType))
+ }
+ if m.CarBrand != 0 {
+ dAtA[i] = 0xa8
+ i++
+ dAtA[i] = 0x1
+ i++
+ i = encodeVarintEs(dAtA, i, uint64(m.CarBrand))
+ }
+ if m.CarColor != 0 {
+ dAtA[i] = 0xb0
+ i++
+ dAtA[i] = 0x1
+ i++
+ i = encodeVarintEs(dAtA, i, uint64(m.CarColor))
}
return i, nil
}
@@ -1022,6 +1156,10 @@
if l > 0 {
n += 1 + l + sovEs(uint64(l))
}
+ l = len(m.CarNo)
+ if l > 0 {
+ n += 1 + l + sovEs(uint64(l))
+ }
return n
}
@@ -1049,6 +1187,10 @@
n += 1 + l + sovEs(uint64(l))
}
}
+ if m.TargetLocation != nil {
+ l = m.TargetLocation.Size()
+ n += 1 + l + sovEs(uint64(l))
+ }
return n
}
@@ -1068,6 +1210,10 @@
}
l = len(m.AttachFeature)
if l > 0 {
+ n += 1 + l + sovEs(uint64(l))
+ }
+ if m.TargetLocation != nil {
+ l = m.TargetLocation.Size()
n += 1 + l + sovEs(uint64(l))
}
return n
@@ -1144,6 +1290,23 @@
l = len(m.Reserved)
if l > 0 {
n += 2 + l + sovEs(uint64(l))
+ }
+ l = len(m.CarNo)
+ if l > 0 {
+ n += 2 + l + sovEs(uint64(l))
+ }
+ l = len(m.CarPicUrls)
+ if l > 0 {
+ n += 2 + l + sovEs(uint64(l))
+ }
+ if m.CarType != 0 {
+ n += 2 + sovEs(uint64(m.CarType))
+ }
+ if m.CarBrand != 0 {
+ n += 2 + sovEs(uint64(m.CarBrand))
+ }
+ if m.CarColor != 0 {
+ n += 2 + sovEs(uint64(m.CarColor))
}
return n
}
@@ -1408,6 +1571,38 @@
}
m.AnalyServerId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
+ case 7:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field CarNo", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowEs
+ }
+ 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 ErrInvalidLengthEs
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthEs
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.CarNo = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipEs(dAtA[iNdEx:])
@@ -1595,6 +1790,42 @@
return err
}
iNdEx = postIndex
+ case 5:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field TargetLocation", wireType)
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowEs
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ msglen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if msglen < 0 {
+ return ErrInvalidLengthEs
+ }
+ postIndex := iNdEx + msglen
+ if postIndex < 0 {
+ return ErrInvalidLengthEs
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ if m.TargetLocation == nil {
+ m.TargetLocation = &TargetLocation{}
+ }
+ if err := m.TargetLocation.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
+ iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipEs(dAtA[iNdEx:])
@@ -1743,6 +1974,42 @@
return io.ErrUnexpectedEOF
}
m.AttachFeature = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ case 4:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field TargetLocation", wireType)
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowEs
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ msglen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if msglen < 0 {
+ return ErrInvalidLengthEs
+ }
+ postIndex := iNdEx + msglen
+ if postIndex < 0 {
+ return ErrInvalidLengthEs
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ if m.TargetLocation == nil {
+ m.TargetLocation = &TargetLocation{}
+ }
+ if err := m.TargetLocation.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
iNdEx = postIndex
default:
iNdEx = preIndex
@@ -2315,6 +2582,127 @@
}
m.Reserved = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
+ case 18:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field CarNo", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowEs
+ }
+ 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 ErrInvalidLengthEs
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthEs
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.CarNo = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ case 19:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field CarPicUrls", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowEs
+ }
+ 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 ErrInvalidLengthEs
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthEs
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.CarPicUrls = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ case 20:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field CarType", wireType)
+ }
+ m.CarType = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowEs
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.CarType |= int32(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ case 21:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field CarBrand", wireType)
+ }
+ m.CarBrand = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowEs
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.CarBrand |= int32(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ case 22:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field CarColor", wireType)
+ }
+ m.CarColor = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowEs
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.CarColor |= int32(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
default:
iNdEx = preIndex
skippy, err := skipEs(dAtA[iNdEx:])
--
Gitblit v1.8.0