From 11a3749018a73a2b81a5a51d9c06425cd40b1d74 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 05 十一月 2019 15:57:05 +0800
Subject: [PATCH] 给sdkMessage加入PushAttac和、
---
base.pb.go | 520 ++------------------------------------------------------
1 files changed, 26 insertions(+), 494 deletions(-)
diff --git a/base.pb.go b/base.pb.go
index 2034d85..358f35c 100644
--- a/base.pb.go
+++ b/base.pb.go
@@ -1,12 +1,11 @@
-// Code generated by protoc-gen-gogo. DO NOT EDIT.
+// Code generated by protoc-gen-go. DO NOT EDIT.
// source: base.proto
package protomsg
import (
fmt "fmt"
- proto "github.com/gogo/protobuf/proto"
- io "io"
+ proto "github.com/golang/protobuf/proto"
math "math"
)
@@ -19,12 +18,15 @@
// 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
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
// struct for sdk
type Point struct {
- X int32 `protobuf:"varint,1,opt,name=x,proto3" json:"x,omitempty"`
- Y int32 `protobuf:"varint,2,opt,name=y,proto3" json:"y,omitempty"`
+ X int32 `protobuf:"varint,1,opt,name=x,proto3" json:"x,omitempty"`
+ Y int32 `protobuf:"varint,2,opt,name=y,proto3" json:"y,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *Point) Reset() { *m = Point{} }
@@ -33,26 +35,18 @@
func (*Point) Descriptor() ([]byte, []int) {
return fileDescriptor_db1b6b0986796150, []int{0}
}
+
func (m *Point) XXX_Unmarshal(b []byte) error {
- return m.Unmarshal(b)
+ return xxx_messageInfo_Point.Unmarshal(m, b)
}
func (m *Point) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- if deterministic {
- return xxx_messageInfo_Point.Marshal(b, m, deterministic)
- } else {
- b = b[:cap(b)]
- n, err := m.MarshalTo(b)
- if err != nil {
- return nil, err
- }
- return b[:n], nil
- }
+ return xxx_messageInfo_Point.Marshal(b, m, deterministic)
}
func (m *Point) XXX_Merge(src proto.Message) {
xxx_messageInfo_Point.Merge(m, src)
}
func (m *Point) XXX_Size() int {
- return m.Size()
+ return xxx_messageInfo_Point.Size(m)
}
func (m *Point) XXX_DiscardUnknown() {
xxx_messageInfo_Point.DiscardUnknown(m)
@@ -75,10 +69,13 @@
}
type Rect struct {
- Left int32 `protobuf:"varint,1,opt,name=left,proto3" json:"left,omitempty"`
- Top int32 `protobuf:"varint,2,opt,name=top,proto3" json:"top,omitempty"`
- Right int32 `protobuf:"varint,3,opt,name=right,proto3" json:"right,omitempty"`
- Bottom int32 `protobuf:"varint,4,opt,name=bottom,proto3" json:"bottom,omitempty"`
+ Left int32 `protobuf:"varint,1,opt,name=left,proto3" json:"left,omitempty"`
+ Top int32 `protobuf:"varint,2,opt,name=top,proto3" json:"top,omitempty"`
+ Right int32 `protobuf:"varint,3,opt,name=right,proto3" json:"right,omitempty"`
+ Bottom int32 `protobuf:"varint,4,opt,name=bottom,proto3" json:"bottom,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *Rect) Reset() { *m = Rect{} }
@@ -87,26 +84,18 @@
func (*Rect) Descriptor() ([]byte, []int) {
return fileDescriptor_db1b6b0986796150, []int{1}
}
+
func (m *Rect) XXX_Unmarshal(b []byte) error {
- return m.Unmarshal(b)
+ return xxx_messageInfo_Rect.Unmarshal(m, b)
}
func (m *Rect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- if deterministic {
- return xxx_messageInfo_Rect.Marshal(b, m, deterministic)
- } else {
- b = b[:cap(b)]
- n, err := m.MarshalTo(b)
- if err != nil {
- return nil, err
- }
- return b[:n], nil
- }
+ return xxx_messageInfo_Rect.Marshal(b, m, deterministic)
}
func (m *Rect) XXX_Merge(src proto.Message) {
xxx_messageInfo_Rect.Merge(m, src)
}
func (m *Rect) XXX_Size() int {
- return m.Size()
+ return xxx_messageInfo_Rect.Size(m)
}
func (m *Rect) XXX_DiscardUnknown() {
xxx_messageInfo_Rect.DiscardUnknown(m)
@@ -150,7 +139,7 @@
func init() { proto.RegisterFile("base.proto", fileDescriptor_db1b6b0986796150) }
var fileDescriptor_db1b6b0986796150 = []byte{
- // 167 bytes of a gzipped FileDescriptorProto
+ // 139 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4a, 0x4a, 0x2c, 0x4e,
0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x00, 0x53, 0xb9, 0xc5, 0xe9, 0x4a, 0xca, 0x5c,
0xac, 0x01, 0xf9, 0x99, 0x79, 0x25, 0x42, 0x3c, 0x5c, 0x8c, 0x15, 0x12, 0x8c, 0x0a, 0x8c, 0x1a,
@@ -158,463 +147,6 @@
0x94, 0x9a, 0x5c, 0x22, 0x24, 0xc4, 0xc5, 0x92, 0x93, 0x9a, 0x56, 0x02, 0x55, 0x06, 0x66, 0x0b,
0x09, 0x70, 0x31, 0x97, 0xe4, 0x17, 0x40, 0xd5, 0x82, 0x98, 0x42, 0x22, 0x5c, 0xac, 0x45, 0x99,
0xe9, 0x19, 0x25, 0x12, 0xcc, 0x60, 0x31, 0x08, 0x47, 0x48, 0x8c, 0x8b, 0x2d, 0x29, 0xbf, 0xa4,
- 0x24, 0x3f, 0x57, 0x82, 0x05, 0x2c, 0x0c, 0xe5, 0x39, 0x49, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1,
- 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70,
- 0xe3, 0xb1, 0x1c, 0x43, 0x12, 0x1b, 0xd8, 0x91, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa5,
- 0xe9, 0x4a, 0x5f, 0xb9, 0x00, 0x00, 0x00,
+ 0x24, 0x3f, 0x57, 0x82, 0x05, 0x2c, 0x0c, 0xe5, 0x25, 0xb1, 0x81, 0x9d, 0x62, 0x0c, 0x08, 0x00,
+ 0x00, 0xff, 0xff, 0xec, 0x3b, 0x08, 0x21, 0x9f, 0x00, 0x00, 0x00,
}
-
-func (m *Point) 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 *Point) MarshalTo(dAtA []byte) (int, error) {
- var i int
- _ = i
- var l int
- _ = l
- if m.X != 0 {
- dAtA[i] = 0x8
- i++
- i = encodeVarintBase(dAtA, i, uint64(m.X))
- }
- if m.Y != 0 {
- dAtA[i] = 0x10
- i++
- i = encodeVarintBase(dAtA, i, uint64(m.Y))
- }
- return i, nil
-}
-
-func (m *Rect) 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 *Rect) MarshalTo(dAtA []byte) (int, error) {
- var i int
- _ = i
- var l int
- _ = l
- if m.Left != 0 {
- dAtA[i] = 0x8
- i++
- i = encodeVarintBase(dAtA, i, uint64(m.Left))
- }
- if m.Top != 0 {
- dAtA[i] = 0x10
- i++
- i = encodeVarintBase(dAtA, i, uint64(m.Top))
- }
- if m.Right != 0 {
- dAtA[i] = 0x18
- i++
- i = encodeVarintBase(dAtA, i, uint64(m.Right))
- }
- if m.Bottom != 0 {
- dAtA[i] = 0x20
- i++
- i = encodeVarintBase(dAtA, i, uint64(m.Bottom))
- }
- return i, nil
-}
-
-func encodeVarintBase(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 *Point) Size() (n int) {
- if m == nil {
- return 0
- }
- var l int
- _ = l
- if m.X != 0 {
- n += 1 + sovBase(uint64(m.X))
- }
- if m.Y != 0 {
- n += 1 + sovBase(uint64(m.Y))
- }
- return n
-}
-
-func (m *Rect) Size() (n int) {
- if m == nil {
- return 0
- }
- var l int
- _ = l
- if m.Left != 0 {
- n += 1 + sovBase(uint64(m.Left))
- }
- if m.Top != 0 {
- n += 1 + sovBase(uint64(m.Top))
- }
- if m.Right != 0 {
- n += 1 + sovBase(uint64(m.Right))
- }
- if m.Bottom != 0 {
- n += 1 + sovBase(uint64(m.Bottom))
- }
- return n
-}
-
-func sovBase(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
-}
-func sozBase(x uint64) (n int) {
- return sovBase(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *Point) 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 ErrIntOverflowBase
- }
- 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: Point: wiretype end group for non-group")
- }
- if fieldNum <= 0 {
- return fmt.Errorf("proto: Point: illegal tag %d (wire type %d)", fieldNum, wire)
- }
- switch fieldNum {
- case 1:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field X", wireType)
- }
- m.X = 0
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowBase
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- m.X |= int32(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- case 2:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field Y", wireType)
- }
- m.Y = 0
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowBase
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- m.Y |= int32(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- default:
- iNdEx = preIndex
- skippy, err := skipBase(dAtA[iNdEx:])
- if err != nil {
- return err
- }
- if skippy < 0 {
- return ErrInvalidLengthBase
- }
- if (iNdEx + skippy) < 0 {
- return ErrInvalidLengthBase
- }
- if (iNdEx + skippy) > l {
- return io.ErrUnexpectedEOF
- }
- iNdEx += skippy
- }
- }
-
- if iNdEx > l {
- return io.ErrUnexpectedEOF
- }
- return nil
-}
-func (m *Rect) 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 ErrIntOverflowBase
- }
- 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: Rect: wiretype end group for non-group")
- }
- if fieldNum <= 0 {
- return fmt.Errorf("proto: Rect: illegal tag %d (wire type %d)", fieldNum, wire)
- }
- switch fieldNum {
- case 1:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field Left", wireType)
- }
- m.Left = 0
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowBase
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- m.Left |= int32(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- case 2:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field Top", wireType)
- }
- m.Top = 0
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowBase
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- m.Top |= int32(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- case 3:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field Right", wireType)
- }
- m.Right = 0
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowBase
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- m.Right |= int32(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- case 4:
- if wireType != 0 {
- return fmt.Errorf("proto: wrong wireType = %d for field Bottom", wireType)
- }
- m.Bottom = 0
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return ErrIntOverflowBase
- }
- if iNdEx >= l {
- return io.ErrUnexpectedEOF
- }
- b := dAtA[iNdEx]
- iNdEx++
- m.Bottom |= int32(b&0x7F) << shift
- if b < 0x80 {
- break
- }
- }
- default:
- iNdEx = preIndex
- skippy, err := skipBase(dAtA[iNdEx:])
- if err != nil {
- return err
- }
- if skippy < 0 {
- return ErrInvalidLengthBase
- }
- if (iNdEx + skippy) < 0 {
- return ErrInvalidLengthBase
- }
- if (iNdEx + skippy) > l {
- return io.ErrUnexpectedEOF
- }
- iNdEx += skippy
- }
- }
-
- if iNdEx > l {
- return io.ErrUnexpectedEOF
- }
- return nil
-}
-func skipBase(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, ErrIntOverflowBase
- }
- 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, ErrIntOverflowBase
- }
- 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, ErrIntOverflowBase
- }
- 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, ErrInvalidLengthBase
- }
- iNdEx += length
- if iNdEx < 0 {
- return 0, ErrInvalidLengthBase
- }
- return iNdEx, nil
- case 3:
- for {
- var innerWire uint64
- var start int = iNdEx
- for shift := uint(0); ; shift += 7 {
- if shift >= 64 {
- return 0, ErrIntOverflowBase
- }
- 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 := skipBase(dAtA[start:])
- if err != nil {
- return 0, err
- }
- iNdEx = start + next
- if iNdEx < 0 {
- return 0, ErrInvalidLengthBase
- }
- }
- 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 (
- ErrInvalidLengthBase = fmt.Errorf("proto: negative length found during unmarshaling")
- ErrIntOverflowBase = fmt.Errorf("proto: integer overflow")
-)
--
Gitblit v1.8.0