From 0126e444e24a22acb1b5909389d7eeba48ba7f6a Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 08 七月 2019 11:42:54 +0800
Subject: [PATCH] rm compare scord
---
/dev/null | 1325 ---------------------------------------------
sdk.pb.go | 140 +++-
protomsg.proto | 1
sdk.proto | 3
es.proto | 5
protomsg.pb.go | 235 ++++---
6 files changed, 242 insertions(+), 1,467 deletions(-)
diff --git a/es.pb.go b/es.pb.go
deleted file mode 100644
index c4e7803..0000000
--- a/es.pb.go
+++ /dev/null
@@ -1,1325 +0,0 @@
-// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: es.proto
-
-package protomsg
-
-import (
- encoding_binary "encoding/binary"
- fmt "fmt"
- proto "github.com/gogo/protobuf/proto"
- io "io"
- math "math"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
-
-type Baseinfo struct {
- FaceFeature string `protobuf:"bytes,1,opt,name=faceFeature,proto3" json:"faceFeature,omitempty"`
- PersonId string `protobuf:"bytes,2,opt,name=personId,proto3" json:"personId,omitempty"`
- TableId string `protobuf:"bytes,3,opt,name=tableId,proto3" json:"tableId,omitempty"`
- TableName string `protobuf:"bytes,4,opt,name=tableName,proto3" json:"tableName,omitempty"`
- PersonName string `protobuf:"bytes,6,opt,name=personName,proto3" json:"personName,omitempty"`
- PersonPicUrl string `protobuf:"bytes,7,opt,name=personPicUrl,proto3" json:"personPicUrl,omitempty"`
- PhoneNum string `protobuf:"bytes,8,opt,name=phoneNum,proto3" json:"phoneNum,omitempty"`
- Sex string `protobuf:"bytes,9,opt,name=sex,proto3" json:"sex,omitempty"`
- Idcard string `protobuf:"bytes,10,opt,name=idcard,proto3" json:"idcard,omitempty"`
- MonitorLevel string `protobuf:"bytes,11,opt,name=monitorLevel,proto3" json:"monitorLevel,omitempty"`
- Content string `protobuf:"bytes,12,opt,name=content,proto3" json:"content,omitempty"`
-}
-
-func (m *Baseinfo) Reset() { *m = Baseinfo{} }
-func (m *Baseinfo) String() string { return proto.CompactTextString(m) }
-func (*Baseinfo) ProtoMessage() {}
-func (*Baseinfo) Descriptor() ([]byte, []int) {
- return fileDescriptor_718db5c20d0f3738, []int{0}
-}
-func (m *Baseinfo) XXX_Unmarshal(b []byte) error {
- return m.Unmarshal(b)
-}
-func (m *Baseinfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- if deterministic {
- return xxx_messageInfo_Baseinfo.Marshal(b, m, deterministic)
- } else {
- b = b[:cap(b)]
- n, err := m.MarshalTo(b)
- if err != nil {
- return nil, err
- }
- return b[:n], nil
- }
-}
-func (m *Baseinfo) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Baseinfo.Merge(m, src)
-}
-func (m *Baseinfo) XXX_Size() int {
- return m.Size()
-}
-func (m *Baseinfo) XXX_DiscardUnknown() {
- xxx_messageInfo_Baseinfo.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Baseinfo proto.InternalMessageInfo
-
-func (m *Baseinfo) GetFaceFeature() string {
- if m != nil {
- return m.FaceFeature
- }
- return ""
-}
-
-func (m *Baseinfo) GetPersonId() string {
- if m != nil {
- return m.PersonId
- }
- return ""
-}
-
-func (m *Baseinfo) GetTableId() string {
- if m != nil {
- return m.TableId
- }
- return ""
-}
-
-func (m *Baseinfo) GetTableName() string {
- if m != nil {
- return m.TableName
- }
- return ""
-}
-
-func (m *Baseinfo) GetPersonName() string {
- if m != nil {
- return m.PersonName
- }
- return ""
-}
-
-func (m *Baseinfo) GetPersonPicUrl() string {
- if m != nil {
- return m.PersonPicUrl
- }
- return ""
-}
-
-func (m *Baseinfo) GetPhoneNum() string {
- if m != nil {
- return m.PhoneNum
- }
- return ""
-}
-
-func (m *Baseinfo) GetSex() string {
- if m != nil {
- return m.Sex
- }
- return ""
-}
-
-func (m *Baseinfo) GetIdcard() string {
- if m != nil {
- return m.Idcard
- }
- return ""
-}
-
-func (m *Baseinfo) GetMonitorLevel() string {
- if m != nil {
- return m.MonitorLevel
- }
- return ""
-}
-
-func (m *Baseinfo) GetContent() string {
- if m != nil {
- return m.Content
- }
- return ""
-}
-
-type Binfos struct {
- Infos []*Baseinfo `protobuf:"bytes,1,rep,name=infos,proto3" json:"infos,omitempty"`
-}
-
-func (m *Binfos) Reset() { *m = Binfos{} }
-func (m *Binfos) String() string { return proto.CompactTextString(m) }
-func (*Binfos) ProtoMessage() {}
-func (*Binfos) Descriptor() ([]byte, []int) {
- return fileDescriptor_718db5c20d0f3738, []int{1}
-}
-func (m *Binfos) XXX_Unmarshal(b []byte) error {
- return m.Unmarshal(b)
-}
-func (m *Binfos) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- if deterministic {
- return xxx_messageInfo_Binfos.Marshal(b, m, deterministic)
- } else {
- b = b[:cap(b)]
- n, err := m.MarshalTo(b)
- if err != nil {
- return nil, err
- }
- return b[:n], nil
- }
-}
-func (m *Binfos) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Binfos.Merge(m, src)
-}
-func (m *Binfos) XXX_Size() int {
- return m.Size()
-}
-func (m *Binfos) XXX_DiscardUnknown() {
- xxx_messageInfo_Binfos.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Binfos proto.InternalMessageInfo
-
-func (m *Binfos) GetInfos() []*Baseinfo {
- if m != nil {
- return m.Infos
- }
- return nil
-}
-
-type Esinfo 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"`
- FaceFeature string `protobuf:"bytes,3,opt,name=faceFeature,proto3" json:"faceFeature,omitempty"`
- CompareScore float32 `protobuf:"fixed32,4,opt,name=compareScore,proto3" json:"compareScore,omitempty"`
-}
-
-func (m *Esinfo) Reset() { *m = Esinfo{} }
-func (m *Esinfo) String() string { return proto.CompactTextString(m) }
-func (*Esinfo) ProtoMessage() {}
-func (*Esinfo) Descriptor() ([]byte, []int) {
- return fileDescriptor_718db5c20d0f3738, []int{2}
-}
-func (m *Esinfo) XXX_Unmarshal(b []byte) error {
- return m.Unmarshal(b)
-}
-func (m *Esinfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- if deterministic {
- return xxx_messageInfo_Esinfo.Marshal(b, m, deterministic)
- } else {
- b = b[:cap(b)]
- n, err := m.MarshalTo(b)
- if err != nil {
- return nil, err
- }
- return b[:n], nil
- }
-}
-func (m *Esinfo) XXX_Merge(src proto.Message) {
- xxx_messageInfo_Esinfo.Merge(m, src)
-}
-func (m *Esinfo) XXX_Size() int {
- return m.Size()
-}
-func (m *Esinfo) XXX_DiscardUnknown() {
- xxx_messageInfo_Esinfo.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Esinfo proto.InternalMessageInfo
-
-func (m *Esinfo) GetId() string {
- if m != nil {
- return m.Id
- }
- return ""
-}
-
-func (m *Esinfo) GetTableid() string {
- if m != nil {
- return m.Tableid
- }
- return ""
-}
-
-func (m *Esinfo) GetFaceFeature() string {
- if m != nil {
- return m.FaceFeature
- }
- return ""
-}
-
-func (m *Esinfo) GetCompareScore() float32 {
- if m != nil {
- return m.CompareScore
- }
- return 0
-}
-
-func init() {
- proto.RegisterType((*Baseinfo)(nil), "protomsg.Baseinfo")
- proto.RegisterType((*Binfos)(nil), "protomsg.Binfos")
- proto.RegisterType((*Esinfo)(nil), "protomsg.Esinfo")
-}
-
-func init() { proto.RegisterFile("es.proto", fileDescriptor_718db5c20d0f3738) }
-
-var fileDescriptor_718db5c20d0f3738 = []byte{
- // 332 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xc1, 0x6a, 0xc2, 0x40,
- 0x10, 0x86, 0x4d, 0xd2, 0xc6, 0x38, 0x4a, 0x29, 0x7b, 0x28, 0x43, 0x29, 0x8b, 0xe4, 0xe4, 0xc9,
- 0x83, 0x7d, 0x03, 0xa1, 0x05, 0xa1, 0x48, 0xb1, 0xf4, 0x01, 0xd6, 0x64, 0x6c, 0x17, 0x4c, 0x56,
- 0x76, 0x63, 0xf1, 0x31, 0xfa, 0x58, 0x1e, 0x3d, 0xf6, 0x58, 0xf4, 0x45, 0x4a, 0x26, 0x49, 0xd5,
- 0xf6, 0x94, 0xf9, 0xff, 0x7f, 0xc9, 0xcc, 0x7c, 0x03, 0x11, 0xb9, 0xe1, 0xca, 0x9a, 0xc2, 0x88,
- 0x88, 0x3f, 0x99, 0x7b, 0x8b, 0xb7, 0x3e, 0x44, 0x63, 0xe5, 0x48, 0xe7, 0x0b, 0x23, 0xfa, 0xd0,
- 0x5d, 0xa8, 0x84, 0x1e, 0x49, 0x15, 0x6b, 0x4b, 0xe8, 0xf5, 0xbd, 0x41, 0x67, 0x76, 0x6a, 0x89,
- 0x5b, 0x88, 0x56, 0x64, 0x9d, 0xc9, 0x27, 0x29, 0xfa, 0x1c, 0xff, 0x6a, 0x81, 0xd0, 0x2e, 0xd4,
- 0x7c, 0x49, 0x93, 0x14, 0x03, 0x8e, 0x1a, 0x29, 0xee, 0xa0, 0xc3, 0xe5, 0x54, 0x65, 0x84, 0x17,
- 0x9c, 0x1d, 0x0d, 0x21, 0x01, 0xaa, 0x7f, 0x70, 0x1c, 0x72, 0x7c, 0xe2, 0x88, 0x18, 0x7a, 0x95,
- 0x7a, 0xd6, 0xc9, 0xab, 0x5d, 0x62, 0x9b, 0x5f, 0x9c, 0x79, 0x3c, 0xd7, 0xbb, 0xc9, 0x69, 0xba,
- 0xce, 0x30, 0xaa, 0xe7, 0xaa, 0xb5, 0xb8, 0x86, 0xc0, 0xd1, 0x06, 0x3b, 0x6c, 0x97, 0xa5, 0xb8,
- 0x81, 0x50, 0xa7, 0x89, 0xb2, 0x29, 0x02, 0x9b, 0xb5, 0x2a, 0x3b, 0x65, 0x26, 0xd7, 0x85, 0xb1,
- 0x4f, 0xf4, 0x41, 0x4b, 0xec, 0x56, 0x9d, 0x4e, 0xbd, 0x72, 0xcb, 0xc4, 0xe4, 0x05, 0xe5, 0x05,
- 0xf6, 0xaa, 0x2d, 0x6b, 0x19, 0x8f, 0x20, 0x1c, 0x97, 0x18, 0x9d, 0x18, 0xc0, 0x25, 0x17, 0xe8,
- 0xf5, 0x83, 0x41, 0x77, 0x24, 0x86, 0x0d, 0xee, 0x61, 0x83, 0x7a, 0x56, 0x3d, 0x88, 0x37, 0x10,
- 0x3e, 0x38, 0x66, 0x7f, 0x05, 0xbe, 0x4e, 0x6b, 0xe4, 0xbe, 0x3e, 0xd2, 0xd4, 0x0d, 0xe8, 0x46,
- 0xfe, 0xbd, 0x52, 0xf0, 0xff, 0x4a, 0x31, 0xf4, 0x12, 0x93, 0xad, 0x94, 0xa5, 0x97, 0xc4, 0xd8,
- 0x0a, 0xb9, 0x3f, 0x3b, 0xf3, 0xc6, 0xb8, 0xdd, 0x4b, 0x6f, 0xb7, 0x97, 0xde, 0xf7, 0x5e, 0x7a,
- 0x9f, 0x07, 0xd9, 0xda, 0x1d, 0x64, 0xeb, 0xeb, 0x20, 0x5b, 0xf3, 0x90, 0xa7, 0xbd, 0xff, 0x09,
- 0x00, 0x00, 0xff, 0xff, 0x5b, 0x12, 0xc2, 0xf5, 0x2f, 0x02, 0x00, 0x00,
-}
-
-func (m *Baseinfo) Marshal() (dAtA []byte, err error) {
- size := m.Size()
- dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
- if err != nil {
- return nil, err
- }
- return dAtA[:n], nil
-}
-
-func (m *Baseinfo) MarshalTo(dAtA []byte) (int, error) {
- var i int
- _ = i
- var l int
- _ = l
- if len(m.FaceFeature) > 0 {
- dAtA[i] = 0xa
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.FaceFeature)))
- i += copy(dAtA[i:], m.FaceFeature)
- }
- if len(m.PersonId) > 0 {
- dAtA[i] = 0x12
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.PersonId)))
- i += copy(dAtA[i:], m.PersonId)
- }
- if len(m.TableId) > 0 {
- dAtA[i] = 0x1a
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.TableId)))
- i += copy(dAtA[i:], m.TableId)
- }
- if len(m.TableName) > 0 {
- dAtA[i] = 0x22
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.TableName)))
- i += copy(dAtA[i:], m.TableName)
- }
- if len(m.PersonName) > 0 {
- dAtA[i] = 0x32
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.PersonName)))
- i += copy(dAtA[i:], m.PersonName)
- }
- if len(m.PersonPicUrl) > 0 {
- dAtA[i] = 0x3a
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.PersonPicUrl)))
- i += copy(dAtA[i:], m.PersonPicUrl)
- }
- if len(m.PhoneNum) > 0 {
- dAtA[i] = 0x42
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.PhoneNum)))
- i += copy(dAtA[i:], m.PhoneNum)
- }
- if len(m.Sex) > 0 {
- dAtA[i] = 0x4a
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.Sex)))
- i += copy(dAtA[i:], m.Sex)
- }
- if len(m.Idcard) > 0 {
- dAtA[i] = 0x52
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.Idcard)))
- i += copy(dAtA[i:], m.Idcard)
- }
- if len(m.MonitorLevel) > 0 {
- dAtA[i] = 0x5a
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.MonitorLevel)))
- i += copy(dAtA[i:], m.MonitorLevel)
- }
- if len(m.Content) > 0 {
- dAtA[i] = 0x62
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.Content)))
- i += copy(dAtA[i:], m.Content)
- }
- return i, nil
-}
-
-func (m *Binfos) Marshal() (dAtA []byte, err error) {
- size := m.Size()
- dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
- if err != nil {
- return nil, err
- }
- return dAtA[:n], nil
-}
-
-func (m *Binfos) MarshalTo(dAtA []byte) (int, error) {
- var i int
- _ = i
- var l int
- _ = l
- if len(m.Infos) > 0 {
- for _, msg := range m.Infos {
- dAtA[i] = 0xa
- i++
- i = encodeVarintEs(dAtA, i, uint64(msg.Size()))
- n, err := msg.MarshalTo(dAtA[i:])
- if err != nil {
- return 0, err
- }
- i += n
- }
- }
- return i, nil
-}
-
-func (m *Esinfo) Marshal() (dAtA []byte, err error) {
- size := m.Size()
- dAtA = make([]byte, size)
- n, err := m.MarshalTo(dAtA)
- if err != nil {
- return nil, err
- }
- return dAtA[:n], nil
-}
-
-func (m *Esinfo) MarshalTo(dAtA []byte) (int, error) {
- var i int
- _ = i
- var l int
- _ = l
- if len(m.Id) > 0 {
- dAtA[i] = 0xa
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.Id)))
- i += copy(dAtA[i:], m.Id)
- }
- if len(m.Tableid) > 0 {
- dAtA[i] = 0x12
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.Tableid)))
- i += copy(dAtA[i:], m.Tableid)
- }
- if len(m.FaceFeature) > 0 {
- dAtA[i] = 0x1a
- i++
- i = encodeVarintEs(dAtA, i, uint64(len(m.FaceFeature)))
- i += copy(dAtA[i:], m.FaceFeature)
- }
- if m.CompareScore != 0 {
- dAtA[i] = 0x25
- i++
- encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.CompareScore))))
- i += 4
- }
- return i, nil
-}
-
-func encodeVarintEs(dAtA []byte, offset int, v uint64) int {
- for v >= 1<<7 {
- dAtA[offset] = uint8(v&0x7f | 0x80)
- v >>= 7
- offset++
- }
- dAtA[offset] = uint8(v)
- return offset + 1
-}
-func (m *Baseinfo) Size() (n int) {
- if m == nil {
- return 0
- }
- var l int
- _ = l
- l = len(m.FaceFeature)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- l = len(m.PersonId)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- l = len(m.TableId)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- l = len(m.TableName)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- l = len(m.PersonName)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- l = len(m.PersonPicUrl)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- l = len(m.PhoneNum)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- l = len(m.Sex)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- l = len(m.Idcard)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- l = len(m.MonitorLevel)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- l = len(m.Content)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- return n
-}
-
-func (m *Binfos) Size() (n int) {
- if m == nil {
- return 0
- }
- var l int
- _ = l
- if len(m.Infos) > 0 {
- for _, e := range m.Infos {
- l = e.Size()
- n += 1 + l + sovEs(uint64(l))
- }
- }
- return n
-}
-
-func (m *Esinfo) Size() (n int) {
- if m == nil {
- return 0
- }
- var l int
- _ = l
- l = len(m.Id)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- l = len(m.Tableid)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- l = len(m.FaceFeature)
- if l > 0 {
- n += 1 + l + sovEs(uint64(l))
- }
- if m.CompareScore != 0 {
- n += 5
- }
- return n
-}
-
-func sovEs(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
-}
-func sozEs(x uint64) (n int) {
- return sovEs(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *Baseinfo) Unmarshal(dAtA []byte) error {
- l := len(dAtA)
- iNdEx := 0
- for iNdEx < l {
- preIndex := iNdEx
- var wire uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowEs
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- wire |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- fieldNum := int32(wire >> 3)
- wireType := int(wire & 0x7)
- if wireType == 4 {
- return fmt.Errorf("proto: Baseinfo: wiretype end group for non-group")
- }
- if fieldNum <= 0 {
- return fmt.Errorf("proto: Baseinfo: illegal tag %d (wire type %d)", fieldNum, wire)
- }
- switch fieldNum {
- case 1:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field FaceFeature", 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.FaceFeature = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 2:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field PersonId", 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.PersonId = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 3:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field TableId", 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.TableId = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 4:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field TableName", 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.TableName = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 6:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field PersonName", 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.PersonName = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 7:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field PersonPicUrl", 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.PersonPicUrl = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 8:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field PhoneNum", 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.PhoneNum = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 9:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Sex", 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.Sex = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 10:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Idcard", 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.Idcard = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 11:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field MonitorLevel", 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.MonitorLevel = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 12:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Content", 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.Content = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- default:
- iNdEx = preIndex
- skippy, err := skipEs(dAtA[iNdEx:])
- if err != nil {
- return err
- }
- if skippy < 0 {
- return ErrInvalidLengthEs
- }
- if (iNdEx + skippy) < 0 {
- return ErrInvalidLengthEs
- }
- if (iNdEx + skippy) > l {
- return io.ErrUnexpectedEOF
- }
- iNdEx += skippy
- }
- }
-
- if iNdEx > l {
- return io.ErrUnexpectedEOF
- }
- return nil
-}
-func (m *Binfos) Unmarshal(dAtA []byte) error {
- l := len(dAtA)
- iNdEx := 0
- for iNdEx < l {
- preIndex := iNdEx
- var wire uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowEs
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- wire |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- fieldNum := int32(wire >> 3)
- wireType := int(wire & 0x7)
- if wireType == 4 {
- return fmt.Errorf("proto: Binfos: wiretype end group for non-group")
- }
- if fieldNum <= 0 {
- return fmt.Errorf("proto: Binfos: illegal tag %d (wire type %d)", fieldNum, wire)
- }
- switch fieldNum {
- case 1:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Infos", 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
- }
- m.Infos = append(m.Infos, &Baseinfo{})
- if err := m.Infos[len(m.Infos)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
- return err
- }
- iNdEx = postIndex
- default:
- iNdEx = preIndex
- skippy, err := skipEs(dAtA[iNdEx:])
- if err != nil {
- return err
- }
- if skippy < 0 {
- return ErrInvalidLengthEs
- }
- if (iNdEx + skippy) < 0 {
- return ErrInvalidLengthEs
- }
- if (iNdEx + skippy) > l {
- return io.ErrUnexpectedEOF
- }
- iNdEx += skippy
- }
- }
-
- if iNdEx > l {
- return io.ErrUnexpectedEOF
- }
- return nil
-}
-func (m *Esinfo) Unmarshal(dAtA []byte) error {
- l := len(dAtA)
- iNdEx := 0
- for iNdEx < l {
- preIndex := iNdEx
- var wire uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowEs
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- wire |= uint64(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- fieldNum := int32(wire >> 3)
- wireType := int(wire & 0x7)
- if wireType == 4 {
- return fmt.Errorf("proto: Esinfo: wiretype end group for non-group")
- }
- if fieldNum <= 0 {
- return fmt.Errorf("proto: Esinfo: illegal tag %d (wire type %d)", fieldNum, wire)
- }
- switch fieldNum {
- case 1:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Id", 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.Id = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 2:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field Tableid", 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.Tableid = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 3:
- if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field FaceFeature", 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.FaceFeature = string(dAtA[iNdEx:postIndex])
- iNdEx = postIndex
- case 4:
- if wireType != 5 {
- return fmt.Errorf("proto: wrong wireType = %d for field CompareScore", wireType)
- }
- var v uint32
- if (iNdEx + 4) > l {
- return io.ErrUnexpectedEOF
- }
- v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:]))
- iNdEx += 4
- m.CompareScore = float32(math.Float32frombits(v))
- default:
- iNdEx = preIndex
- skippy, err := skipEs(dAtA[iNdEx:])
- if err != nil {
- return err
- }
- if skippy < 0 {
- return ErrInvalidLengthEs
- }
- if (iNdEx + skippy) < 0 {
- return ErrInvalidLengthEs
- }
- if (iNdEx + skippy) > l {
- return io.ErrUnexpectedEOF
- }
- iNdEx += skippy
- }
- }
-
- if iNdEx > l {
- return io.ErrUnexpectedEOF
- }
- return nil
-}
-func skipEs(dAtA []byte) (n int, err error) {
- l := len(dAtA)
- iNdEx := 0
- for iNdEx < l {
- var wire uint64
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowEs
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- wire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- wireType := int(wire & 0x7)
- switch wireType {
- case 0:
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowEs
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- iNdEx++
- if dAtA[iNdEx-1] < 0x80 {
- break
- }
- }
- return iNdEx, nil
- case 1:
- iNdEx += 8
- return iNdEx, nil
- case 2:
- var length int
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowEs
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- length |= (int(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- if length < 0 {
- return 0, ErrInvalidLengthEs
- }
- iNdEx += length
- if iNdEx < 0 {
- return 0, ErrInvalidLengthEs
- }
- return iNdEx, nil
- case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowEs
- }
- if iNdEx >= l {
- return 0, io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- innerWire |= (uint64(b) & 0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- innerWireType := int(innerWire & 0x7)
- if innerWireType == 4 {
- break
- }
- next, err := skipEs(dAtA[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- if iNdEx < 0 {
- return 0, ErrInvalidLengthEs
- }
- }
- return iNdEx, nil
- case 4:
- return iNdEx, nil
- case 5:
- iNdEx += 4
- return iNdEx, nil
- default:
- return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
- }
- }
- panic("unreachable")
-}
-
-var (
- ErrInvalidLengthEs = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowEs = fmt.Errorf("proto: integer overflow")
-)
diff --git a/es.proto b/es.proto
index ef13b81..95dc89f 100644
--- a/es.proto
+++ b/es.proto
@@ -11,9 +11,14 @@
string personPicUrl =7;
string phoneNum =8;
string sex =9;
+<<<<<<< HEAD
string idcard = 10;
+=======
+ string idCard = 10;
+>>>>>>> 8cd3a0511c78f1191b642ccd4fa4b1e1ee14c0a4
string monitorLevel = 11;
string content = 12;
+ string picDesc = 13;
}
message Binfos{
diff --git a/protomsg.pb.go b/protomsg.pb.go
index 5ea3105..3f3f264 100644
--- a/protomsg.pb.go
+++ b/protomsg.pb.go
@@ -981,6 +981,7 @@
type TaskGroupArgs struct {
TaskId string `protobuf:"bytes,1,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"`
GroupRules []*GroupRule `protobuf:"bytes,2,rep,name=group_rules,json=groupRules,proto3" json:"group_rules,omitempty"`
+ Enable bool `protobuf:"varint,3,opt,name=enable,proto3" json:"enable,omitempty"`
}
func (m *TaskGroupArgs) Reset() { *m = TaskGroupArgs{} }
@@ -1028,6 +1029,13 @@
return m.GroupRules
}
return nil
+}
+
+func (m *TaskGroupArgs) GetEnable() bool {
+ if m != nil {
+ return m.Enable
+ }
+ return false
}
type GroupRule struct {
@@ -1651,105 +1659,105 @@
func init() { proto.RegisterFile("protomsg.proto", fileDescriptor_32de24555f916688) }
var fileDescriptor_32de24555f916688 = []byte{
- // 1556 bytes of a gzipped FileDescriptorProto
+ // 1561 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcd, 0x6e, 0xdc, 0xc8,
0x11, 0x16, 0xe7, 0x97, 0xac, 0xf9, 0x11, 0xdd, 0x76, 0x76, 0x19, 0x6f, 0x56, 0x91, 0xb9, 0x0e,
- 0x22, 0x18, 0x89, 0x0f, 0xda, 0x7d, 0x81, 0x59, 0x2b, 0x0e, 0x06, 0xd8, 0x2c, 0x1c, 0x6a, 0x76,
- 0x73, 0x0b, 0xd1, 0x33, 0xdd, 0x1a, 0x11, 0x43, 0x91, 0x83, 0xee, 0xa6, 0x6c, 0x3d, 0x45, 0x72,
- 0xcc, 0x1b, 0x04, 0xb9, 0xe5, 0x31, 0x72, 0xf4, 0x31, 0xb7, 0x04, 0x36, 0x90, 0x4b, 0x90, 0x57,
- 0x08, 0x82, 0xaa, 0x6e, 0x72, 0x38, 0x63, 0x65, 0xe1, 0x5b, 0xd5, 0x57, 0xc5, 0x66, 0xf5, 0x57,
- 0x5f, 0x57, 0x37, 0x4c, 0xb7, 0xaa, 0x34, 0xe5, 0x8d, 0x5e, 0x3f, 0x27, 0x83, 0xf9, 0xb5, 0xff,
- 0x18, 0x96, 0x5c, 0x4b, 0x8b, 0xc6, 0x2f, 0xa1, 0x37, 0x53, 0x92, 0xb3, 0x29, 0x74, 0x32, 0x11,
- 0x79, 0xa7, 0xde, 0x59, 0x3f, 0xe9, 0x64, 0x82, 0x3d, 0x06, 0x7f, 0xcb, 0x95, 0x2c, 0x4c, 0x26,
- 0xa2, 0x0e, 0xa1, 0x8d, 0xcf, 0x18, 0xf4, 0x0a, 0x7e, 0x23, 0xa3, 0xee, 0xa9, 0x77, 0x16, 0x24,
- 0x64, 0xc7, 0xff, 0xed, 0xc2, 0xe0, 0x05, 0xbf, 0x91, 0xaa, 0xbd, 0x54, 0x40, 0x4b, 0xd5, 0xe9,
- 0x9d, 0x5d, 0x3a, 0x7b, 0x04, 0x7d, 0x9e, 0x67, 0x5c, 0xbb, 0x35, 0xac, 0xc3, 0x9e, 0xc0, 0x58,
- 0x17, 0x7c, 0xab, 0xaf, 0x4b, 0x93, 0x56, 0x2a, 0x8f, 0x7a, 0x14, 0x1c, 0xd5, 0xd8, 0x77, 0x2a,
- 0xc7, 0xc5, 0xcc, 0xdd, 0x56, 0x46, 0x7d, 0xaa, 0x89, 0x6c, 0xc4, 0xb8, 0x10, 0x2a, 0x1a, 0xd8,
- 0x1f, 0xa0, 0xcd, 0x3e, 0x81, 0x01, 0x57, 0x92, 0x67, 0x22, 0x1a, 0x52, 0xa6, 0xf3, 0xd8, 0x4f,
- 0x20, 0xc8, 0xcb, 0x62, 0x9d, 0x99, 0x4a, 0xc8, 0xc8, 0x3f, 0xf5, 0xce, 0x3a, 0xc9, 0x0e, 0xc0,
- 0x5d, 0xe7, 0xdc, 0xd8, 0x60, 0x40, 0xc1, 0xc6, 0xc7, 0xbf, 0x28, 0xa3, 0xb7, 0x11, 0xd8, 0xbf,
- 0xa0, 0x4d, 0x5b, 0xdd, 0x46, 0x23, 0xb7, 0xd5, 0x2d, 0xe6, 0x6c, 0x4b, 0x65, 0xa2, 0xb1, 0xad,
- 0x0e, 0x6d, 0x5c, 0xb3, 0xd2, 0x52, 0x11, 0x05, 0x13, 0xca, 0x6c, 0x7c, 0xcb, 0xb2, 0xd6, 0xaf,
- 0x4b, 0x25, 0xa2, 0xa9, 0x8d, 0xd5, 0x3e, 0x52, 0xb4, 0x54, 0xbc, 0x10, 0xd1, 0xb1, 0xa5, 0x88,
- 0x1c, 0xfc, 0x42, 0x49, 0x2d, 0xd5, 0xad, 0x14, 0x51, 0x68, 0xbf, 0xa8, 0x7d, 0xf6, 0x39, 0x40,
- 0xa6, 0x53, 0x55, 0x15, 0x45, 0x56, 0xac, 0xa3, 0x07, 0xa7, 0xde, 0x99, 0x9f, 0x04, 0x99, 0x4e,
- 0x2c, 0x80, 0x61, 0x55, 0x15, 0xa9, 0x2c, 0xf8, 0x32, 0x97, 0x11, 0xb3, 0x61, 0x55, 0x15, 0xbf,
- 0x22, 0x80, 0xfd, 0x18, 0x7c, 0x0c, 0x13, 0xbb, 0x0f, 0xa9, 0xfe, 0xa1, 0xaa, 0x8a, 0x05, 0x12,
- 0x1c, 0xc3, 0x04, 0x43, 0xf4, 0x1b, 0x95, 0x66, 0x22, 0x7a, 0x64, 0x1b, 0xa3, 0xaa, 0xe2, 0x92,
- 0xb0, 0xb9, 0x88, 0x57, 0xf0, 0xc0, 0xf6, 0x7f, 0x56, 0x88, 0x05, 0xd7, 0x9b, 0x79, 0x71, 0x55,
- 0xb2, 0x33, 0x18, 0xac, 0x08, 0x24, 0x39, 0x8c, 0xce, 0xc3, 0xe7, 0x8d, 0x28, 0x6d, 0x72, 0xe2,
- 0xe2, 0xec, 0x29, 0xf4, 0x0d, 0xd7, 0x1b, 0x1d, 0x75, 0x4e, 0xbb, 0x67, 0xa3, 0xf3, 0xe9, 0x2e,
- 0x11, 0x17, 0x4b, 0x6c, 0x30, 0xfe, 0x87, 0x07, 0x3d, 0xf4, 0xb1, 0xbd, 0x88, 0x34, 0x3a, 0x73,
- 0x1e, 0xd2, 0x83, 0x56, 0x4b, 0x6f, 0x8d, 0xcf, 0x3e, 0x83, 0x60, 0xa5, 0x24, 0x37, 0x32, 0xe5,
- 0xc6, 0xe9, 0xce, 0xb7, 0xc0, 0xcc, 0xb4, 0x82, 0xcb, 0x3b, 0xa7, 0x3b, 0x17, 0xfc, 0xfa, 0x0e,
- 0x83, 0xd5, 0x56, 0xb8, 0x2f, 0xfb, 0xae, 0x87, 0x04, 0xcc, 0x0c, 0x96, 0xe2, 0x28, 0x1d, 0x10,
- 0xa5, 0xce, 0x43, 0x3e, 0x33, 0x9d, 0xf2, 0x9c, 0xab, 0x1b, 0xd2, 0xa0, 0x9f, 0x0c, 0x33, 0x3d,
- 0x43, 0x17, 0x43, 0x42, 0xe6, 0xe9, 0x55, 0xce, 0xd7, 0xa4, 0x41, 0x3f, 0x19, 0x0a, 0x99, 0xbf,
- 0xcc, 0xf9, 0x3a, 0x5e, 0xc0, 0x08, 0x37, 0x78, 0x29, 0x2c, 0x81, 0x31, 0xf4, 0xb0, 0x7e, 0x47,
- 0xdf, 0x21, 0x2b, 0x14, 0x63, 0x4f, 0xa0, 0xa7, 0x45, 0xc3, 0xdc, 0x64, 0x97, 0x73, 0x29, 0x36,
- 0x09, 0x85, 0xe2, 0x7f, 0x75, 0x00, 0x2c, 0xe1, 0xc4, 0xde, 0xe1, 0x09, 0xc5, 0xcd, 0x53, 0x34,
- 0x75, 0xa7, 0x1d, 0x37, 0x4f, 0xc0, 0x5c, 0xb0, 0x4f, 0x61, 0x88, 0xbf, 0xc1, 0x50, 0x77, 0xc7,
- 0xf5, 0x5c, 0xb0, 0x5f, 0x42, 0x60, 0xb2, 0x1b, 0x99, 0xaa, 0x2a, 0x97, 0x51, 0x8f, 0x7e, 0xde,
- 0xea, 0xef, 0x05, 0xbf, 0x7b, 0x61, 0xf2, 0xc4, 0xc7, 0x94, 0xa4, 0xca, 0x25, 0xc9, 0x4f, 0xf2,
- 0x95, 0xb1, 0xf9, 0x96, 0xc5, 0x80, 0x10, 0x0a, 0x3f, 0x81, 0xb1, 0x0d, 0x0b, 0x79, 0x9b, 0xad,
- 0xa4, 0x3b, 0xcc, 0x23, 0xc2, 0x2e, 0x08, 0xda, 0xa3, 0x6d, 0xb8, 0x47, 0x1b, 0xfb, 0x29, 0x8c,
- 0x5c, 0x87, 0x5a, 0xa4, 0x82, 0x85, 0x28, 0x61, 0xd7, 0xa5, 0x60, 0xaf, 0x4b, 0x0c, 0x7a, 0x1a,
- 0x4f, 0x2c, 0xd8, 0x13, 0x8b, 0x36, 0xee, 0x38, 0xd3, 0xe9, 0x55, 0x95, 0xe7, 0x74, 0xb4, 0xfd,
- 0x64, 0x90, 0xe9, 0x97, 0x55, 0x9e, 0xb3, 0x53, 0x18, 0xe7, 0x59, 0xb1, 0x49, 0x6b, 0x3e, 0xc6,
- 0x54, 0x23, 0x20, 0x46, 0x92, 0x17, 0xf1, 0x6f, 0x61, 0xea, 0x78, 0xce, 0x6e, 0x24, 0x6e, 0xf4,
- 0xa3, 0xa6, 0xe1, 0x67, 0x6d, 0x26, 0x9d, 0x32, 0x6b, 0xde, 0xe2, 0x6f, 0x61, 0x60, 0xb9, 0x64,
- 0x21, 0x74, 0x05, 0xbf, 0x73, 0x43, 0x1a, 0x4d, 0x76, 0x0e, 0x60, 0x3f, 0xe4, 0xc5, 0x5a, 0x3a,
- 0x01, 0x3c, 0x6c, 0x89, 0x04, 0xd7, 0xc0, 0x50, 0x42, 0xeb, 0x93, 0x19, 0x7f, 0x09, 0x41, 0x83,
- 0xe3, 0x90, 0xd1, 0x86, 0x2b, 0xe3, 0x0a, 0xb4, 0x0e, 0xfe, 0x48, 0x16, 0xb5, 0x12, 0xd0, 0x8c,
- 0xbf, 0x87, 0xe1, 0xab, 0x32, 0xbf, 0x5b, 0x97, 0xc5, 0x47, 0x6d, 0xe8, 0xe7, 0x30, 0xd8, 0x96,
- 0x59, 0x61, 0x70, 0xbe, 0x63, 0x4d, 0xc7, 0xbb, 0x9a, 0x5e, 0x21, 0x9e, 0xb8, 0x70, 0xbc, 0x6a,
- 0xf8, 0xe2, 0x7a, 0x33, 0x53, 0x6b, 0xbd, 0xaf, 0x45, 0xef, 0x40, 0x8b, 0x5f, 0x41, 0x40, 0xdc,
- 0x73, 0xb5, 0xae, 0xf5, 0xfe, 0xe9, 0xfe, 0x99, 0xf8, 0xb5, 0x2a, 0xab, 0x2d, 0x2e, 0x64, 0x0f,
- 0x3e, 0x5a, 0xf1, 0xef, 0x61, 0xb2, 0x17, 0x6a, 0x4b, 0xda, 0xdb, 0x93, 0xf4, 0x57, 0x30, 0x5a,
- 0x63, 0x16, 0x75, 0x42, 0x7f, 0x48, 0x28, 0x2d, 0x81, 0x5d, 0x49, 0x60, 0x5d, 0x9b, 0x3a, 0xfe,
- 0xb3, 0x07, 0x41, 0x13, 0x41, 0x95, 0xda, 0x35, 0x9a, 0xd5, 0x87, 0xe4, 0xcf, 0x69, 0x40, 0xdb,
- 0x90, 0x91, 0x6f, 0x8c, 0x23, 0x2c, 0x20, 0x64, 0x21, 0xdf, 0x18, 0x14, 0x31, 0x8d, 0x8b, 0x34,
- 0x97, 0xb7, 0x32, 0x27, 0x21, 0xf4, 0x13, 0x20, 0xe8, 0x1b, 0x44, 0x70, 0x48, 0xda, 0xc2, 0x7a,
- 0x87, 0x43, 0x92, 0x6a, 0xb2, 0x41, 0x2c, 0x40, 0x4b, 0x93, 0x36, 0xd7, 0x64, 0x90, 0x0c, 0xb5,
- 0x34, 0x38, 0xc8, 0xe3, 0x7f, 0x77, 0xa0, 0x97, 0xdc, 0xa7, 0xca, 0xa7, 0x30, 0x75, 0xac, 0xd7,
- 0xc4, 0xd8, 0xea, 0xc6, 0xab, 0xa6, 0x3b, 0xf3, 0x83, 0x39, 0xd1, 0x3d, 0xe8, 0xcd, 0xe7, 0x00,
- 0x5b, 0x2b, 0x11, 0x8c, 0xda, 0x11, 0x1a, 0x38, 0x64, 0x2e, 0xd8, 0x8f, 0x60, 0xa0, 0x05, 0xad,
- 0xdc, 0x77, 0x52, 0x13, 0xb8, 0x64, 0x0c, 0x13, 0x84, 0xb9, 0x5a, 0xa7, 0xf6, 0x41, 0xe0, 0xce,
- 0xbd, 0x16, 0xd8, 0xbb, 0x19, 0x3d, 0x0b, 0x1e, 0x83, 0x5f, 0x6e, 0xa5, 0xe2, 0xa6, 0x54, 0x74,
- 0xee, 0x83, 0xa4, 0xf1, 0xd9, 0x17, 0x30, 0xa9, 0x6d, 0xbb, 0x63, 0xdf, 0xd6, 0x5d, 0x83, 0xf5,
- 0xfd, 0x55, 0xff, 0xe4, 0x96, 0xe7, 0x95, 0x9d, 0x01, 0xcd, 0x4f, 0xbe, 0x47, 0xe8, 0xde, 0x41,
- 0x40, 0xf7, 0x5e, 0x2e, 0xd3, 0xd7, 0x99, 0xb9, 0x4e, 0xb7, 0x4a, 0xba, 0x9b, 0x7e, 0x84, 0xe0,
- 0xef, 0x32, 0x73, 0xfd, 0x4a, 0xed, 0xb7, 0x7b, 0xbc, 0xd7, 0xee, 0xf8, 0x2f, 0x1d, 0xe8, 0x5e,
- 0x8a, 0x0f, 0xc7, 0x2d, 0x36, 0x48, 0x6c, 0x6c, 0xb9, 0x1d, 0xd7, 0x20, 0xb1, 0xa1, 0x4a, 0x5d,
- 0xa8, 0xf5, 0xbc, 0xc2, 0xd0, 0xb7, 0x78, 0xa6, 0x9e, 0x42, 0x8f, 0x64, 0xff, 0xc1, 0xa4, 0xbd,
- 0xa4, 0x5d, 0x24, 0x14, 0xc5, 0x6d, 0x64, 0xab, 0xb2, 0x70, 0x24, 0x93, 0x8d, 0xc7, 0x19, 0x5f,
- 0x53, 0x96, 0x59, 0x34, 0x51, 0x69, 0xee, 0xb6, 0xc3, 0xb9, 0xe0, 0x48, 0x05, 0x0b, 0xe1, 0x70,
- 0x68, 0xcd, 0x53, 0x4a, 0xb0, 0xa4, 0xba, 0x79, 0x4a, 0x09, 0x7b, 0xf7, 0x65, 0x70, 0x70, 0x5f,
- 0xee, 0x86, 0x2d, 0x1c, 0x5e, 0x89, 0xcd, 0x00, 0x1f, 0xd9, 0x27, 0x46, 0x7d, 0xef, 0xfd, 0xc9,
- 0x83, 0x81, 0xdd, 0xc8, 0xee, 0x6d, 0xe8, 0xb5, 0xdf, 0x86, 0xf7, 0x8d, 0x99, 0xfa, 0x31, 0xe8,
- 0x1e, 0xa2, 0xf5, 0x63, 0xf0, 0xa6, 0xd2, 0x86, 0x04, 0xe8, 0x27, 0x64, 0x23, 0x56, 0x15, 0x59,
- 0x7d, 0x75, 0x93, 0x8d, 0x7f, 0xb1, 0x53, 0xd3, 0xd2, 0x62, 0x9d, 0x46, 0x05, 0xc3, 0x9d, 0x0a,
- 0xe2, 0x3f, 0x78, 0x70, 0x7c, 0xb1, 0x7c, 0x71, 0x8d, 0x09, 0xbf, 0x91, 0x5a, 0xf3, 0xb5, 0x64,
- 0xbf, 0xc0, 0xe7, 0x0a, 0x6e, 0x10, 0x6b, 0x9c, 0x9e, 0x7f, 0xd2, 0x1e, 0x42, 0xcb, 0x5c, 0xda,
- 0x64, 0x91, 0xd8, 0x24, 0x27, 0x80, 0x4e, 0x23, 0x80, 0x67, 0x30, 0xe0, 0x2b, 0x93, 0x95, 0x05,
- 0x55, 0x3e, 0x3d, 0x67, 0xad, 0x6b, 0x73, 0x39, 0xa3, 0x48, 0xe2, 0x32, 0xa8, 0xa1, 0xc5, 0x55,
- 0xe9, 0x0e, 0x14, 0xd9, 0xf1, 0x7f, 0x3c, 0x98, 0xd8, 0xb1, 0xf9, 0xff, 0x86, 0xf2, 0x0f, 0xde,
- 0xe8, 0xf7, 0xbc, 0xdf, 0x59, 0x04, 0x43, 0x77, 0x56, 0xdd, 0x9f, 0x6a, 0x17, 0x2f, 0x66, 0xa3,
- 0xb2, 0xf5, 0x5a, 0xaa, 0x34, 0xcf, 0x8a, 0x7a, 0xa4, 0x8c, 0x1c, 0xf6, 0x4d, 0x56, 0x48, 0xf6,
- 0x33, 0x98, 0x8a, 0x4c, 0x49, 0x2a, 0xd8, 0x26, 0x59, 0x52, 0x27, 0x0d, 0x4a, 0x69, 0x75, 0xbb,
- 0x86, 0xad, 0x76, 0x7d, 0x01, 0x13, 0x21, 0xaf, 0x64, 0xb1, 0x92, 0xa9, 0x36, 0xdc, 0x58, 0xa9,
- 0xf5, 0x93, 0xb1, 0x03, 0x2f, 0x11, 0x7b, 0xf6, 0x57, 0x0f, 0xc6, 0x6d, 0x5e, 0xd9, 0x18, 0xfc,
- 0x45, 0x6a, 0x19, 0x08, 0x8f, 0x58, 0x08, 0xe3, 0xda, 0xc3, 0x41, 0x15, 0x7a, 0xec, 0x11, 0x84,
- 0x6d, 0x04, 0x87, 0x7e, 0xd8, 0x61, 0x00, 0x83, 0x45, 0x4a, 0x19, 0x5d, 0x36, 0x81, 0xc0, 0xda,
- 0x97, 0x62, 0x13, 0xf6, 0xd8, 0x03, 0x98, 0x34, 0x2e, 0x0e, 0xc8, 0xb0, 0xcf, 0x02, 0xe8, 0x2f,
- 0x52, 0x8c, 0x0e, 0xd8, 0x43, 0x38, 0xae, 0x97, 0x73, 0x84, 0x87, 0x43, 0x36, 0x05, 0x58, 0xa4,
- 0x0b, 0x77, 0x4b, 0x87, 0xbe, 0xad, 0xc9, 0x3e, 0x87, 0xc3, 0xe0, 0xd9, 0x73, 0xf0, 0xeb, 0x56,
- 0xe2, 0x7f, 0xe7, 0x85, 0x96, 0xca, 0x84, 0x47, 0x68, 0x7f, 0x47, 0xa7, 0x28, 0xf4, 0xd0, 0xbe,
- 0x90, 0xb9, 0x34, 0x32, 0xec, 0x7c, 0x1d, 0xfd, 0xed, 0xdd, 0x89, 0xf7, 0xf6, 0xdd, 0x89, 0xf7,
- 0xcf, 0x77, 0x27, 0xde, 0x1f, 0xdf, 0x9f, 0x1c, 0xbd, 0x7d, 0x7f, 0x72, 0xf4, 0xf7, 0xf7, 0x27,
- 0x47, 0xcb, 0x01, 0x69, 0xe3, 0xcb, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xa2, 0x7f, 0x9a, 0x93,
- 0xd0, 0x0d, 0x00, 0x00,
+ 0x22, 0x18, 0x89, 0x0f, 0xda, 0x7d, 0x81, 0x59, 0x2b, 0x0e, 0x06, 0xd8, 0x2c, 0x1c, 0x6a, 0xd6,
+ 0x39, 0x12, 0x3d, 0xd3, 0xad, 0x11, 0x31, 0x14, 0x39, 0xe8, 0x6e, 0xca, 0xd6, 0x53, 0x24, 0xc7,
+ 0xbc, 0x41, 0x90, 0x5b, 0x1e, 0x23, 0x47, 0x1f, 0x73, 0x4b, 0x60, 0x03, 0xb9, 0x04, 0x79, 0x85,
+ 0x20, 0xa8, 0xea, 0x26, 0x87, 0x33, 0x56, 0x02, 0xdf, 0xaa, 0xbe, 0x2a, 0xb2, 0xab, 0xbf, 0xfa,
+ 0xba, 0xba, 0x61, 0xba, 0x55, 0xa5, 0x29, 0x6f, 0xf4, 0xfa, 0x39, 0x19, 0xcc, 0xaf, 0xfd, 0xc7,
+ 0xb0, 0xe4, 0x5a, 0x5a, 0x34, 0x7e, 0x09, 0xbd, 0x99, 0x92, 0x9c, 0x4d, 0xa1, 0x93, 0x89, 0xc8,
+ 0x3b, 0xf5, 0xce, 0xfa, 0x49, 0x27, 0x13, 0xec, 0x31, 0xf8, 0x5b, 0xae, 0x64, 0x61, 0x32, 0x11,
+ 0x75, 0x08, 0x6d, 0x7c, 0xc6, 0xa0, 0x57, 0xf0, 0x1b, 0x19, 0x75, 0x4f, 0xbd, 0xb3, 0x20, 0x21,
+ 0x3b, 0xfe, 0x4f, 0x17, 0x06, 0x2f, 0xf8, 0x8d, 0x54, 0xed, 0x5f, 0x05, 0xf4, 0xab, 0x3a, 0xbd,
+ 0xb3, 0x4b, 0x67, 0x8f, 0xa0, 0xcf, 0xf3, 0x8c, 0x6b, 0xf7, 0x0f, 0xeb, 0xb0, 0x27, 0x30, 0xd6,
+ 0x05, 0xdf, 0xea, 0xeb, 0xd2, 0xa4, 0x95, 0xca, 0xa3, 0x1e, 0x05, 0x47, 0x35, 0xf6, 0x83, 0xca,
+ 0xf1, 0x67, 0xe6, 0x6e, 0x2b, 0xa3, 0x3e, 0xd5, 0x44, 0x36, 0x62, 0x5c, 0x08, 0x15, 0x0d, 0xec,
+ 0x02, 0x68, 0xb3, 0xcf, 0x60, 0xc0, 0x95, 0xe4, 0x99, 0x88, 0x86, 0x94, 0xe9, 0x3c, 0xf6, 0x13,
+ 0x08, 0xf2, 0xb2, 0x58, 0x67, 0xa6, 0x12, 0x32, 0xf2, 0x4f, 0xbd, 0xb3, 0x4e, 0xb2, 0x03, 0x70,
+ 0xd7, 0x39, 0x37, 0x36, 0x18, 0x50, 0xb0, 0xf1, 0x71, 0x15, 0x65, 0xf4, 0x36, 0x02, 0xbb, 0x0a,
+ 0xda, 0xb4, 0xd5, 0x6d, 0x34, 0x72, 0x5b, 0xdd, 0x62, 0xce, 0xb6, 0x54, 0x26, 0x1a, 0xdb, 0xea,
+ 0xd0, 0xc6, 0x7f, 0x56, 0x5a, 0x2a, 0xa2, 0x60, 0x42, 0x99, 0x8d, 0x6f, 0x59, 0xd6, 0xfa, 0x4d,
+ 0xa9, 0x44, 0x34, 0xb5, 0xb1, 0xda, 0x47, 0x8a, 0x96, 0x8a, 0x17, 0x22, 0x3a, 0xb6, 0x14, 0x91,
+ 0x83, 0x5f, 0x28, 0xa9, 0xa5, 0xba, 0x95, 0x22, 0x0a, 0xed, 0x17, 0xb5, 0xcf, 0xbe, 0x04, 0xc8,
+ 0x74, 0xaa, 0xaa, 0xa2, 0xc8, 0x8a, 0x75, 0xf4, 0xe0, 0xd4, 0x3b, 0xf3, 0x93, 0x20, 0xd3, 0x89,
+ 0x05, 0x30, 0xac, 0xaa, 0x22, 0x95, 0x05, 0x5f, 0xe6, 0x32, 0x62, 0x36, 0xac, 0xaa, 0xe2, 0x57,
+ 0x04, 0xb0, 0x1f, 0x83, 0x8f, 0x61, 0x62, 0xf7, 0x21, 0xd5, 0x3f, 0x54, 0x55, 0xb1, 0x40, 0x82,
+ 0x63, 0x98, 0x60, 0x88, 0x96, 0x51, 0x69, 0x26, 0xa2, 0x47, 0xb6, 0x31, 0xaa, 0x2a, 0x2e, 0x09,
+ 0x9b, 0x8b, 0x78, 0x05, 0x0f, 0x6c, 0xff, 0x67, 0x85, 0x58, 0x70, 0xbd, 0x99, 0x17, 0x57, 0x25,
+ 0x3b, 0x83, 0xc1, 0x8a, 0x40, 0x92, 0xc3, 0xe8, 0x3c, 0x7c, 0xde, 0x88, 0xd2, 0x26, 0x27, 0x2e,
+ 0xce, 0x9e, 0x42, 0xdf, 0x70, 0xbd, 0xd1, 0x51, 0xe7, 0xb4, 0x7b, 0x36, 0x3a, 0x9f, 0xee, 0x12,
+ 0xf1, 0x67, 0x89, 0x0d, 0xc6, 0x7f, 0xf7, 0xa0, 0x87, 0x3e, 0xb6, 0x17, 0x91, 0x46, 0x67, 0xce,
+ 0x43, 0x7a, 0xd0, 0x6a, 0xe9, 0xad, 0xf1, 0xd9, 0x17, 0x10, 0xac, 0x94, 0xe4, 0x46, 0xa6, 0xdc,
+ 0x38, 0xdd, 0xf9, 0x16, 0x98, 0x99, 0x56, 0x70, 0x79, 0xe7, 0x74, 0xe7, 0x82, 0xdf, 0xde, 0x61,
+ 0xb0, 0xda, 0x0a, 0xf7, 0x65, 0xdf, 0xf5, 0x90, 0x80, 0x99, 0xc1, 0x52, 0x1c, 0xa5, 0x03, 0xa2,
+ 0xd4, 0x79, 0xc8, 0x67, 0xa6, 0x53, 0x9e, 0x73, 0x75, 0x43, 0x1a, 0xf4, 0x93, 0x61, 0xa6, 0x67,
+ 0xe8, 0x62, 0x48, 0xc8, 0x3c, 0xbd, 0xca, 0xf9, 0x9a, 0x34, 0xe8, 0x27, 0x43, 0x21, 0xf3, 0x97,
+ 0x39, 0x5f, 0xc7, 0x0b, 0x18, 0xe1, 0x06, 0x2f, 0x85, 0x25, 0x30, 0x86, 0x1e, 0xd6, 0xef, 0xe8,
+ 0x3b, 0x64, 0x85, 0x62, 0xec, 0x09, 0xf4, 0xb4, 0x68, 0x98, 0x9b, 0xec, 0x72, 0x2e, 0xc5, 0x26,
+ 0xa1, 0x50, 0xfc, 0xcf, 0x0e, 0x80, 0x25, 0x9c, 0xd8, 0x3b, 0x3c, 0xa1, 0xb8, 0x79, 0x8a, 0xa6,
+ 0xee, 0xb4, 0xe3, 0xe6, 0x09, 0x98, 0x0b, 0xf6, 0x39, 0x0c, 0x71, 0x19, 0x0c, 0x75, 0x77, 0x5c,
+ 0xcf, 0x05, 0xfb, 0x25, 0x04, 0x26, 0xbb, 0x91, 0xa9, 0xaa, 0x72, 0x19, 0xf5, 0x68, 0xf1, 0x56,
+ 0x7f, 0x2f, 0xf8, 0xdd, 0x0b, 0x93, 0x27, 0x3e, 0xa6, 0x24, 0x55, 0x2e, 0x49, 0x7e, 0x92, 0xaf,
+ 0x8c, 0xcd, 0xb7, 0x2c, 0x06, 0x84, 0x50, 0xf8, 0x09, 0x8c, 0x6d, 0x58, 0xc8, 0xdb, 0x6c, 0x25,
+ 0xdd, 0x61, 0x1e, 0x11, 0x76, 0x41, 0xd0, 0x1e, 0x6d, 0xc3, 0x3d, 0xda, 0xd8, 0x4f, 0x61, 0xe4,
+ 0x3a, 0xd4, 0x22, 0x15, 0x2c, 0x44, 0x09, 0xbb, 0x2e, 0x05, 0x7b, 0x5d, 0x62, 0xd0, 0xd3, 0x78,
+ 0x62, 0xc1, 0x9e, 0x58, 0xb4, 0x71, 0xc7, 0x99, 0x4e, 0xaf, 0xaa, 0x3c, 0xa7, 0xa3, 0xed, 0x27,
+ 0x83, 0x4c, 0xbf, 0xac, 0xf2, 0x9c, 0x9d, 0xc2, 0x38, 0xcf, 0x8a, 0x4d, 0x5a, 0xf3, 0x31, 0xa6,
+ 0x1a, 0x01, 0x31, 0x92, 0xbc, 0x88, 0x7f, 0x0b, 0x53, 0xc7, 0x73, 0x76, 0x23, 0x71, 0xa3, 0x9f,
+ 0x34, 0x0d, 0xbf, 0x68, 0x33, 0xe9, 0x94, 0x59, 0xf3, 0x16, 0x7f, 0x0f, 0x03, 0xcb, 0x25, 0x0b,
+ 0xa1, 0x2b, 0xf8, 0x9d, 0x1b, 0xd2, 0x68, 0xb2, 0x73, 0x00, 0xfb, 0x21, 0x2f, 0xd6, 0xd2, 0x09,
+ 0xe0, 0x61, 0x4b, 0x24, 0xf8, 0x0f, 0x0c, 0x25, 0xf4, 0x7f, 0x32, 0xe3, 0xaf, 0x21, 0x68, 0x70,
+ 0x1c, 0x32, 0xda, 0x70, 0x65, 0x5c, 0x81, 0xd6, 0xc1, 0x85, 0x64, 0x51, 0x2b, 0x01, 0xcd, 0xf8,
+ 0x35, 0x0c, 0x5f, 0x95, 0xf9, 0xdd, 0xba, 0x2c, 0x3e, 0x69, 0x43, 0x3f, 0x87, 0xc1, 0xb6, 0xcc,
+ 0x0a, 0x83, 0xf3, 0x1d, 0x6b, 0x3a, 0xde, 0xd5, 0xf4, 0x0a, 0xf1, 0xc4, 0x85, 0xe3, 0x55, 0xc3,
+ 0x17, 0xd7, 0x9b, 0x99, 0x5a, 0xeb, 0x7d, 0x2d, 0x7a, 0x07, 0x5a, 0xfc, 0x06, 0x02, 0xe2, 0x9e,
+ 0xab, 0x75, 0xad, 0xf7, 0xcf, 0xf7, 0xcf, 0xc4, 0xaf, 0x55, 0x59, 0x6d, 0xf1, 0x47, 0xf6, 0xe0,
+ 0xa3, 0x15, 0xdf, 0xc2, 0x64, 0x2f, 0xd4, 0x96, 0xb4, 0xb7, 0x27, 0xe9, 0x6f, 0x60, 0xb4, 0xc6,
+ 0x2c, 0xea, 0x84, 0xfe, 0x98, 0x50, 0xfa, 0x05, 0x76, 0x25, 0x81, 0x75, 0x6d, 0xea, 0x96, 0xb6,
+ 0xba, 0x6d, 0x6d, 0xc5, 0x7f, 0xf2, 0x20, 0x68, 0xbe, 0x40, 0xf5, 0xda, 0x7f, 0x37, 0xab, 0x0e,
+ 0xc9, 0x9f, 0xd3, 0xe0, 0xb6, 0x21, 0x23, 0xdf, 0x1a, 0x47, 0x64, 0x40, 0xc8, 0x42, 0xbe, 0x35,
+ 0x28, 0x6e, 0x1a, 0x23, 0x69, 0x2e, 0x6f, 0x65, 0x4e, 0x8b, 0xf4, 0x13, 0x20, 0xe8, 0x3b, 0x44,
+ 0x70, 0x78, 0xda, 0x82, 0x7b, 0x87, 0xc3, 0x93, 0x6a, 0xb5, 0x41, 0x2c, 0x40, 0x4b, 0x93, 0x36,
+ 0xd7, 0x67, 0x90, 0x0c, 0xb5, 0x34, 0x38, 0xe0, 0xe3, 0x7f, 0x75, 0xa0, 0x97, 0xdc, 0xa7, 0xd6,
+ 0xa7, 0x30, 0x75, 0xdd, 0xa8, 0x09, 0xb3, 0xd5, 0x8d, 0x57, 0x4d, 0xd7, 0xe6, 0x07, 0xf3, 0xa3,
+ 0x7b, 0xd0, 0xb3, 0x2f, 0x01, 0xb6, 0x56, 0x3a, 0x18, 0xb5, 0xa3, 0x35, 0x70, 0xc8, 0x5c, 0xb0,
+ 0x1f, 0xc1, 0x40, 0x0b, 0xfa, 0x73, 0xdf, 0x49, 0x50, 0xe0, 0x2f, 0x63, 0x98, 0x20, 0xcc, 0xd5,
+ 0x3a, 0xb5, 0x0f, 0x05, 0x37, 0x0f, 0xb4, 0xc0, 0x9e, 0xce, 0xe8, 0xb9, 0xf0, 0x18, 0xfc, 0x72,
+ 0x2b, 0x15, 0x37, 0xa5, 0xa2, 0x79, 0x10, 0x24, 0x8d, 0xcf, 0xbe, 0x82, 0x49, 0x6d, 0xdb, 0x1d,
+ 0xfb, 0xb6, 0xee, 0x1a, 0xac, 0xef, 0xb5, 0x7a, 0x91, 0x5b, 0x9e, 0x57, 0x76, 0x36, 0x34, 0x8b,
+ 0xbc, 0x46, 0xe8, 0xde, 0x01, 0x41, 0xf7, 0x61, 0x2e, 0xd3, 0x37, 0x99, 0xb9, 0x4e, 0xb7, 0x4a,
+ 0xba, 0x17, 0xc0, 0x08, 0xc1, 0xdf, 0x65, 0xe6, 0xfa, 0x95, 0xda, 0x6f, 0xf7, 0x78, 0xaf, 0xdd,
+ 0xf1, 0x9f, 0x3b, 0xd0, 0xbd, 0x14, 0x1f, 0x8f, 0x61, 0x6c, 0x90, 0xd8, 0xd8, 0x72, 0x3b, 0xae,
+ 0x41, 0x62, 0x43, 0x95, 0xba, 0x50, 0xeb, 0xd9, 0x85, 0xa1, 0xef, 0xf1, 0xac, 0x3d, 0x85, 0x1e,
+ 0x1d, 0x87, 0x8f, 0x26, 0xf0, 0x25, 0xed, 0x22, 0xa1, 0x28, 0x6e, 0x23, 0x5b, 0x95, 0x85, 0x23,
+ 0x99, 0x6c, 0x3c, 0xe6, 0xf8, 0xca, 0xb2, 0xcc, 0xa2, 0x89, 0x4a, 0x73, 0xb7, 0x20, 0xce, 0x0b,
+ 0x47, 0x2a, 0x58, 0x08, 0x87, 0x46, 0x6b, 0xce, 0x52, 0x82, 0x25, 0xd5, 0xcd, 0x59, 0x4a, 0xd8,
+ 0xbb, 0x47, 0x83, 0x83, 0x7b, 0x74, 0x77, 0x50, 0xe0, 0xf0, 0xaa, 0x6c, 0x06, 0xfb, 0xc8, 0x3e,
+ 0x3d, 0xea, 0xfb, 0xf0, 0x8f, 0x1e, 0x0c, 0xec, 0x46, 0x76, 0x6f, 0x46, 0xaf, 0xfd, 0x66, 0xbc,
+ 0x6f, 0xfc, 0xd4, 0x8f, 0x44, 0xf7, 0x40, 0xad, 0x1f, 0x89, 0x37, 0x95, 0x36, 0x24, 0x40, 0x3f,
+ 0x21, 0x1b, 0xb1, 0xaa, 0xc8, 0xea, 0x2b, 0x9d, 0x6c, 0x5c, 0xc5, 0x4e, 0x53, 0x4b, 0x8b, 0x75,
+ 0x1a, 0x15, 0x0c, 0x77, 0x2a, 0x88, 0x7f, 0xef, 0xc1, 0xf1, 0xc5, 0xf2, 0xc5, 0x35, 0x26, 0xfc,
+ 0x46, 0x6a, 0xcd, 0xd7, 0x92, 0xfd, 0x02, 0x9f, 0x31, 0xb8, 0x41, 0xac, 0x71, 0x7a, 0xfe, 0x59,
+ 0x7b, 0x38, 0x2d, 0x73, 0x69, 0x93, 0x45, 0x62, 0x93, 0x9c, 0x00, 0x3a, 0x8d, 0x00, 0x9e, 0xc1,
+ 0x80, 0xaf, 0x4c, 0x56, 0x16, 0x54, 0xf9, 0xf4, 0x9c, 0xb5, 0xae, 0xd3, 0xe5, 0x8c, 0x22, 0x89,
+ 0xcb, 0xa0, 0x86, 0x16, 0x57, 0xa5, 0x3b, 0x50, 0x64, 0xc7, 0xff, 0xf6, 0x60, 0x62, 0xc7, 0xe9,
+ 0xff, 0x1a, 0xd6, 0xff, 0xf7, 0xa6, 0xbf, 0xe7, 0x5d, 0xcf, 0x22, 0x18, 0xba, 0xb3, 0xea, 0x56,
+ 0xaa, 0x5d, 0xbc, 0xb0, 0x8d, 0xca, 0xd6, 0x6b, 0xa9, 0xd2, 0x3c, 0x2b, 0xea, 0x91, 0x32, 0x72,
+ 0xd8, 0x77, 0x59, 0x21, 0xd9, 0xcf, 0x60, 0x2a, 0x32, 0x25, 0xa9, 0x60, 0x9b, 0x64, 0x49, 0x9d,
+ 0x34, 0x28, 0xa5, 0xd5, 0xed, 0x1a, 0xb6, 0xda, 0xf5, 0x15, 0x4c, 0x84, 0xbc, 0x92, 0xc5, 0x4a,
+ 0xa6, 0xda, 0x70, 0x63, 0xa5, 0xd6, 0x4f, 0xc6, 0x0e, 0xbc, 0x44, 0xec, 0xd9, 0x5f, 0x3c, 0x18,
+ 0xb7, 0x79, 0x65, 0x63, 0xf0, 0x17, 0xa9, 0x65, 0x20, 0x3c, 0x62, 0x21, 0x8c, 0x6b, 0x0f, 0x07,
+ 0x55, 0xe8, 0xb1, 0x47, 0x10, 0xb6, 0x11, 0xbc, 0x0c, 0xc2, 0x0e, 0x03, 0x18, 0x2c, 0x52, 0xca,
+ 0xe8, 0xb2, 0x09, 0x04, 0xd6, 0xbe, 0x14, 0x9b, 0xb0, 0xc7, 0x1e, 0xc0, 0xa4, 0x71, 0x71, 0x40,
+ 0x86, 0x7d, 0x16, 0x40, 0x7f, 0x91, 0x62, 0x74, 0xc0, 0x1e, 0xc2, 0x71, 0xfd, 0x3b, 0x47, 0x78,
+ 0x38, 0x64, 0x53, 0x80, 0x45, 0xba, 0x70, 0xb7, 0x77, 0xe8, 0xdb, 0x9a, 0xec, 0x33, 0x39, 0x0c,
+ 0x9e, 0x3d, 0x07, 0xbf, 0x6e, 0x25, 0xae, 0x3b, 0x2f, 0xb4, 0x54, 0x26, 0x3c, 0x42, 0xfb, 0x07,
+ 0x3a, 0x45, 0xa1, 0x87, 0xf6, 0x85, 0xcc, 0xa5, 0x91, 0x61, 0xe7, 0xdb, 0xe8, 0xaf, 0xef, 0x4f,
+ 0xbc, 0x77, 0xef, 0x4f, 0xbc, 0x7f, 0xbc, 0x3f, 0xf1, 0xfe, 0xf0, 0xe1, 0xe4, 0xe8, 0xdd, 0x87,
+ 0x93, 0xa3, 0xbf, 0x7d, 0x38, 0x39, 0x5a, 0x0e, 0x48, 0x1b, 0x5f, 0xff, 0x37, 0x00, 0x00, 0xff,
+ 0xff, 0x6a, 0xc1, 0x8f, 0x1a, 0xe8, 0x0d, 0x00, 0x00,
}
func (m *Area) Marshal() (dAtA []byte, err error) {
@@ -2418,6 +2426,16 @@
}
i += n
}
+ }
+ if m.Enable {
+ dAtA[i] = 0x18
+ i++
+ if m.Enable {
+ dAtA[i] = 1
+ } else {
+ dAtA[i] = 0
+ }
+ i++
}
return i, nil
}
@@ -3177,6 +3195,9 @@
l = e.Size()
n += 1 + l + sovProtomsg(uint64(l))
}
+ }
+ if m.Enable {
+ n += 2
}
return n
}
@@ -5756,6 +5777,26 @@
return err
}
iNdEx = postIndex
+ case 3:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Enable", wireType)
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowProtomsg
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ v |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ m.Enable = bool(v != 0)
default:
iNdEx = preIndex
skippy, err := skipProtomsg(dAtA[iNdEx:])
diff --git a/protomsg.proto b/protomsg.proto
index f6c76f3..2e5f395 100644
--- a/protomsg.proto
+++ b/protomsg.proto
@@ -111,6 +111,7 @@
message TaskGroupArgs {
string task_id = 1;
repeated GroupRule group_rules = 2;
+ bool enable = 3;
}
message GroupRule {
diff --git a/sdk.pb.go b/sdk.pb.go
index f1c447b..62365a4 100644
--- a/sdk.pb.go
+++ b/sdk.pb.go
@@ -523,6 +523,7 @@
type ResultFaceDetect struct {
Pos *FacePos `protobuf:"bytes,1,opt,name=pos,proto3" json:"pos,omitempty"`
Result *ThftResult `protobuf:"bytes,2,opt,name=result,proto3" json:"result,omitempty"`
+ Feats []byte `protobuf:"bytes,3,opt,name=feats,proto3" json:"feats,omitempty"`
}
func (m *ResultFaceDetect) Reset() { *m = ResultFaceDetect{} }
@@ -568,6 +569,13 @@
func (m *ResultFaceDetect) GetResult() *ThftResult {
if m != nil {
return m.Result
+ }
+ return nil
+}
+
+func (m *ResultFaceDetect) GetFeats() []byte {
+ if m != nil {
+ return m.Feats
}
return nil
}
@@ -782,50 +790,50 @@
func init() { proto.RegisterFile("sdk.proto", fileDescriptor_70decb0fb6f436df) }
var fileDescriptor_70decb0fb6f436df = []byte{
- // 679 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x53, 0x4d, 0x6f, 0xd3, 0x40,
- 0x10, 0xad, 0x9d, 0xda, 0x69, 0x26, 0x51, 0x29, 0x4b, 0x85, 0xac, 0x0a, 0x59, 0x91, 0x41, 0x34,
- 0x88, 0x52, 0x50, 0x40, 0xe2, 0xca, 0x47, 0x5b, 0x51, 0x09, 0x68, 0xb4, 0x82, 0x03, 0xc7, 0x8d,
- 0xbd, 0x76, 0x5c, 0x6c, 0xaf, 0xb1, 0x37, 0x6a, 0xf3, 0x13, 0xb8, 0xf1, 0xb3, 0x38, 0x70, 0xe8,
- 0x91, 0x23, 0x6a, 0xc5, 0xff, 0x40, 0xb3, 0xbb, 0x6e, 0x52, 0x29, 0xe5, 0xc2, 0x95, 0x93, 0xe7,
- 0xed, 0x3c, 0xef, 0xbc, 0x37, 0xb3, 0x03, 0x9d, 0x3a, 0xfa, 0xbc, 0x5b, 0x56, 0x42, 0x0a, 0xb2,
- 0xa6, 0x3e, 0x79, 0x9d, 0x6c, 0xc1, 0x98, 0xd5, 0x5c, 0x9f, 0x06, 0x5f, 0x2d, 0x70, 0x0e, 0x73,
- 0x96, 0x70, 0xb2, 0x09, 0xce, 0x49, 0x1a, 0xc9, 0x89, 0x67, 0xf5, 0xad, 0x81, 0x43, 0x35, 0x20,
- 0xb7, 0xc1, 0x9d, 0xf0, 0x34, 0x99, 0x48, 0xcf, 0x56, 0xc7, 0x06, 0x11, 0x02, 0xab, 0x11, 0x93,
- 0xcc, 0x6b, 0xf5, 0xad, 0x41, 0x8f, 0xaa, 0x98, 0xdc, 0x81, 0x8e, 0x4c, 0x73, 0x5e, 0x4b, 0x96,
- 0x97, 0xde, 0x6a, 0xdf, 0x1a, 0x74, 0xe8, 0xfc, 0x80, 0xac, 0x83, 0x9d, 0x46, 0x9e, 0xd3, 0xb7,
- 0x06, 0x2d, 0x6a, 0xa7, 0x11, 0xd9, 0x80, 0x56, 0x98, 0x46, 0x9e, 0xab, 0x78, 0x18, 0x06, 0x09,
- 0x74, 0x0e, 0x58, 0xc8, 0x5f, 0x16, 0x49, 0xc6, 0x31, 0x3d, 0x63, 0x27, 0x46, 0x0c, 0x86, 0x28,
- 0xb0, 0x4c, 0x65, 0x38, 0x31, 0x4a, 0x34, 0x40, 0x21, 0x95, 0xc8, 0x32, 0x25, 0xc4, 0xa1, 0x2a,
- 0x26, 0x3e, 0x40, 0x28, 0x8a, 0x38, 0x8d, 0x78, 0x11, 0x72, 0xa5, 0xc4, 0xa6, 0x0b, 0x27, 0xc1,
- 0x29, 0xc0, 0x87, 0x49, 0x2c, 0x29, 0xaf, 0xa7, 0x99, 0x44, 0x8b, 0x09, 0x2f, 0x22, 0x5e, 0x99,
- 0x62, 0x06, 0xa1, 0x02, 0x96, 0x70, 0x53, 0x0d, 0x43, 0x55, 0x8b, 0x85, 0xfc, 0xb2, 0x16, 0x0b,
- 0x39, 0xfe, 0x3d, 0xe6, 0x6c, 0x2a, 0x67, 0xaa, 0x8e, 0x43, 0x0d, 0x42, 0xb5, 0x75, 0x9e, 0x66,
- 0x5c, 0x39, 0x76, 0xa8, 0x06, 0xc1, 0x0f, 0x1b, 0xda, 0xe8, 0x71, 0x24, 0x6a, 0x72, 0x1f, 0xdc,
- 0x2a, 0x44, 0xa0, 0xea, 0x76, 0x87, 0xeb, 0xbb, 0xcd, 0x84, 0x76, 0x29, 0x0f, 0x25, 0x35, 0x59,
- 0xf2, 0x08, 0x3a, 0xa5, 0x7c, 0xcb, 0x63, 0xb9, 0x3f, 0xd3, 0x6a, 0xba, 0xc3, 0x1b, 0x73, 0xea,
- 0x48, 0xa4, 0x85, 0xa4, 0x73, 0x06, 0x79, 0x0c, 0x50, 0x4a, 0x8a, 0x43, 0x42, 0x7e, 0x6b, 0x39,
- 0x7f, 0x81, 0x42, 0x1e, 0x40, 0xbb, 0x94, 0xef, 0xc4, 0x54, 0x4e, 0x94, 0x85, 0x25, 0xec, 0x26,
- 0x4f, 0xb6, 0xc1, 0x2d, 0xe5, 0x7b, 0x51, 0x6b, 0x57, 0x4b, 0x98, 0x26, 0x4d, 0x1e, 0x82, 0x1b,
- 0xab, 0x39, 0xaa, 0xf9, 0x76, 0x87, 0xb7, 0xe6, 0xc4, 0xcb, 0x11, 0x53, 0x43, 0x21, 0x1e, 0xb4,
- 0xbf, 0x4c, 0x59, 0x96, 0xca, 0x99, 0xd7, 0x56, 0xcd, 0x6a, 0x20, 0x0e, 0x32, 0x66, 0x61, 0xca,
- 0xb2, 0x3d, 0x7c, 0x6b, 0x6b, 0xea, 0xad, 0x2d, 0x9c, 0x04, 0xbf, 0x6d, 0x58, 0xc3, 0xfb, 0x0e,
- 0x8b, 0x58, 0xfc, 0xef, 0xe7, 0x3f, 0xf7, 0x13, 0x1f, 0x73, 0x8c, 0xed, 0xdc, 0xf3, 0x3a, 0x6a,
- 0x4f, 0x0d, 0x0a, 0x3e, 0x42, 0xfb, 0x68, 0x7c, 0xac, 0xba, 0x7c, 0x0f, 0x9c, 0x2a, 0x3c, 0x1a,
- 0x1f, 0x5f, 0xd3, 0x64, 0x9d, 0xc4, 0xdd, 0x91, 0xb3, 0xb2, 0xd9, 0x1d, 0x39, 0x2b, 0x71, 0x77,
- 0xca, 0x4a, 0x8c, 0x55, 0x03, 0x6d, 0xaa, 0xe2, 0x80, 0xc3, 0x86, 0xde, 0x41, 0xf4, 0xb0, 0xc7,
- 0x25, 0x0f, 0x25, 0xb9, 0x0b, 0xad, 0x52, 0xd4, 0xe6, 0xf6, 0x9b, 0x57, 0x6d, 0x8e, 0x44, 0x4d,
- 0x31, 0x4b, 0x76, 0xc0, 0xad, 0xd4, 0x8f, 0x66, 0x7e, 0x9b, 0x73, 0xde, 0x7c, 0xb1, 0xa9, 0xe1,
- 0x04, 0x2f, 0xa0, 0x37, 0x62, 0x15, 0xcb, 0x9b, 0xc5, 0x7b, 0x02, 0x0e, 0xfa, 0xc2, 0x22, 0xad,
- 0x41, 0x77, 0xb8, 0xb5, 0x68, 0xe1, 0xaa, 0x1a, 0xaa, 0x89, 0xc1, 0xf1, 0xa2, 0xd0, 0xfd, 0x53,
- 0xf9, 0x5a, 0xe4, 0xb8, 0xe0, 0x31, 0x67, 0x52, 0x4b, 0xed, 0x51, 0x0d, 0xd0, 0x66, 0x28, 0x72,
- 0xed, 0xbc, 0x47, 0x55, 0x4c, 0x76, 0xb4, 0x25, 0xfd, 0x74, 0xfe, 0x56, 0x0d, 0x69, 0xc1, 0x1b,
- 0xd8, 0xb8, 0x54, 0x7b, 0xc0, 0x99, 0x9c, 0x56, 0x9c, 0x3c, 0x83, 0x36, 0x57, 0x55, 0xf1, 0xe2,
- 0x6b, 0x35, 0x6b, 0x61, 0xb4, 0xa1, 0x06, 0xcf, 0x8d, 0xef, 0x4f, 0x22, 0x13, 0x38, 0x94, 0x6d,
- 0x70, 0xd2, 0x22, 0x16, 0x8d, 0xef, 0x85, 0xe6, 0x9a, 0xe1, 0x52, 0x9d, 0x7f, 0xe5, 0x7d, 0x3f,
- 0xf7, 0xad, 0xb3, 0x73, 0xdf, 0xfa, 0x75, 0xee, 0x5b, 0xdf, 0x2e, 0xfc, 0x95, 0xb3, 0x0b, 0x7f,
- 0xe5, 0xe7, 0x85, 0xbf, 0x32, 0x76, 0xd5, 0x2f, 0x4f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xe7,
- 0x0c, 0x05, 0xd9, 0x58, 0x06, 0x00, 0x00,
+ // 687 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x54, 0x4f, 0x6f, 0xd3, 0x4e,
+ 0x10, 0xad, 0x93, 0xda, 0x69, 0x26, 0x55, 0x7f, 0xfd, 0x2d, 0x15, 0xb2, 0x2a, 0x64, 0x45, 0x06,
+ 0xd1, 0x20, 0x4a, 0x41, 0x01, 0x89, 0x2b, 0x7f, 0xda, 0x8a, 0x4a, 0x40, 0xa3, 0x15, 0x1c, 0x38,
+ 0x6e, 0xec, 0xb5, 0xe3, 0x62, 0x7b, 0x8d, 0xbd, 0x51, 0x1b, 0xf1, 0x09, 0xb8, 0xf1, 0xb1, 0x38,
+ 0x70, 0xe8, 0x91, 0x23, 0x6a, 0xc5, 0xf7, 0x40, 0xb3, 0xbb, 0xae, 0x5d, 0xa9, 0xe5, 0xc2, 0x95,
+ 0x53, 0x66, 0x76, 0x9e, 0xf7, 0xbd, 0x37, 0xb3, 0x13, 0xe8, 0x57, 0xe1, 0xc7, 0x9d, 0xa2, 0x14,
+ 0x52, 0x90, 0x15, 0xf5, 0x93, 0x55, 0xf1, 0x26, 0x4c, 0x59, 0xc5, 0xf5, 0xa9, 0xff, 0xc5, 0x02,
+ 0xfb, 0x20, 0x63, 0x31, 0x27, 0x1b, 0x60, 0x1f, 0x27, 0xa1, 0x9c, 0xb9, 0xd6, 0xd0, 0x1a, 0xd9,
+ 0x54, 0x27, 0xe4, 0x26, 0x38, 0x33, 0x9e, 0xc4, 0x33, 0xe9, 0x76, 0xd4, 0xb1, 0xc9, 0x08, 0x81,
+ 0xe5, 0x90, 0x49, 0xe6, 0x76, 0x87, 0xd6, 0x68, 0x95, 0xaa, 0x98, 0xdc, 0x82, 0xbe, 0x4c, 0x32,
+ 0x5e, 0x49, 0x96, 0x15, 0xee, 0xf2, 0xd0, 0x1a, 0xf5, 0x69, 0x73, 0x40, 0xd6, 0xa0, 0x93, 0x84,
+ 0xae, 0x3d, 0xb4, 0x46, 0x5d, 0xda, 0x49, 0x42, 0xb2, 0x0e, 0xdd, 0x20, 0x09, 0x5d, 0x47, 0xe1,
+ 0x30, 0xf4, 0x63, 0xe8, 0xef, 0xb3, 0x80, 0x3f, 0xcf, 0xe3, 0x94, 0x63, 0x79, 0xc1, 0x8e, 0x8d,
+ 0x18, 0x0c, 0x51, 0x60, 0x91, 0xc8, 0x60, 0x66, 0x94, 0xe8, 0x04, 0x85, 0x94, 0x22, 0x4d, 0x95,
+ 0x10, 0x9b, 0xaa, 0x98, 0x78, 0x00, 0x81, 0xc8, 0xa3, 0x24, 0xe4, 0x79, 0xc0, 0x95, 0x92, 0x0e,
+ 0x6d, 0x9d, 0xf8, 0x27, 0x00, 0xef, 0x66, 0x91, 0xa4, 0xbc, 0x9a, 0xa7, 0x12, 0x2d, 0xc6, 0x3c,
+ 0x0f, 0x79, 0x69, 0xc8, 0x4c, 0x86, 0x0a, 0x58, 0xcc, 0x0d, 0x1b, 0x86, 0x8a, 0x8b, 0x05, 0xfc,
+ 0x82, 0x8b, 0x05, 0x1c, 0xbf, 0x9e, 0x72, 0x36, 0x97, 0x0b, 0xc5, 0x63, 0x53, 0x93, 0xa1, 0xda,
+ 0x2a, 0x4b, 0x52, 0xae, 0x1c, 0xdb, 0x54, 0x27, 0xfe, 0xf7, 0x0e, 0xf4, 0xd0, 0xe3, 0x44, 0x54,
+ 0xe4, 0x2e, 0x38, 0x65, 0x80, 0x89, 0xe2, 0x1d, 0x8c, 0xd7, 0x76, 0xea, 0x09, 0xed, 0x50, 0x1e,
+ 0x48, 0x6a, 0xaa, 0xe4, 0x01, 0xf4, 0x0b, 0xf9, 0x9a, 0x47, 0x72, 0x6f, 0xa1, 0xd5, 0x0c, 0xc6,
+ 0xff, 0x35, 0xd0, 0x89, 0x48, 0x72, 0x49, 0x1b, 0x04, 0x79, 0x08, 0x50, 0x48, 0x8a, 0x43, 0x42,
+ 0x7c, 0xf7, 0x6a, 0x7c, 0x0b, 0x42, 0xee, 0x41, 0xaf, 0x90, 0x6f, 0xc4, 0x5c, 0xce, 0x94, 0x85,
+ 0x2b, 0xd0, 0x75, 0x9d, 0x6c, 0x81, 0x53, 0xc8, 0xb7, 0xa2, 0xd2, 0xae, 0xae, 0x40, 0x9a, 0x32,
+ 0xb9, 0x0f, 0x4e, 0xa4, 0xe6, 0xa8, 0xe6, 0x3b, 0x18, 0xdf, 0x68, 0x80, 0x17, 0x23, 0xa6, 0x06,
+ 0x42, 0x5c, 0xe8, 0x7d, 0x9a, 0xb3, 0x34, 0x91, 0x0b, 0xb7, 0xa7, 0x9a, 0x55, 0xa7, 0x38, 0xc8,
+ 0x88, 0x05, 0x09, 0x4b, 0x77, 0xf1, 0xad, 0xad, 0xa8, 0xb7, 0xd6, 0x3a, 0xf1, 0x7f, 0x75, 0x60,
+ 0x05, 0xef, 0x3b, 0xc8, 0x23, 0xf1, 0xaf, 0x9f, 0x7f, 0xdd, 0x4f, 0x7c, 0xcc, 0x11, 0xb6, 0x73,
+ 0xd7, 0xed, 0xab, 0x3d, 0x35, 0x99, 0xff, 0x1e, 0x7a, 0x87, 0xd3, 0x23, 0xd5, 0xe5, 0x3b, 0x60,
+ 0x97, 0xc1, 0xe1, 0xf4, 0xe8, 0x9a, 0x26, 0xeb, 0x22, 0xee, 0x8e, 0x5c, 0x14, 0xf5, 0xee, 0xc8,
+ 0x45, 0x81, 0xbb, 0x53, 0x94, 0x62, 0xaa, 0x1a, 0xd8, 0xa1, 0x2a, 0xf6, 0x3f, 0xc3, 0xba, 0xde,
+ 0x41, 0xf4, 0xb0, 0xcb, 0x25, 0x0f, 0x24, 0xb9, 0x0d, 0xdd, 0x42, 0x54, 0xe6, 0xf6, 0xff, 0x2f,
+ 0xdb, 0x9c, 0x88, 0x8a, 0x62, 0x95, 0x6c, 0x83, 0x53, 0xaa, 0x0f, 0xcd, 0xfc, 0x36, 0x1a, 0x5c,
+ 0xb3, 0xd8, 0xd4, 0x60, 0x70, 0x15, 0x23, 0xce, 0x64, 0x65, 0xfe, 0xac, 0x74, 0xe2, 0x3f, 0x83,
+ 0xd5, 0x09, 0x2b, 0x59, 0x56, 0xaf, 0xe3, 0x23, 0xb0, 0xd1, 0x2d, 0x52, 0x77, 0x47, 0x83, 0xf1,
+ 0x66, 0xdb, 0xd8, 0x65, 0x8d, 0x54, 0x03, 0xfd, 0xa3, 0xb6, 0xfc, 0xbd, 0x13, 0xf9, 0x52, 0x64,
+ 0x0d, 0x97, 0xd5, 0xe2, 0x42, 0xf3, 0x81, 0xc8, 0x74, 0x3f, 0x56, 0xa9, 0x8a, 0xc9, 0xb6, 0x36,
+ 0xaa, 0x1f, 0xd4, 0x9f, 0xd8, 0x10, 0xe6, 0xbf, 0x82, 0xf5, 0x0b, 0xb5, 0xfb, 0x9c, 0xc9, 0x79,
+ 0xc9, 0xc9, 0x13, 0xe8, 0x71, 0xc5, 0x8a, 0x17, 0x5f, 0xab, 0x59, 0x0b, 0xa3, 0x35, 0xd4, 0x7f,
+ 0x6a, 0x7c, 0x7f, 0x10, 0xa9, 0xc0, 0x51, 0x6d, 0x81, 0x9d, 0xe4, 0x91, 0xa8, 0x7d, 0xb7, 0x5a,
+ 0x6e, 0x46, 0x4e, 0x75, 0xfd, 0x85, 0xfb, 0xed, 0xcc, 0xb3, 0x4e, 0xcf, 0x3c, 0xeb, 0xe7, 0x99,
+ 0x67, 0x7d, 0x3d, 0xf7, 0x96, 0x4e, 0xcf, 0xbd, 0xa5, 0x1f, 0xe7, 0xde, 0xd2, 0xd4, 0x51, 0x9f,
+ 0x3c, 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x57, 0x93, 0xa7, 0xe2, 0x6e, 0x06, 0x00, 0x00,
}
func (m *Image) Marshal() (dAtA []byte, err error) {
@@ -1218,6 +1226,12 @@
}
i += n15
}
+ if len(m.Feats) > 0 {
+ dAtA[i] = 0x1a
+ i++
+ i = encodeVarintSdk(dAtA, i, uint64(len(m.Feats)))
+ i += copy(dAtA[i:], m.Feats)
+ }
return i, nil
}
@@ -1549,6 +1563,10 @@
}
if m.Result != nil {
l = m.Result.Size()
+ n += 1 + l + sovSdk(uint64(l))
+ }
+ l = len(m.Feats)
+ if l > 0 {
n += 1 + l + sovSdk(uint64(l))
}
return n
@@ -2993,6 +3011,40 @@
return err
}
iNdEx = postIndex
+ case 3:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Feats", wireType)
+ }
+ var byteLen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSdk
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ byteLen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if byteLen < 0 {
+ return ErrInvalidLengthSdk
+ }
+ postIndex := iNdEx + byteLen
+ if postIndex < 0 {
+ return ErrInvalidLengthSdk
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.Feats = append(m.Feats[:0], dAtA[iNdEx:postIndex]...)
+ if m.Feats == nil {
+ m.Feats = []byte{}
+ }
+ iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipSdk(dAtA[iNdEx:])
diff --git a/sdk.proto b/sdk.proto
index d6fdadd..ad0182a 100644
--- a/sdk.proto
+++ b/sdk.proto
@@ -57,7 +57,8 @@
// sdk face property
message ResultFaceDetect{
FacePos pos = 1;
- ThftResult result = 2;
+ ThftResult result = 2;
+ bytes feats = 3;
}
message ParamFacePos{
repeated ResultFaceDetect faces = 1;
--
Gitblit v1.8.0