From dc8ca60fc53199251100883b4370de52a6534463 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 22 八月 2019 14:01:53 +0800
Subject: [PATCH] soinfo id change to string
---
videoperson.pb.go | 293 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 172 insertions(+), 121 deletions(-)
diff --git a/videoperson.pb.go b/videoperson.pb.go
index 72b8e0e..52d3454 100644
--- a/videoperson.pb.go
+++ b/videoperson.pb.go
@@ -24,35 +24,35 @@
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
type Videopersons struct {
- Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
- CameraId string `protobuf:"bytes,2,opt,name=cameraId,proto3" json:"cameraId,omitempty"`
- CameraAddr string `protobuf:"bytes,3,opt,name=cameraAddr,proto3" json:"cameraAddr,omitempty"`
- PicDate string `protobuf:"bytes,4,opt,name=picDate,proto3" json:"picDate,omitempty"`
- PicMaxUrl string `protobuf:"bytes,5,opt,name=picMaxUrl,proto3" json:"picMaxUrl,omitempty"`
- TaskId string `protobuf:"bytes,6,opt,name=taskId,proto3" json:"taskId,omitempty"`
- TaskName string `protobuf:"bytes,7,opt,name=taskName,proto3" json:"taskName,omitempty"`
- SdkName string `protobuf:"bytes,8,opt,name=sdkName,proto3" json:"sdkName,omitempty"`
- Content string `protobuf:"bytes,9,opt,name=content,proto3" json:"content,omitempty"`
- LikeDate string `protobuf:"bytes,10,opt,name=likeDate,proto3" json:"likeDate,omitempty"`
- DetectScore string `protobuf:"bytes,11,opt,name=detectScore,proto3" json:"detectScore,omitempty"`
- Sex string `protobuf:"bytes,12,opt,name=sex,proto3" json:"sex,omitempty"`
- Age int32 `protobuf:"varint,13,opt,name=age,proto3" json:"age,omitempty"`
- AgeDescription string `protobuf:"bytes,14,opt,name=ageDescription,proto3" json:"ageDescription,omitempty"`
- Race string `protobuf:"bytes,15,opt,name=race,proto3" json:"race,omitempty"`
- SmileLevel string `protobuf:"bytes,16,opt,name=smileLevel,proto3" json:"smileLevel,omitempty"`
- BeautyLevel string `protobuf:"bytes,17,opt,name=beautyLevel,proto3" json:"beautyLevel,omitempty"`
- PicSmUrl string `protobuf:"bytes,18,opt,name=picSmUrl,proto3" json:"picSmUrl,omitempty"`
- VideoUrl string `protobuf:"bytes,19,opt,name=videoUrl,proto3" json:"videoUrl,omitempty"`
- AnalyServerId string `protobuf:"bytes,20,opt,name=analyServerId,proto3" json:"analyServerId,omitempty"`
- AnalyServerName string `protobuf:"bytes,21,opt,name=analyServerName,proto3" json:"analyServerName,omitempty"`
- AnalyServerIp string `protobuf:"bytes,22,opt,name=analyServerIp,proto3" json:"analyServerIp,omitempty"`
- ClusterId string `protobuf:"bytes,23,opt,name=clusterId,proto3" json:"clusterId,omitempty"`
- IsAlarm string `protobuf:"bytes,24,opt,name=isAlarm,proto3" json:"isAlarm,omitempty"`
- IsAckAlarm string `protobuf:"bytes,25,opt,name=isAckAlarm,proto3" json:"isAckAlarm,omitempty"`
- IsCollect int32 `protobuf:"varint,26,opt,name=isCollect,proto3" json:"isCollect,omitempty"`
- IsDelete int32 `protobuf:"varint,27,opt,name=isDelete,proto3" json:"isDelete,omitempty"`
- AlarmRules *AlarmRules `protobuf:"bytes,28,opt,name=alarmRules,proto3" json:"alarmRules,omitempty"`
- BaseInfo *BaseInfo `protobuf:"bytes,29,opt,name=baseInfo,proto3" json:"baseInfo,omitempty"`
+ Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+ CameraId string `protobuf:"bytes,2,opt,name=cameraId,proto3" json:"cameraId,omitempty"`
+ CameraAddr string `protobuf:"bytes,3,opt,name=cameraAddr,proto3" json:"cameraAddr,omitempty"`
+ PicDate string `protobuf:"bytes,4,opt,name=picDate,proto3" json:"picDate,omitempty"`
+ PicMaxUrl string `protobuf:"bytes,5,opt,name=picMaxUrl,proto3" json:"picMaxUrl,omitempty"`
+ TaskId string `protobuf:"bytes,6,opt,name=taskId,proto3" json:"taskId,omitempty"`
+ TaskName string `protobuf:"bytes,7,opt,name=taskName,proto3" json:"taskName,omitempty"`
+ SdkName string `protobuf:"bytes,8,opt,name=sdkName,proto3" json:"sdkName,omitempty"`
+ Content string `protobuf:"bytes,9,opt,name=content,proto3" json:"content,omitempty"`
+ LikeDate string `protobuf:"bytes,10,opt,name=likeDate,proto3" json:"likeDate,omitempty"`
+ DetectScore string `protobuf:"bytes,11,opt,name=detectScore,proto3" json:"detectScore,omitempty"`
+ Sex string `protobuf:"bytes,12,opt,name=sex,proto3" json:"sex,omitempty"`
+ Age int32 `protobuf:"varint,13,opt,name=age,proto3" json:"age,omitempty"`
+ AgeDescription string `protobuf:"bytes,14,opt,name=ageDescription,proto3" json:"ageDescription,omitempty"`
+ Race string `protobuf:"bytes,15,opt,name=race,proto3" json:"race,omitempty"`
+ SmileLevel string `protobuf:"bytes,16,opt,name=smileLevel,proto3" json:"smileLevel,omitempty"`
+ BeautyLevel string `protobuf:"bytes,17,opt,name=beautyLevel,proto3" json:"beautyLevel,omitempty"`
+ PicSmUrl []string `protobuf:"bytes,18,rep,name=picSmUrl,proto3" json:"picSmUrl,omitempty"`
+ VideoUrl string `protobuf:"bytes,19,opt,name=videoUrl,proto3" json:"videoUrl,omitempty"`
+ AnalyServerId string `protobuf:"bytes,20,opt,name=analyServerId,proto3" json:"analyServerId,omitempty"`
+ AnalyServerName string `protobuf:"bytes,21,opt,name=analyServerName,proto3" json:"analyServerName,omitempty"`
+ AnalyServerIp string `protobuf:"bytes,22,opt,name=analyServerIp,proto3" json:"analyServerIp,omitempty"`
+ ClusterId string `protobuf:"bytes,23,opt,name=clusterId,proto3" json:"clusterId,omitempty"`
+ IsAlarm string `protobuf:"bytes,24,opt,name=isAlarm,proto3" json:"isAlarm,omitempty"`
+ IsAckAlarm string `protobuf:"bytes,25,opt,name=isAckAlarm,proto3" json:"isAckAlarm,omitempty"`
+ IsCollect int32 `protobuf:"varint,26,opt,name=isCollect,proto3" json:"isCollect,omitempty"`
+ IsDelete int32 `protobuf:"varint,27,opt,name=isDelete,proto3" json:"isDelete,omitempty"`
+ AlarmRules []*AlarmRules `protobuf:"bytes,28,rep,name=alarmRules,proto3" json:"alarmRules,omitempty"`
+ BaseInfo []*BaseInfo `protobuf:"bytes,29,rep,name=baseInfo,proto3" json:"baseInfo,omitempty"`
}
func (m *Videopersons) Reset() { *m = Videopersons{} }
@@ -207,11 +207,11 @@
return ""
}
-func (m *Videopersons) GetPicSmUrl() string {
+func (m *Videopersons) GetPicSmUrl() []string {
if m != nil {
return m.PicSmUrl
}
- return ""
+ return nil
}
func (m *Videopersons) GetVideoUrl() string {
@@ -277,14 +277,14 @@
return 0
}
-func (m *Videopersons) GetAlarmRules() *AlarmRules {
+func (m *Videopersons) GetAlarmRules() []*AlarmRules {
if m != nil {
return m.AlarmRules
}
return nil
}
-func (m *Videopersons) GetBaseInfo() *BaseInfo {
+func (m *Videopersons) GetBaseInfo() []*BaseInfo {
if m != nil {
return m.BaseInfo
}
@@ -371,6 +371,7 @@
IdCard string `protobuf:"bytes,9,opt,name=idCard,proto3" json:"idCard,omitempty"`
MonitorLevel string `protobuf:"bytes,10,opt,name=monitorLevel,proto3" json:"monitorLevel,omitempty"`
Content string `protobuf:"bytes,11,opt,name=content,proto3" json:"content,omitempty"`
+ BwType int32 `protobuf:"varint,12,opt,name=bwType,proto3" json:"bwType,omitempty"`
}
func (m *BaseInfo) Reset() { *m = BaseInfo{} }
@@ -483,6 +484,13 @@
return ""
}
+func (m *BaseInfo) GetBwType() int32 {
+ if m != nil {
+ return m.BwType
+ }
+ return 0
+}
+
func init() {
proto.RegisterType((*Videopersons)(nil), "protomsg.Videopersons")
proto.RegisterType((*AlarmRules)(nil), "protomsg.AlarmRules")
@@ -492,50 +500,51 @@
func init() { proto.RegisterFile("videoperson.proto", fileDescriptor_149f81aa0f752265) }
var fileDescriptor_149f81aa0f752265 = []byte{
- // 678 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x54, 0x4d, 0x6f, 0x13, 0x3d,
- 0x10, 0xee, 0xa6, 0x6d, 0x9a, 0x3a, 0xfd, 0xf4, 0xdb, 0xb7, 0x98, 0x52, 0xa2, 0x28, 0x42, 0x28,
- 0xa7, 0x1c, 0x80, 0x3f, 0x90, 0xb6, 0x97, 0x48, 0x50, 0xa1, 0x04, 0xb8, 0x3b, 0xde, 0x69, 0xb0,
- 0xba, 0xbb, 0x5e, 0xd9, 0x4e, 0xd5, 0xde, 0x38, 0x71, 0xe6, 0x67, 0x21, 0x4e, 0x3d, 0x72, 0x44,
- 0xed, 0x1f, 0x41, 0x33, 0xde, 0xaf, 0x94, 0xd3, 0xce, 0xf3, 0x3c, 0xde, 0xf1, 0xcc, 0x78, 0x66,
- 0xd8, 0xe1, 0x8d, 0x8e, 0xc1, 0xe4, 0x60, 0x9d, 0xc9, 0x46, 0xb9, 0x35, 0xde, 0xf0, 0x0e, 0x7d,
- 0x52, 0xb7, 0x18, 0x7c, 0xdb, 0x62, 0x3b, 0x5f, 0x6a, 0xdd, 0xf1, 0x3d, 0xd6, 0xd2, 0xb1, 0x88,
- 0xfa, 0xd1, 0x70, 0x7b, 0xda, 0xd2, 0x31, 0x3f, 0x61, 0x1d, 0x25, 0x53, 0xb0, 0x72, 0x12, 0x8b,
- 0x16, 0xb1, 0x15, 0xe6, 0x3d, 0xc6, 0x82, 0x3d, 0x8e, 0x63, 0x2b, 0xd6, 0x49, 0x6d, 0x30, 0x5c,
- 0xb0, 0xad, 0x5c, 0xab, 0x0b, 0xe9, 0x41, 0x6c, 0x90, 0x58, 0x42, 0x7e, 0xca, 0xb6, 0x73, 0xad,
- 0x3e, 0xc8, 0xdb, 0xcf, 0x36, 0x11, 0x9b, 0xa4, 0xd5, 0x04, 0x3f, 0x66, 0x6d, 0x2f, 0xdd, 0xf5,
- 0x24, 0x16, 0x6d, 0x92, 0x0a, 0x84, 0xb1, 0xa0, 0x75, 0x29, 0x53, 0x10, 0x5b, 0x21, 0x96, 0x12,
- 0xe3, 0x5d, 0x2e, 0x0e, 0x52, 0x27, 0xdc, 0x55, 0x40, 0x54, 0x94, 0xc9, 0x3c, 0x64, 0x5e, 0x6c,
- 0x07, 0xa5, 0x80, 0xe8, 0x2f, 0xd1, 0xd7, 0x40, 0x01, 0xb2, 0xe0, 0xaf, 0xc4, 0xbc, 0xcf, 0xba,
- 0x31, 0x78, 0x50, 0x7e, 0xa6, 0x8c, 0x05, 0xd1, 0x25, 0xb9, 0x49, 0xf1, 0x03, 0xb6, 0xee, 0xe0,
- 0x56, 0xec, 0x90, 0x82, 0x26, 0x32, 0x72, 0x01, 0x62, 0xb7, 0x1f, 0x0d, 0x37, 0xa7, 0x68, 0xf2,
- 0xd7, 0x6c, 0x4f, 0x2e, 0xe0, 0x02, 0x9c, 0xb2, 0x3a, 0xf7, 0xda, 0x64, 0x62, 0x8f, 0x8e, 0x3f,
- 0x61, 0x39, 0x67, 0x1b, 0x56, 0x2a, 0x10, 0xfb, 0xa4, 0x92, 0x8d, 0xd5, 0x75, 0xa9, 0x4e, 0xe0,
- 0x3d, 0xdc, 0x40, 0x22, 0x0e, 0x42, 0x75, 0x6b, 0x06, 0x23, 0x9c, 0x83, 0x5c, 0xfa, 0xbb, 0x70,
- 0xe0, 0x30, 0x44, 0xd8, 0xa0, 0x30, 0xbf, 0x5c, 0xab, 0x59, 0x8a, 0x45, 0xe6, 0x21, 0xbf, 0x12,
- 0xa3, 0x46, 0x7d, 0x81, 0xda, 0x7f, 0x41, 0x2b, 0x31, 0x7f, 0xc5, 0x76, 0x65, 0x26, 0x93, 0xbb,
- 0x19, 0xd8, 0x1b, 0xb0, 0x93, 0x58, 0x1c, 0xd1, 0x81, 0x55, 0x92, 0x0f, 0xd9, 0x7e, 0x83, 0xa0,
- 0xca, 0xff, 0x4f, 0xe7, 0x9e, 0xd2, 0x4f, 0xfd, 0xe5, 0xe2, 0xf8, 0x5f, 0x7f, 0x39, 0xf6, 0x84,
- 0x4a, 0x96, 0xce, 0xd3, 0x8d, 0xcf, 0x42, 0x4f, 0x54, 0x04, 0xbe, 0xa2, 0x76, 0xe3, 0x44, 0xda,
- 0x54, 0x88, 0xf0, 0x8a, 0x05, 0xc4, 0x3a, 0x69, 0x37, 0x56, 0xd7, 0x41, 0x7c, 0x1e, 0xea, 0x54,
- 0x33, 0xe8, 0x57, 0xbb, 0x73, 0x93, 0x24, 0xa0, 0xbc, 0x38, 0xa1, 0xb7, 0xa9, 0x09, 0xac, 0x83,
- 0x76, 0x17, 0x90, 0x80, 0x07, 0xf1, 0x82, 0xc4, 0x0a, 0xf3, 0x77, 0x8c, 0x49, 0x74, 0x31, 0x5d,
- 0x26, 0xe0, 0xc4, 0x69, 0x3f, 0x1a, 0x76, 0xdf, 0x1c, 0x8d, 0xca, 0xd9, 0x19, 0x8d, 0x2b, 0x6d,
- 0xda, 0x38, 0xc7, 0x47, 0xac, 0x33, 0x97, 0x0e, 0x26, 0xd9, 0x95, 0x11, 0x2f, 0xe9, 0x1f, 0x5e,
- 0xff, 0x73, 0x56, 0x28, 0xd3, 0xea, 0xcc, 0xe0, 0x7b, 0xc4, 0x58, 0xed, 0x0a, 0x13, 0x5d, 0x58,
- 0xb3, 0xcc, 0x27, 0xe5, 0x14, 0x96, 0x10, 0x13, 0xa5, 0x6b, 0xc2, 0x7b, 0x87, 0x61, 0x6c, 0x30,
- 0x98, 0x8a, 0x5d, 0x26, 0xf0, 0x09, 0x6e, 0x7d, 0x31, 0x8c, 0x15, 0xe6, 0x03, 0xb6, 0x13, 0xc3,
- 0x15, 0x64, 0x0a, 0x66, 0xbe, 0x9c, 0xc7, 0xce, 0x74, 0x85, 0x1b, 0xfc, 0x6a, 0xb1, 0x4e, 0x19,
- 0x1f, 0x86, 0xe1, 0xe5, 0x3c, 0x81, 0x3a, 0x8c, 0x02, 0x62, 0x3d, 0xc9, 0xa4, 0x17, 0x0f, 0x51,
- 0xd4, 0x04, 0x5e, 0xa4, 0x4c, 0x9a, 0x4b, 0x0b, 0x61, 0x70, 0x30, 0x90, 0xd6, 0x74, 0x85, 0xa3,
- 0xbe, 0xa4, 0x75, 0x33, 0x89, 0x8b, 0xc5, 0x50, 0x61, 0x4c, 0x32, 0xd8, 0xe4, 0x3e, 0xac, 0x86,
- 0x06, 0x83, 0xfe, 0x03, 0xfa, 0xa8, 0x15, 0xf6, 0x6e, 0xd8, 0x10, 0x2b, 0x1c, 0xf9, 0xff, 0x6a,
- 0x32, 0xb8, 0x5c, 0xa6, 0xe5, 0x9e, 0x28, 0x71, 0x39, 0xb5, 0x9d, 0x7a, 0x6a, 0x8f, 0x59, 0x5b,
- 0xc7, 0xe7, 0xd2, 0xc6, 0xc5, 0x7a, 0x28, 0x10, 0xde, 0x94, 0x9a, 0x4c, 0x7b, 0x63, 0x43, 0xc1,
- 0xc3, 0x86, 0x58, 0xe1, 0x9a, 0xbb, 0xa5, 0xbb, 0xb2, 0x5b, 0xce, 0xc4, 0xcf, 0x87, 0x5e, 0x74,
- 0xff, 0xd0, 0x8b, 0xfe, 0x3c, 0xf4, 0xa2, 0x1f, 0x8f, 0xbd, 0xb5, 0xfb, 0xc7, 0xde, 0xda, 0xef,
- 0xc7, 0xde, 0xda, 0xbc, 0x4d, 0xcd, 0xf0, 0xf6, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x19,
- 0x66, 0x05, 0x98, 0x05, 0x00, 0x00,
+ // 690 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x54, 0xcd, 0x6e, 0x13, 0x31,
+ 0x10, 0x6e, 0x92, 0x36, 0x4d, 0x9d, 0xfe, 0x9a, 0x12, 0x4c, 0x29, 0x51, 0x14, 0x21, 0x94, 0x53,
+ 0x0e, 0xc0, 0x0b, 0xa4, 0xed, 0x25, 0x12, 0x54, 0x68, 0x53, 0xb8, 0x3b, 0xde, 0x69, 0xb0, 0xba,
+ 0x7f, 0xb2, 0x9d, 0xd2, 0xde, 0x38, 0x71, 0xe6, 0xb1, 0x38, 0xf6, 0xc8, 0x11, 0xa5, 0x2f, 0x82,
+ 0x66, 0xbc, 0x7f, 0x29, 0xa7, 0x9d, 0xef, 0xfb, 0xbc, 0xe3, 0x99, 0xf1, 0xcc, 0xb0, 0xa3, 0x5b,
+ 0x1d, 0x42, 0x9a, 0x81, 0xb1, 0x69, 0x32, 0xce, 0x4c, 0xea, 0x52, 0xde, 0xa1, 0x4f, 0x6c, 0x17,
+ 0xc3, 0x1f, 0xdb, 0x6c, 0xf7, 0x6b, 0xa5, 0x5b, 0xbe, 0xcf, 0x9a, 0x3a, 0x14, 0x8d, 0x41, 0x63,
+ 0xb4, 0x13, 0x34, 0x75, 0xc8, 0x4f, 0x58, 0x47, 0xc9, 0x18, 0x8c, 0x9c, 0x86, 0xa2, 0x49, 0x6c,
+ 0x89, 0x79, 0x9f, 0x31, 0x6f, 0x4f, 0xc2, 0xd0, 0x88, 0x16, 0xa9, 0x35, 0x86, 0x0b, 0xb6, 0x9d,
+ 0x69, 0x75, 0x21, 0x1d, 0x88, 0x4d, 0x12, 0x0b, 0xc8, 0x4f, 0xd9, 0x4e, 0xa6, 0xd5, 0x27, 0x79,
+ 0xf7, 0xc5, 0x44, 0x62, 0x8b, 0xb4, 0x8a, 0xe0, 0x3d, 0xd6, 0x76, 0xd2, 0xde, 0x4c, 0x43, 0xd1,
+ 0x26, 0x29, 0x47, 0x18, 0x0b, 0x5a, 0x97, 0x32, 0x06, 0xb1, 0xed, 0x63, 0x29, 0x30, 0xde, 0x65,
+ 0x43, 0x2f, 0x75, 0xfc, 0x5d, 0x39, 0x44, 0x45, 0xa5, 0x89, 0x83, 0xc4, 0x89, 0x1d, 0xaf, 0xe4,
+ 0x10, 0xfd, 0x45, 0xfa, 0x06, 0x28, 0x40, 0xe6, 0xfd, 0x15, 0x98, 0x0f, 0x58, 0x37, 0x04, 0x07,
+ 0xca, 0xcd, 0x54, 0x6a, 0x40, 0x74, 0x49, 0xae, 0x53, 0xfc, 0x90, 0xb5, 0x2c, 0xdc, 0x89, 0x5d,
+ 0x52, 0xd0, 0x44, 0x46, 0x2e, 0x40, 0xec, 0x0d, 0x1a, 0xa3, 0xad, 0x00, 0x4d, 0xfe, 0x96, 0xed,
+ 0xcb, 0x05, 0x5c, 0x80, 0x55, 0x46, 0x67, 0x4e, 0xa7, 0x89, 0xd8, 0xa7, 0xe3, 0x4f, 0x58, 0xce,
+ 0xd9, 0xa6, 0x91, 0x0a, 0xc4, 0x01, 0xa9, 0x64, 0x63, 0x75, 0x6d, 0xac, 0x23, 0xf8, 0x08, 0xb7,
+ 0x10, 0x89, 0x43, 0x5f, 0xdd, 0x8a, 0xc1, 0x08, 0xe7, 0x20, 0x97, 0xee, 0xde, 0x1f, 0x38, 0xf2,
+ 0x11, 0xd6, 0x28, 0xcc, 0x2f, 0xd3, 0x6a, 0x16, 0x63, 0x91, 0xf9, 0xa0, 0x85, 0xf9, 0x15, 0x18,
+ 0x35, 0xea, 0x0b, 0xd4, 0x9e, 0xf9, 0xdc, 0x0b, 0xcc, 0xdf, 0xb0, 0x3d, 0x99, 0xc8, 0xe8, 0x7e,
+ 0x06, 0xe6, 0x16, 0xcc, 0x34, 0x14, 0xc7, 0x74, 0x60, 0x9d, 0xe4, 0x23, 0x76, 0x50, 0x23, 0xa8,
+ 0xf2, 0xcf, 0xe9, 0xdc, 0x53, 0xfa, 0xa9, 0xbf, 0x4c, 0xf4, 0xfe, 0xf7, 0x97, 0x61, 0x4f, 0xa8,
+ 0x68, 0x69, 0x1d, 0xdd, 0xf8, 0xc2, 0xf7, 0x44, 0x49, 0xe0, 0x2b, 0x6a, 0x3b, 0x89, 0xa4, 0x89,
+ 0x85, 0xf0, 0xaf, 0x98, 0x43, 0xac, 0x93, 0xb6, 0x13, 0x75, 0xe3, 0xc5, 0x97, 0xbe, 0x4e, 0x15,
+ 0x83, 0x7e, 0xb5, 0x3d, 0x4f, 0xa3, 0x08, 0x94, 0x13, 0x27, 0xf4, 0x36, 0x15, 0x81, 0x75, 0xd0,
+ 0xf6, 0x02, 0x22, 0x70, 0x20, 0x5e, 0x91, 0x58, 0x62, 0xfe, 0x81, 0x31, 0x89, 0x2e, 0x82, 0x65,
+ 0x04, 0x56, 0x9c, 0x0e, 0x5a, 0xa3, 0xee, 0xbb, 0xe3, 0x71, 0x31, 0x3b, 0xe3, 0x49, 0xa9, 0x05,
+ 0xb5, 0x73, 0x7c, 0xcc, 0x3a, 0x73, 0x69, 0x61, 0x9a, 0x5c, 0xa7, 0xe2, 0x35, 0xfd, 0xc3, 0xab,
+ 0x7f, 0xce, 0x72, 0x25, 0x28, 0xcf, 0x0c, 0x7f, 0x36, 0x18, 0xab, 0x5c, 0x61, 0xa2, 0x0b, 0x93,
+ 0x2e, 0xb3, 0x69, 0x31, 0x85, 0x05, 0xc4, 0x44, 0xe9, 0x1a, 0xff, 0xde, 0x7e, 0x18, 0x6b, 0x0c,
+ 0xa6, 0x62, 0x96, 0x11, 0x5c, 0xc1, 0x9d, 0xcb, 0x87, 0xb1, 0xc4, 0x7c, 0xc8, 0x76, 0x43, 0xb8,
+ 0x86, 0x44, 0xc1, 0xcc, 0x15, 0xf3, 0xd8, 0x09, 0xd6, 0xb8, 0xe1, 0xaa, 0xc9, 0x3a, 0x45, 0x7c,
+ 0x18, 0x86, 0x93, 0xf3, 0x08, 0xaa, 0x30, 0x72, 0x88, 0xf5, 0x24, 0x93, 0x5e, 0xdc, 0x47, 0x51,
+ 0x11, 0x78, 0x91, 0x4a, 0xe3, 0x4c, 0x1a, 0xf0, 0x83, 0x83, 0x81, 0x34, 0x83, 0x35, 0x8e, 0xfa,
+ 0x92, 0xd6, 0xcd, 0x34, 0xcc, 0x17, 0x43, 0x89, 0x31, 0x49, 0x6f, 0x93, 0x7b, 0xbf, 0x1a, 0x6a,
+ 0x0c, 0xfa, 0xf7, 0xe8, 0xb3, 0x56, 0xd8, 0xbb, 0x7e, 0x43, 0xac, 0x71, 0xe4, 0xff, 0x5b, 0x9a,
+ 0xc0, 0xe5, 0x32, 0x2e, 0xf6, 0x44, 0x81, 0x8b, 0xa9, 0xed, 0x54, 0x53, 0xdb, 0x63, 0x6d, 0x1d,
+ 0x9e, 0x4b, 0x13, 0xe6, 0xeb, 0x21, 0x47, 0x78, 0x53, 0x9c, 0x26, 0xda, 0xa5, 0xc6, 0x17, 0xdc,
+ 0x6f, 0x88, 0x35, 0xae, 0xbe, 0x5b, 0xba, 0xeb, 0xbb, 0xa5, 0xc7, 0xda, 0xf3, 0xef, 0x57, 0xf7,
+ 0x19, 0xd0, 0x82, 0xd8, 0x0a, 0x72, 0x74, 0x26, 0x7e, 0xaf, 0xfa, 0x8d, 0x87, 0x55, 0xbf, 0xf1,
+ 0x77, 0xd5, 0x6f, 0xfc, 0x7a, 0xec, 0x6f, 0x3c, 0x3c, 0xf6, 0x37, 0xfe, 0x3c, 0xf6, 0x37, 0xe6,
+ 0x6d, 0x6a, 0x92, 0xf7, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x1d, 0x7e, 0x20, 0x91, 0xb0, 0x05,
+ 0x00, 0x00,
}
func (m *Videopersons) Marshal() (dAtA []byte, err error) {
@@ -659,12 +668,21 @@
i += copy(dAtA[i:], m.BeautyLevel)
}
if len(m.PicSmUrl) > 0 {
- dAtA[i] = 0x92
- i++
- dAtA[i] = 0x1
- i++
- i = encodeVarintVideoperson(dAtA, i, uint64(len(m.PicSmUrl)))
- i += copy(dAtA[i:], m.PicSmUrl)
+ for _, s := range m.PicSmUrl {
+ dAtA[i] = 0x92
+ i++
+ dAtA[i] = 0x1
+ i++
+ l = len(s)
+ for l >= 1<<7 {
+ dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
+ l >>= 7
+ i++
+ }
+ dAtA[i] = uint8(l)
+ i++
+ i += copy(dAtA[i:], s)
+ }
}
if len(m.VideoUrl) > 0 {
dAtA[i] = 0x9a
@@ -736,29 +754,33 @@
i++
i = encodeVarintVideoperson(dAtA, i, uint64(m.IsDelete))
}
- if m.AlarmRules != nil {
- dAtA[i] = 0xe2
- i++
- dAtA[i] = 0x1
- i++
- i = encodeVarintVideoperson(dAtA, i, uint64(m.AlarmRules.Size()))
- n1, err1 := m.AlarmRules.MarshalTo(dAtA[i:])
- if err1 != nil {
- return 0, err1
+ if len(m.AlarmRules) > 0 {
+ for _, msg := range m.AlarmRules {
+ dAtA[i] = 0xe2
+ i++
+ dAtA[i] = 0x1
+ i++
+ i = encodeVarintVideoperson(dAtA, i, uint64(msg.Size()))
+ n, err := msg.MarshalTo(dAtA[i:])
+ if err != nil {
+ return 0, err
+ }
+ i += n
}
- i += n1
}
- if m.BaseInfo != nil {
- dAtA[i] = 0xea
- i++
- dAtA[i] = 0x1
- i++
- i = encodeVarintVideoperson(dAtA, i, uint64(m.BaseInfo.Size()))
- n2, err2 := m.BaseInfo.MarshalTo(dAtA[i:])
- if err2 != nil {
- return 0, err2
+ if len(m.BaseInfo) > 0 {
+ for _, msg := range m.BaseInfo {
+ dAtA[i] = 0xea
+ i++
+ dAtA[i] = 0x1
+ i++
+ i = encodeVarintVideoperson(dAtA, i, uint64(msg.Size()))
+ n, err := msg.MarshalTo(dAtA[i:])
+ if err != nil {
+ return 0, err
+ }
+ i += n
}
- i += n2
}
return i, nil
}
@@ -890,6 +912,11 @@
i = encodeVarintVideoperson(dAtA, i, uint64(len(m.Content)))
i += copy(dAtA[i:], m.Content)
}
+ if m.BwType != 0 {
+ dAtA[i] = 0x60
+ i++
+ i = encodeVarintVideoperson(dAtA, i, uint64(m.BwType))
+ }
return i, nil
}
@@ -975,9 +1002,11 @@
if l > 0 {
n += 2 + l + sovVideoperson(uint64(l))
}
- l = len(m.PicSmUrl)
- if l > 0 {
- n += 2 + l + sovVideoperson(uint64(l))
+ if len(m.PicSmUrl) > 0 {
+ for _, s := range m.PicSmUrl {
+ l = len(s)
+ n += 2 + l + sovVideoperson(uint64(l))
+ }
}
l = len(m.VideoUrl)
if l > 0 {
@@ -1013,13 +1042,17 @@
if m.IsDelete != 0 {
n += 2 + sovVideoperson(uint64(m.IsDelete))
}
- if m.AlarmRules != nil {
- l = m.AlarmRules.Size()
- n += 2 + l + sovVideoperson(uint64(l))
+ if len(m.AlarmRules) > 0 {
+ for _, e := range m.AlarmRules {
+ l = e.Size()
+ n += 2 + l + sovVideoperson(uint64(l))
+ }
}
- if m.BaseInfo != nil {
- l = m.BaseInfo.Size()
- n += 2 + l + sovVideoperson(uint64(l))
+ if len(m.BaseInfo) > 0 {
+ for _, e := range m.BaseInfo {
+ l = e.Size()
+ n += 2 + l + sovVideoperson(uint64(l))
+ }
}
return n
}
@@ -1096,6 +1129,9 @@
l = len(m.Content)
if l > 0 {
n += 1 + l + sovVideoperson(uint64(l))
+ }
+ if m.BwType != 0 {
+ n += 1 + sovVideoperson(uint64(m.BwType))
}
return n
}
@@ -1696,7 +1732,7 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.PicSmUrl = string(dAtA[iNdEx:postIndex])
+ m.PicSmUrl = append(m.PicSmUrl, string(dAtA[iNdEx:postIndex]))
iNdEx = postIndex
case 19:
if wireType != 2 {
@@ -1989,10 +2025,8 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- if m.AlarmRules == nil {
- m.AlarmRules = &AlarmRules{}
- }
- if err := m.AlarmRules.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ m.AlarmRules = append(m.AlarmRules, &AlarmRules{})
+ if err := m.AlarmRules[len(m.AlarmRules)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -2025,10 +2059,8 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- if m.BaseInfo == nil {
- m.BaseInfo = &BaseInfo{}
- }
- if err := m.BaseInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ m.BaseInfo = append(m.BaseInfo, &BaseInfo{})
+ if err := m.BaseInfo[len(m.BaseInfo)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -2585,6 +2617,25 @@
}
m.Content = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
+ case 12:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field BwType", wireType)
+ }
+ m.BwType = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowVideoperson
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.BwType |= int32(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
default:
iNdEx = preIndex
skippy, err := skipVideoperson(dAtA[iNdEx:])
--
Gitblit v1.8.0