From e603d1c2a7b7added819d601b627b1bfc9f8df36 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 26 七月 2019 18:46:54 +0800
Subject: [PATCH] BaseInfo add bwType

---
 videoperson.proto |    3 
 videoperson.pb.go |  124 ++++++++++++++++++++++++++--------------
 2 files changed, 82 insertions(+), 45 deletions(-)

diff --git a/videoperson.pb.go b/videoperson.pb.go
index 72b8e0e..63f5088 100644
--- a/videoperson.pb.go
+++ b/videoperson.pb.go
@@ -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, 0xbb, 0x6e, 0x1b, 0x3b,
+	0x10, 0xf5, 0xca, 0xb6, 0x2c, 0x53, 0x7e, 0xf2, 0xfa, 0xea, 0xf2, 0x3a, 0x8e, 0x20, 0x08, 0x41,
+	0xa0, 0x4a, 0x45, 0x92, 0x1f, 0x90, 0xed, 0x46, 0x40, 0x62, 0x04, 0x2b, 0x27, 0x3d, 0xc5, 0x1d,
+	0x2b, 0x84, 0xf7, 0x05, 0x92, 0x72, 0xec, 0x2e, 0x55, 0xea, 0x7c, 0x56, 0x4a, 0x97, 0x29, 0x03,
+	0xf9, 0x47, 0x82, 0x19, 0xee, 0x4b, 0x4e, 0xb5, 0x73, 0xce, 0xe1, 0x0e, 0x67, 0x86, 0x33, 0xc3,
+	0x8e, 0xef, 0x74, 0x04, 0x59, 0x0e, 0xc6, 0x66, 0xe9, 0x38, 0x37, 0x99, 0xcb, 0x78, 0x87, 0x3e,
+	0x89, 0x5d, 0x0c, 0xbf, 0xed, 0xb0, 0xbd, 0xcf, 0xb5, 0x6e, 0xf9, 0x01, 0x6b, 0xe9, 0x48, 0x04,
+	0x83, 0x60, 0xb4, 0x1b, 0xb6, 0x74, 0xc4, 0x4f, 0x59, 0x47, 0xc9, 0x04, 0x8c, 0x9c, 0x46, 0xa2,
+	0x45, 0x6c, 0x85, 0x79, 0x9f, 0x31, 0x6f, 0x4f, 0xa2, 0xc8, 0x88, 0x4d, 0x52, 0x1b, 0x0c, 0x17,
+	0x6c, 0x27, 0xd7, 0xea, 0x52, 0x3a, 0x10, 0x5b, 0x24, 0x96, 0x90, 0x9f, 0xb1, 0xdd, 0x5c, 0xab,
+	0x0f, 0xf2, 0xfe, 0x93, 0x89, 0xc5, 0x36, 0x69, 0x35, 0xc1, 0x7b, 0xac, 0xed, 0xa4, 0xbd, 0x9d,
+	0x46, 0xa2, 0x4d, 0x52, 0x81, 0x30, 0x16, 0xb4, 0xae, 0x64, 0x02, 0x62, 0xc7, 0xc7, 0x52, 0x62,
+	0xbc, 0xcb, 0x46, 0x5e, 0xea, 0xf8, 0xbb, 0x0a, 0x88, 0x8a, 0xca, 0x52, 0x07, 0xa9, 0x13, 0xbb,
+	0x5e, 0x29, 0x20, 0xfa, 0x8b, 0xf5, 0x2d, 0x50, 0x80, 0xcc, 0xfb, 0x2b, 0x31, 0x1f, 0xb0, 0x6e,
+	0x04, 0x0e, 0x94, 0x9b, 0xa9, 0xcc, 0x80, 0xe8, 0x92, 0xdc, 0xa4, 0xf8, 0x11, 0xdb, 0xb4, 0x70,
+	0x2f, 0xf6, 0x48, 0x41, 0x13, 0x19, 0xb9, 0x00, 0xb1, 0x3f, 0x08, 0x46, 0xdb, 0x21, 0x9a, 0xfc,
+	0x35, 0x3b, 0x90, 0x0b, 0xb8, 0x04, 0xab, 0x8c, 0xce, 0x9d, 0xce, 0x52, 0x71, 0x40, 0xc7, 0x9f,
+	0xb1, 0x9c, 0xb3, 0x2d, 0x23, 0x15, 0x88, 0x43, 0x52, 0xc9, 0xc6, 0xea, 0xda, 0x44, 0xc7, 0xf0,
+	0x1e, 0xee, 0x20, 0x16, 0x47, 0xbe, 0xba, 0x35, 0x83, 0x11, 0xce, 0x41, 0x2e, 0xdd, 0x83, 0x3f,
+	0x70, 0xec, 0x23, 0x6c, 0x50, 0x98, 0x5f, 0xae, 0xd5, 0x2c, 0xc1, 0x22, 0x73, 0x9f, 0x5f, 0x89,
+	0x51, 0xa3, 0xbe, 0x40, 0xed, 0x1f, 0xaf, 0x95, 0x98, 0xbf, 0x62, 0xfb, 0x32, 0x95, 0xf1, 0xc3,
+	0x0c, 0xcc, 0x1d, 0x98, 0x69, 0x24, 0x4e, 0xe8, 0xc0, 0x3a, 0xc9, 0x47, 0xec, 0xb0, 0x41, 0x50,
+	0xe5, 0xff, 0xa5, 0x73, 0xcf, 0xe9, 0xe7, 0xfe, 0x72, 0xd1, 0xfb, 0xdb, 0x5f, 0x8e, 0x3d, 0xa1,
+	0xe2, 0xa5, 0x75, 0x74, 0xe3, 0x7f, 0xbe, 0x27, 0x2a, 0x02, 0x5f, 0x51, 0xdb, 0x49, 0x2c, 0x4d,
+	0x22, 0x84, 0x7f, 0xc5, 0x02, 0x62, 0x9d, 0xb4, 0x9d, 0xa8, 0x5b, 0x2f, 0xfe, 0xef, 0xeb, 0x54,
+	0x33, 0xe8, 0x57, 0xdb, 0x8b, 0x2c, 0x8e, 0x41, 0x39, 0x71, 0x4a, 0x6f, 0x53, 0x13, 0x58, 0x07,
+	0x6d, 0x2f, 0x21, 0x06, 0x07, 0xe2, 0x05, 0x89, 0x15, 0xe6, 0xef, 0x18, 0x93, 0xe8, 0x22, 0x5c,
+	0xc6, 0x60, 0xc5, 0xd9, 0x20, 0x18, 0x75, 0xdf, 0x9c, 0x8c, 0xcb, 0xd9, 0x19, 0x4f, 0x2a, 0x2d,
+	0x6c, 0x9c, 0xe3, 0x63, 0xd6, 0x99, 0x4b, 0x0b, 0xd3, 0xf4, 0x26, 0x13, 0x2f, 0xe9, 0x1f, 0x5e,
+	0xff, 0x73, 0x5e, 0x28, 0x61, 0x75, 0x66, 0xf8, 0x3d, 0x60, 0xac, 0x76, 0x85, 0x89, 0x2e, 0x4c,
+	0xb6, 0xcc, 0xa7, 0xe5, 0x14, 0x96, 0x10, 0x13, 0xa5, 0x6b, 0xfc, 0x7b, 0xfb, 0x61, 0x6c, 0x30,
+	0x98, 0x8a, 0x59, 0xc6, 0x70, 0x0d, 0xf7, 0xae, 0x18, 0xc6, 0x0a, 0xf3, 0x21, 0xdb, 0x8b, 0xe0,
+	0x06, 0x52, 0x05, 0x33, 0x57, 0xce, 0x63, 0x27, 0x5c, 0xe3, 0x86, 0xab, 0x16, 0xeb, 0x94, 0xf1,
+	0x61, 0x18, 0x4e, 0xce, 0x63, 0xa8, 0xc3, 0x28, 0x20, 0xd6, 0x93, 0x4c, 0x7a, 0x71, 0x1f, 0x45,
+	0x4d, 0xe0, 0x45, 0x2a, 0x4b, 0x72, 0x69, 0xc0, 0x0f, 0x0e, 0x06, 0xd2, 0x0a, 0xd7, 0x38, 0xea,
+	0x4b, 0x5a, 0x37, 0xd3, 0xa8, 0x58, 0x0c, 0x15, 0xc6, 0x24, 0xbd, 0x4d, 0xee, 0xfd, 0x6a, 0x68,
+	0x30, 0xe8, 0xdf, 0xa3, 0x8f, 0x5a, 0x61, 0xef, 0xfa, 0x0d, 0xb1, 0xc6, 0x91, 0xff, 0x2f, 0x59,
+	0x0a, 0x57, 0xcb, 0xa4, 0xdc, 0x13, 0x25, 0x2e, 0xa7, 0xb6, 0x53, 0x4f, 0x6d, 0x8f, 0xb5, 0x75,
+	0x74, 0x21, 0x4d, 0x54, 0xac, 0x87, 0x02, 0xe1, 0x4d, 0x49, 0x96, 0x6a, 0x97, 0x19, 0x5f, 0x70,
+	0xbf, 0x21, 0xd6, 0xb8, 0xe6, 0x6e, 0xe9, 0xae, 0xef, 0x96, 0x1e, 0x6b, 0xcf, 0xbf, 0x5e, 0x3f,
+	0xe4, 0x40, 0x0b, 0x62, 0x3b, 0x2c, 0xd0, 0xb9, 0xf8, 0xb9, 0xea, 0x07, 0x8f, 0xab, 0x7e, 0xf0,
+	0x7b, 0xd5, 0x0f, 0x7e, 0x3c, 0xf5, 0x37, 0x1e, 0x9f, 0xfa, 0x1b, 0xbf, 0x9e, 0xfa, 0x1b, 0xf3,
+	0x36, 0x35, 0xc9, 0xdb, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xfb, 0xd8, 0xcc, 0xb0, 0x05,
+	0x00, 0x00,
 }
 
 func (m *Videopersons) Marshal() (dAtA []byte, err error) {
@@ -890,6 +899,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
 }
 
@@ -1096,6 +1110,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
 }
@@ -2585,6 +2602,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:])
diff --git a/videoperson.proto b/videoperson.proto
index 91ec2d1..4bc2c15 100644
--- a/videoperson.proto
+++ b/videoperson.proto
@@ -53,5 +53,6 @@
 	string idCard               =9;
 	string monitorLevel         =10;
 	string content              =11;
-	}
+    int32 bwType                =12;
+}
 

--
Gitblit v1.8.0