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：非必要触发
---
alarm.pb.go | 228 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 129 insertions(+), 99 deletions(-)
diff --git a/alarm.pb.go b/alarm.pb.go
index b871603..8f330a6 100644
--- a/alarm.pb.go
+++ b/alarm.pb.go
@@ -20,14 +20,71 @@
// proto package needs to be updated.
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+type FaceTempInfo struct {
+ AlarmVal float32 `protobuf:"fixed32,1,opt,name=alarmVal,proto3" json:"alarmVal,omitempty"`
+ SetVal float32 `protobuf:"fixed32,2,opt,name=setVal,proto3" json:"setVal,omitempty"`
+ FaceId string `protobuf:"bytes,3,opt,name=faceId,proto3" json:"faceId,omitempty"`
+ FacePos *Rect `protobuf:"bytes,4,opt,name=facePos,proto3" json:"facePos,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
+}
+
+func (m *FaceTempInfo) Reset() { *m = FaceTempInfo{} }
+func (m *FaceTempInfo) String() string { return proto.CompactTextString(m) }
+func (*FaceTempInfo) ProtoMessage() {}
+func (*FaceTempInfo) Descriptor() ([]byte, []int) {
+ return fileDescriptor_4a4142572412ce8e, []int{0}
+}
+func (m *FaceTempInfo) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_FaceTempInfo.Unmarshal(m, b)
+}
+func (m *FaceTempInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_FaceTempInfo.Marshal(b, m, deterministic)
+}
+func (m *FaceTempInfo) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_FaceTempInfo.Merge(m, src)
+}
+func (m *FaceTempInfo) XXX_Size() int {
+ return xxx_messageInfo_FaceTempInfo.Size(m)
+}
+func (m *FaceTempInfo) XXX_DiscardUnknown() {
+ xxx_messageInfo_FaceTempInfo.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FaceTempInfo proto.InternalMessageInfo
+
+func (m *FaceTempInfo) GetAlarmVal() float32 {
+ if m != nil {
+ return m.AlarmVal
+ }
+ return 0
+}
+
+func (m *FaceTempInfo) GetSetVal() float32 {
+ if m != nil {
+ return m.SetVal
+ }
+ return 0
+}
+
+func (m *FaceTempInfo) GetFaceId() string {
+ if m != nil {
+ return m.FaceId
+ }
+ return ""
+}
+
+func (m *FaceTempInfo) GetFacePos() *Rect {
+ if m != nil {
+ return m.FacePos
+ }
+ return nil
+}
+
type AlarmInfo struct {
Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
- DevId string `protobuf:"bytes,2,opt,name=devId,proto3" json:"devId,omitempty"`
- Time string `protobuf:"bytes,3,opt,name=time,proto3" json:"time,omitempty"`
- AlarmVal float32 `protobuf:"fixed32,4,opt,name=alarmVal,proto3" json:"alarmVal,omitempty"`
- SetVal float32 `protobuf:"fixed32,5,opt,name=setVal,proto3" json:"setVal,omitempty"`
- FacePos *Rect `protobuf:"bytes,6,opt,name=facePos,proto3" json:"facePos,omitempty"`
- Image *Image `protobuf:"bytes,7,opt,name=image,proto3" json:"image,omitempty"`
+ Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -37,7 +94,7 @@
func (m *AlarmInfo) String() string { return proto.CompactTextString(m) }
func (*AlarmInfo) ProtoMessage() {}
func (*AlarmInfo) Descriptor() ([]byte, []int) {
- return fileDescriptor_4a4142572412ce8e, []int{0}
+ return fileDescriptor_4a4142572412ce8e, []int{1}
}
func (m *AlarmInfo) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_AlarmInfo.Unmarshal(m, b)
@@ -64,125 +121,98 @@
return ""
}
-func (m *AlarmInfo) GetDevId() string {
+func (m *AlarmInfo) GetData() []byte {
+ if m != nil {
+ return m.Data
+ }
+ return nil
+}
+
+type AlarmMessage struct {
+ DevId string `protobuf:"bytes,1,opt,name=devId,proto3" json:"devId,omitempty"`
+ Time string `protobuf:"bytes,2,opt,name=time,proto3" json:"time,omitempty"`
+ AlarmInfo []*AlarmInfo `protobuf:"bytes,3,rep,name=alarmInfo,proto3" json:"alarmInfo,omitempty"`
+ Data []byte `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
+}
+
+func (m *AlarmMessage) Reset() { *m = AlarmMessage{} }
+func (m *AlarmMessage) String() string { return proto.CompactTextString(m) }
+func (*AlarmMessage) ProtoMessage() {}
+func (*AlarmMessage) Descriptor() ([]byte, []int) {
+ return fileDescriptor_4a4142572412ce8e, []int{2}
+}
+func (m *AlarmMessage) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_AlarmMessage.Unmarshal(m, b)
+}
+func (m *AlarmMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_AlarmMessage.Marshal(b, m, deterministic)
+}
+func (m *AlarmMessage) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_AlarmMessage.Merge(m, src)
+}
+func (m *AlarmMessage) XXX_Size() int {
+ return xxx_messageInfo_AlarmMessage.Size(m)
+}
+func (m *AlarmMessage) XXX_DiscardUnknown() {
+ xxx_messageInfo_AlarmMessage.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_AlarmMessage proto.InternalMessageInfo
+
+func (m *AlarmMessage) GetDevId() string {
if m != nil {
return m.DevId
}
return ""
}
-func (m *AlarmInfo) GetTime() string {
+func (m *AlarmMessage) GetTime() string {
if m != nil {
return m.Time
}
return ""
}
-func (m *AlarmInfo) GetAlarmVal() float32 {
+func (m *AlarmMessage) GetAlarmInfo() []*AlarmInfo {
if m != nil {
- return m.AlarmVal
- }
- return 0
-}
-
-func (m *AlarmInfo) GetSetVal() float32 {
- if m != nil {
- return m.SetVal
- }
- return 0
-}
-
-func (m *AlarmInfo) GetFacePos() *Rect {
- if m != nil {
- return m.FacePos
+ return m.AlarmInfo
}
return nil
}
-func (m *AlarmInfo) GetImage() *Image {
+func (m *AlarmMessage) GetData() []byte {
if m != nil {
- return m.Image
- }
- return nil
-}
-
-type AlarmRuleMessage struct {
- Taskid string `protobuf:"bytes,1,opt,name=taskid,proto3" json:"taskid,omitempty"`
- Taskname string `protobuf:"bytes,2,opt,name=taskname,proto3" json:"taskname,omitempty"`
- Alarminfo *AlarmInfo `protobuf:"bytes,3,opt,name=alarminfo,proto3" json:"alarminfo,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *AlarmRuleMessage) Reset() { *m = AlarmRuleMessage{} }
-func (m *AlarmRuleMessage) String() string { return proto.CompactTextString(m) }
-func (*AlarmRuleMessage) ProtoMessage() {}
-func (*AlarmRuleMessage) Descriptor() ([]byte, []int) {
- return fileDescriptor_4a4142572412ce8e, []int{1}
-}
-func (m *AlarmRuleMessage) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_AlarmRuleMessage.Unmarshal(m, b)
-}
-func (m *AlarmRuleMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_AlarmRuleMessage.Marshal(b, m, deterministic)
-}
-func (m *AlarmRuleMessage) XXX_Merge(src proto.Message) {
- xxx_messageInfo_AlarmRuleMessage.Merge(m, src)
-}
-func (m *AlarmRuleMessage) XXX_Size() int {
- return xxx_messageInfo_AlarmRuleMessage.Size(m)
-}
-func (m *AlarmRuleMessage) XXX_DiscardUnknown() {
- xxx_messageInfo_AlarmRuleMessage.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_AlarmRuleMessage proto.InternalMessageInfo
-
-func (m *AlarmRuleMessage) GetTaskid() string {
- if m != nil {
- return m.Taskid
- }
- return ""
-}
-
-func (m *AlarmRuleMessage) GetTaskname() string {
- if m != nil {
- return m.Taskname
- }
- return ""
-}
-
-func (m *AlarmRuleMessage) GetAlarminfo() *AlarmInfo {
- if m != nil {
- return m.Alarminfo
+ return m.Data
}
return nil
}
func init() {
+ proto.RegisterType((*FaceTempInfo)(nil), "protomsg.FaceTempInfo")
proto.RegisterType((*AlarmInfo)(nil), "protomsg.AlarmInfo")
- proto.RegisterType((*AlarmRuleMessage)(nil), "protomsg.AlarmRuleMessage")
+ proto.RegisterType((*AlarmMessage)(nil), "protomsg.AlarmMessage")
}
func init() { proto.RegisterFile("alarm.proto", fileDescriptor_4a4142572412ce8e) }
var fileDescriptor_4a4142572412ce8e = []byte{
- // 253 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x50, 0x5d, 0x6b, 0x83, 0x30,
- 0x14, 0x25, 0x5d, 0xb5, 0xf5, 0x0a, 0xdb, 0xc8, 0xc6, 0x08, 0x3e, 0x49, 0x61, 0xe0, 0x93, 0xb0,
- 0xee, 0x17, 0xec, 0xd1, 0x87, 0xc1, 0xc8, 0xc3, 0xde, 0xd3, 0x7a, 0x95, 0x50, 0x63, 0x4a, 0x93,
- 0x0d, 0xfa, 0x27, 0xf7, 0x9b, 0x46, 0xae, 0xa9, 0x3e, 0x79, 0xcf, 0x87, 0x9c, 0x73, 0x02, 0xb9,
- 0x1a, 0xd4, 0xc5, 0xd4, 0xe7, 0x8b, 0xf5, 0x96, 0x6f, 0xe9, 0x63, 0x5c, 0x5f, 0xc0, 0x41, 0x39,
- 0x9c, 0xd8, 0x22, 0x73, 0xed, 0x69, 0x3a, 0x77, 0x7f, 0x0c, 0xb2, 0x8f, 0xf0, 0x43, 0x33, 0x76,
- 0x96, 0x73, 0x58, 0xfb, 0xeb, 0x19, 0x05, 0x2b, 0x59, 0x95, 0x49, 0xba, 0xf9, 0x33, 0x24, 0x2d,
- 0xfe, 0x36, 0xad, 0x58, 0x11, 0x39, 0x01, 0x72, 0x6a, 0x83, 0xe2, 0x2e, 0x3a, 0xb5, 0x41, 0x5e,
- 0xc0, 0x96, 0xb2, 0xbf, 0xd5, 0x20, 0xd6, 0x25, 0xab, 0x56, 0x72, 0xc6, 0xfc, 0x05, 0x52, 0x87,
- 0x3e, 0x28, 0x09, 0x29, 0x11, 0xf1, 0x0a, 0x36, 0x9d, 0x3a, 0xe2, 0x97, 0x75, 0x22, 0x2d, 0x59,
- 0x95, 0xef, 0xef, 0xeb, 0x5b, 0xe5, 0x5a, 0xe2, 0xd1, 0xcb, 0x9b, 0xcc, 0x5f, 0x21, 0xd1, 0x46,
- 0xf5, 0x28, 0x36, 0xe4, 0x7b, 0x58, 0x7c, 0x4d, 0xa0, 0xe5, 0xa4, 0xee, 0xae, 0xf0, 0x48, 0x7b,
- 0xe4, 0xcf, 0x80, 0x9f, 0xe8, 0x9c, 0xea, 0x31, 0x84, 0x7b, 0xe5, 0x4e, 0xba, 0x8d, 0xc3, 0x22,
- 0x0a, 0x85, 0xc3, 0x35, 0x2a, 0x83, 0x71, 0xdd, 0x8c, 0xf9, 0x1b, 0x64, 0x54, 0x5e, 0x8f, 0x9d,
- 0xa5, 0x95, 0xf9, 0xfe, 0x69, 0x89, 0x9c, 0x9f, 0x4c, 0x2e, 0xae, 0x43, 0x4a, 0xf2, 0xfb, 0x7f,
- 0x00, 0x00, 0x00, 0xff, 0xff, 0x3f, 0xc6, 0x49, 0x95, 0x82, 0x01, 0x00, 0x00,
+ // 240 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x8e, 0x3f, 0x6b, 0xc3, 0x30,
+ 0x10, 0xc5, 0x51, 0xec, 0xa6, 0xf1, 0xd9, 0x74, 0x50, 0x4b, 0x31, 0x99, 0x8c, 0x27, 0x4d, 0x86,
+ 0x26, 0x9f, 0xa0, 0x4b, 0xc1, 0x43, 0xa1, 0x88, 0xd2, 0xfd, 0x62, 0x5d, 0x42, 0x20, 0xaa, 0x4c,
+ 0x24, 0x0a, 0x9d, 0xba, 0xf4, 0x83, 0x07, 0x9d, 0xff, 0x4d, 0xba, 0x77, 0x4f, 0xef, 0xde, 0x0f,
+ 0x72, 0xbc, 0xe0, 0xd5, 0x36, 0xfd, 0xd5, 0x05, 0x27, 0x37, 0xfc, 0x58, 0x7f, 0xda, 0xc2, 0x01,
+ 0x3d, 0x0d, 0xdb, 0xfa, 0x5f, 0x40, 0xf1, 0x86, 0x1d, 0x7d, 0x92, 0xed, 0xdb, 0xef, 0xa3, 0x93,
+ 0x5b, 0xd8, 0x70, 0xea, 0x0b, 0x2f, 0xa5, 0xa8, 0x84, 0x5a, 0xe9, 0x59, 0xcb, 0x67, 0x58, 0x7b,
+ 0x0a, 0xd1, 0x59, 0xb1, 0x33, 0xaa, 0xb8, 0x3f, 0x62, 0x47, 0xad, 0x29, 0x93, 0x4a, 0xa8, 0x4c,
+ 0x8f, 0x4a, 0x2a, 0xb8, 0x8f, 0xd3, 0x87, 0xf3, 0x65, 0x5a, 0x09, 0x95, 0xef, 0x1e, 0x9a, 0x09,
+ 0xa2, 0xd1, 0xd4, 0x05, 0x3d, 0xd9, 0xf5, 0x1e, 0xb2, 0xd7, 0xd8, 0xc2, 0x08, 0x12, 0xd2, 0xf0,
+ 0xdb, 0x13, 0xd7, 0x67, 0x9a, 0xe7, 0xb8, 0x33, 0x18, 0x90, 0x8b, 0x0b, 0xcd, 0x73, 0xfd, 0x07,
+ 0x05, 0x87, 0xde, 0xc9, 0x7b, 0x3c, 0x91, 0x7c, 0x82, 0x3b, 0x43, 0x3f, 0xad, 0x19, 0x83, 0x83,
+ 0xe0, 0x6b, 0x67, 0x4b, 0x9c, 0x8c, 0xd7, 0xce, 0x96, 0xe4, 0x0b, 0x64, 0x38, 0xd5, 0x95, 0x49,
+ 0x95, 0xa8, 0x7c, 0xf7, 0xb8, 0xa0, 0xcd, 0x24, 0x7a, 0xf9, 0x35, 0x03, 0xa4, 0x0b, 0xc0, 0x61,
+ 0xcd, 0x91, 0xfd, 0x2d, 0x00, 0x00, 0xff, 0xff, 0x84, 0xee, 0xcf, 0x65, 0x68, 0x01, 0x00, 0x00,
}
--
Gitblit v1.8.0