Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
3526bb12fd
|
@ -89609,6 +89609,639 @@ public final class CommonProto {
|
|||
// @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.MonthCardInfo)
|
||||
}
|
||||
|
||||
public interface CarGrapRecordItemOrBuilder
|
||||
extends com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
// optional int32 time = 1;
|
||||
/**
|
||||
* <code>optional int32 time = 1;</code>
|
||||
*/
|
||||
boolean hasTime();
|
||||
/**
|
||||
* <code>optional int32 time = 1;</code>
|
||||
*/
|
||||
int getTime();
|
||||
|
||||
// optional int32 uid = 2;
|
||||
/**
|
||||
* <code>optional int32 uid = 2;</code>
|
||||
*/
|
||||
boolean hasUid();
|
||||
/**
|
||||
* <code>optional int32 uid = 2;</code>
|
||||
*/
|
||||
int getUid();
|
||||
|
||||
// optional string content = 3;
|
||||
/**
|
||||
* <code>optional string content = 3;</code>
|
||||
*/
|
||||
boolean hasContent();
|
||||
/**
|
||||
* <code>optional string content = 3;</code>
|
||||
*/
|
||||
java.lang.String getContent();
|
||||
/**
|
||||
* <code>optional string content = 3;</code>
|
||||
*/
|
||||
com.google.protobuf.ByteString
|
||||
getContentBytes();
|
||||
}
|
||||
/**
|
||||
* Protobuf type {@code com.ljsd.jieling.protocols.CarGrapRecordItem}
|
||||
*/
|
||||
public static final class CarGrapRecordItem extends
|
||||
com.google.protobuf.GeneratedMessage
|
||||
implements CarGrapRecordItemOrBuilder {
|
||||
// Use CarGrapRecordItem.newBuilder() to construct.
|
||||
private CarGrapRecordItem(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
|
||||
super(builder);
|
||||
this.unknownFields = builder.getUnknownFields();
|
||||
}
|
||||
private CarGrapRecordItem(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
|
||||
|
||||
private static final CarGrapRecordItem defaultInstance;
|
||||
public static CarGrapRecordItem getDefaultInstance() {
|
||||
return defaultInstance;
|
||||
}
|
||||
|
||||
public CarGrapRecordItem getDefaultInstanceForType() {
|
||||
return defaultInstance;
|
||||
}
|
||||
|
||||
private final com.google.protobuf.UnknownFieldSet unknownFields;
|
||||
@java.lang.Override
|
||||
public final com.google.protobuf.UnknownFieldSet
|
||||
getUnknownFields() {
|
||||
return this.unknownFields;
|
||||
}
|
||||
private CarGrapRecordItem(
|
||||
com.google.protobuf.CodedInputStream input,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws com.google.protobuf.InvalidProtocolBufferException {
|
||||
initFields();
|
||||
int mutable_bitField0_ = 0;
|
||||
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
|
||||
com.google.protobuf.UnknownFieldSet.newBuilder();
|
||||
try {
|
||||
boolean done = false;
|
||||
while (!done) {
|
||||
int tag = input.readTag();
|
||||
switch (tag) {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
default: {
|
||||
if (!parseUnknownField(input, unknownFields,
|
||||
extensionRegistry, tag)) {
|
||||
done = true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
bitField0_ |= 0x00000001;
|
||||
time_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
case 16: {
|
||||
bitField0_ |= 0x00000002;
|
||||
uid_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
case 26: {
|
||||
bitField0_ |= 0x00000004;
|
||||
content_ = input.readBytes();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
|
||||
throw e.setUnfinishedMessage(this);
|
||||
} catch (java.io.IOException e) {
|
||||
throw new com.google.protobuf.InvalidProtocolBufferException(
|
||||
e.getMessage()).setUnfinishedMessage(this);
|
||||
} finally {
|
||||
this.unknownFields = unknownFields.build();
|
||||
makeExtensionsImmutable();
|
||||
}
|
||||
}
|
||||
public static final com.google.protobuf.Descriptors.Descriptor
|
||||
getDescriptor() {
|
||||
return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_CarGrapRecordItem_descriptor;
|
||||
}
|
||||
|
||||
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
|
||||
internalGetFieldAccessorTable() {
|
||||
return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_CarGrapRecordItem_fieldAccessorTable
|
||||
.ensureFieldAccessorsInitialized(
|
||||
com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.class, com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.Builder.class);
|
||||
}
|
||||
|
||||
public static com.google.protobuf.Parser<CarGrapRecordItem> PARSER =
|
||||
new com.google.protobuf.AbstractParser<CarGrapRecordItem>() {
|
||||
public CarGrapRecordItem parsePartialFrom(
|
||||
com.google.protobuf.CodedInputStream input,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws com.google.protobuf.InvalidProtocolBufferException {
|
||||
return new CarGrapRecordItem(input, extensionRegistry);
|
||||
}
|
||||
};
|
||||
|
||||
@java.lang.Override
|
||||
public com.google.protobuf.Parser<CarGrapRecordItem> getParserForType() {
|
||||
return PARSER;
|
||||
}
|
||||
|
||||
private int bitField0_;
|
||||
// optional int32 time = 1;
|
||||
public static final int TIME_FIELD_NUMBER = 1;
|
||||
private int time_;
|
||||
/**
|
||||
* <code>optional int32 time = 1;</code>
|
||||
*/
|
||||
public boolean hasTime() {
|
||||
return ((bitField0_ & 0x00000001) == 0x00000001);
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 time = 1;</code>
|
||||
*/
|
||||
public int getTime() {
|
||||
return time_;
|
||||
}
|
||||
|
||||
// optional int32 uid = 2;
|
||||
public static final int UID_FIELD_NUMBER = 2;
|
||||
private int uid_;
|
||||
/**
|
||||
* <code>optional int32 uid = 2;</code>
|
||||
*/
|
||||
public boolean hasUid() {
|
||||
return ((bitField0_ & 0x00000002) == 0x00000002);
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 uid = 2;</code>
|
||||
*/
|
||||
public int getUid() {
|
||||
return uid_;
|
||||
}
|
||||
|
||||
// optional string content = 3;
|
||||
public static final int CONTENT_FIELD_NUMBER = 3;
|
||||
private java.lang.Object content_;
|
||||
/**
|
||||
* <code>optional string content = 3;</code>
|
||||
*/
|
||||
public boolean hasContent() {
|
||||
return ((bitField0_ & 0x00000004) == 0x00000004);
|
||||
}
|
||||
/**
|
||||
* <code>optional string content = 3;</code>
|
||||
*/
|
||||
public java.lang.String getContent() {
|
||||
java.lang.Object ref = content_;
|
||||
if (ref instanceof java.lang.String) {
|
||||
return (java.lang.String) ref;
|
||||
} else {
|
||||
com.google.protobuf.ByteString bs =
|
||||
(com.google.protobuf.ByteString) ref;
|
||||
java.lang.String s = bs.toStringUtf8();
|
||||
if (bs.isValidUtf8()) {
|
||||
content_ = s;
|
||||
}
|
||||
return s;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>optional string content = 3;</code>
|
||||
*/
|
||||
public com.google.protobuf.ByteString
|
||||
getContentBytes() {
|
||||
java.lang.Object ref = content_;
|
||||
if (ref instanceof java.lang.String) {
|
||||
com.google.protobuf.ByteString b =
|
||||
com.google.protobuf.ByteString.copyFromUtf8(
|
||||
(java.lang.String) ref);
|
||||
content_ = b;
|
||||
return b;
|
||||
} else {
|
||||
return (com.google.protobuf.ByteString) ref;
|
||||
}
|
||||
}
|
||||
|
||||
private void initFields() {
|
||||
time_ = 0;
|
||||
uid_ = 0;
|
||||
content_ = "";
|
||||
}
|
||||
private byte memoizedIsInitialized = -1;
|
||||
public final boolean isInitialized() {
|
||||
byte isInitialized = memoizedIsInitialized;
|
||||
if (isInitialized != -1) return isInitialized == 1;
|
||||
|
||||
memoizedIsInitialized = 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
getSerializedSize();
|
||||
if (((bitField0_ & 0x00000001) == 0x00000001)) {
|
||||
output.writeInt32(1, time_);
|
||||
}
|
||||
if (((bitField0_ & 0x00000002) == 0x00000002)) {
|
||||
output.writeInt32(2, uid_);
|
||||
}
|
||||
if (((bitField0_ & 0x00000004) == 0x00000004)) {
|
||||
output.writeBytes(3, getContentBytes());
|
||||
}
|
||||
getUnknownFields().writeTo(output);
|
||||
}
|
||||
|
||||
private int memoizedSerializedSize = -1;
|
||||
public int getSerializedSize() {
|
||||
int size = memoizedSerializedSize;
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
if (((bitField0_ & 0x00000001) == 0x00000001)) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(1, time_);
|
||||
}
|
||||
if (((bitField0_ & 0x00000002) == 0x00000002)) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(2, uid_);
|
||||
}
|
||||
if (((bitField0_ & 0x00000004) == 0x00000004)) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBytesSize(3, getContentBytes());
|
||||
}
|
||||
size += getUnknownFields().getSerializedSize();
|
||||
memoizedSerializedSize = size;
|
||||
return size;
|
||||
}
|
||||
|
||||
private static final long serialVersionUID = 0L;
|
||||
@java.lang.Override
|
||||
protected java.lang.Object writeReplace()
|
||||
throws java.io.ObjectStreamException {
|
||||
return super.writeReplace();
|
||||
}
|
||||
|
||||
public static com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem parseFrom(
|
||||
com.google.protobuf.ByteString data)
|
||||
throws com.google.protobuf.InvalidProtocolBufferException {
|
||||
return PARSER.parseFrom(data);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem parseFrom(
|
||||
com.google.protobuf.ByteString data,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws com.google.protobuf.InvalidProtocolBufferException {
|
||||
return PARSER.parseFrom(data, extensionRegistry);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem parseFrom(byte[] data)
|
||||
throws com.google.protobuf.InvalidProtocolBufferException {
|
||||
return PARSER.parseFrom(data);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem parseFrom(
|
||||
byte[] data,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws com.google.protobuf.InvalidProtocolBufferException {
|
||||
return PARSER.parseFrom(data, extensionRegistry);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem parseFrom(java.io.InputStream input)
|
||||
throws java.io.IOException {
|
||||
return PARSER.parseFrom(input);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem parseFrom(
|
||||
java.io.InputStream input,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws java.io.IOException {
|
||||
return PARSER.parseFrom(input, extensionRegistry);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem parseDelimitedFrom(java.io.InputStream input)
|
||||
throws java.io.IOException {
|
||||
return PARSER.parseDelimitedFrom(input);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem parseDelimitedFrom(
|
||||
java.io.InputStream input,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws java.io.IOException {
|
||||
return PARSER.parseDelimitedFrom(input, extensionRegistry);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem parseFrom(
|
||||
com.google.protobuf.CodedInputStream input)
|
||||
throws java.io.IOException {
|
||||
return PARSER.parseFrom(input);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem parseFrom(
|
||||
com.google.protobuf.CodedInputStream input,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws java.io.IOException {
|
||||
return PARSER.parseFrom(input, extensionRegistry);
|
||||
}
|
||||
|
||||
public static Builder newBuilder() { return Builder.create(); }
|
||||
public Builder newBuilderForType() { return newBuilder(); }
|
||||
public static Builder newBuilder(com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem prototype) {
|
||||
return newBuilder().mergeFrom(prototype);
|
||||
}
|
||||
public Builder toBuilder() { return newBuilder(this); }
|
||||
|
||||
@java.lang.Override
|
||||
protected Builder newBuilderForType(
|
||||
com.google.protobuf.GeneratedMessage.BuilderParent parent) {
|
||||
Builder builder = new Builder(parent);
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* Protobuf type {@code com.ljsd.jieling.protocols.CarGrapRecordItem}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
com.google.protobuf.GeneratedMessage.Builder<Builder>
|
||||
implements com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItemOrBuilder {
|
||||
public static final com.google.protobuf.Descriptors.Descriptor
|
||||
getDescriptor() {
|
||||
return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_CarGrapRecordItem_descriptor;
|
||||
}
|
||||
|
||||
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
|
||||
internalGetFieldAccessorTable() {
|
||||
return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_CarGrapRecordItem_fieldAccessorTable
|
||||
.ensureFieldAccessorsInitialized(
|
||||
com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.class, com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.Builder.class);
|
||||
}
|
||||
|
||||
// Construct using com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.newBuilder()
|
||||
private Builder() {
|
||||
maybeForceBuilderInitialization();
|
||||
}
|
||||
|
||||
private Builder(
|
||||
com.google.protobuf.GeneratedMessage.BuilderParent parent) {
|
||||
super(parent);
|
||||
maybeForceBuilderInitialization();
|
||||
}
|
||||
private void maybeForceBuilderInitialization() {
|
||||
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
|
||||
}
|
||||
}
|
||||
private static Builder create() {
|
||||
return new Builder();
|
||||
}
|
||||
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
time_ = 0;
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
uid_ = 0;
|
||||
bitField0_ = (bitField0_ & ~0x00000002);
|
||||
content_ = "";
|
||||
bitField0_ = (bitField0_ & ~0x00000004);
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder clone() {
|
||||
return create().mergeFrom(buildPartial());
|
||||
}
|
||||
|
||||
public com.google.protobuf.Descriptors.Descriptor
|
||||
getDescriptorForType() {
|
||||
return com.ljsd.jieling.protocols.CommonProto.internal_static_com_ljsd_jieling_protocols_CarGrapRecordItem_descriptor;
|
||||
}
|
||||
|
||||
public com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem getDefaultInstanceForType() {
|
||||
return com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.getDefaultInstance();
|
||||
}
|
||||
|
||||
public com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem build() {
|
||||
com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem result = buildPartial();
|
||||
if (!result.isInitialized()) {
|
||||
throw newUninitializedMessageException(result);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem buildPartial() {
|
||||
com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem result = new com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem(this);
|
||||
int from_bitField0_ = bitField0_;
|
||||
int to_bitField0_ = 0;
|
||||
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
|
||||
to_bitField0_ |= 0x00000001;
|
||||
}
|
||||
result.time_ = time_;
|
||||
if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
|
||||
to_bitField0_ |= 0x00000002;
|
||||
}
|
||||
result.uid_ = uid_;
|
||||
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
|
||||
to_bitField0_ |= 0x00000004;
|
||||
}
|
||||
result.content_ = content_;
|
||||
result.bitField0_ = to_bitField0_;
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
|
||||
public Builder mergeFrom(com.google.protobuf.Message other) {
|
||||
if (other instanceof com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem) {
|
||||
return mergeFrom((com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem)other);
|
||||
} else {
|
||||
super.mergeFrom(other);
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
public Builder mergeFrom(com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem other) {
|
||||
if (other == com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.getDefaultInstance()) return this;
|
||||
if (other.hasTime()) {
|
||||
setTime(other.getTime());
|
||||
}
|
||||
if (other.hasUid()) {
|
||||
setUid(other.getUid());
|
||||
}
|
||||
if (other.hasContent()) {
|
||||
bitField0_ |= 0x00000004;
|
||||
content_ = other.content_;
|
||||
onChanged();
|
||||
}
|
||||
this.mergeUnknownFields(other.getUnknownFields());
|
||||
return this;
|
||||
}
|
||||
|
||||
public final boolean isInitialized() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public Builder mergeFrom(
|
||||
com.google.protobuf.CodedInputStream input,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws java.io.IOException {
|
||||
com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem parsedMessage = null;
|
||||
try {
|
||||
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
|
||||
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
|
||||
parsedMessage = (com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem) e.getUnfinishedMessage();
|
||||
throw e;
|
||||
} finally {
|
||||
if (parsedMessage != null) {
|
||||
mergeFrom(parsedMessage);
|
||||
}
|
||||
}
|
||||
return this;
|
||||
}
|
||||
private int bitField0_;
|
||||
|
||||
// optional int32 time = 1;
|
||||
private int time_ ;
|
||||
/**
|
||||
* <code>optional int32 time = 1;</code>
|
||||
*/
|
||||
public boolean hasTime() {
|
||||
return ((bitField0_ & 0x00000001) == 0x00000001);
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 time = 1;</code>
|
||||
*/
|
||||
public int getTime() {
|
||||
return time_;
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 time = 1;</code>
|
||||
*/
|
||||
public Builder setTime(int value) {
|
||||
bitField0_ |= 0x00000001;
|
||||
time_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 time = 1;</code>
|
||||
*/
|
||||
public Builder clearTime() {
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
time_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
// optional int32 uid = 2;
|
||||
private int uid_ ;
|
||||
/**
|
||||
* <code>optional int32 uid = 2;</code>
|
||||
*/
|
||||
public boolean hasUid() {
|
||||
return ((bitField0_ & 0x00000002) == 0x00000002);
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 uid = 2;</code>
|
||||
*/
|
||||
public int getUid() {
|
||||
return uid_;
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 uid = 2;</code>
|
||||
*/
|
||||
public Builder setUid(int value) {
|
||||
bitField0_ |= 0x00000002;
|
||||
uid_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 uid = 2;</code>
|
||||
*/
|
||||
public Builder clearUid() {
|
||||
bitField0_ = (bitField0_ & ~0x00000002);
|
||||
uid_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
// optional string content = 3;
|
||||
private java.lang.Object content_ = "";
|
||||
/**
|
||||
* <code>optional string content = 3;</code>
|
||||
*/
|
||||
public boolean hasContent() {
|
||||
return ((bitField0_ & 0x00000004) == 0x00000004);
|
||||
}
|
||||
/**
|
||||
* <code>optional string content = 3;</code>
|
||||
*/
|
||||
public java.lang.String getContent() {
|
||||
java.lang.Object ref = content_;
|
||||
if (!(ref instanceof java.lang.String)) {
|
||||
java.lang.String s = ((com.google.protobuf.ByteString) ref)
|
||||
.toStringUtf8();
|
||||
content_ = s;
|
||||
return s;
|
||||
} else {
|
||||
return (java.lang.String) ref;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>optional string content = 3;</code>
|
||||
*/
|
||||
public com.google.protobuf.ByteString
|
||||
getContentBytes() {
|
||||
java.lang.Object ref = content_;
|
||||
if (ref instanceof String) {
|
||||
com.google.protobuf.ByteString b =
|
||||
com.google.protobuf.ByteString.copyFromUtf8(
|
||||
(java.lang.String) ref);
|
||||
content_ = b;
|
||||
return b;
|
||||
} else {
|
||||
return (com.google.protobuf.ByteString) ref;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>optional string content = 3;</code>
|
||||
*/
|
||||
public Builder setContent(
|
||||
java.lang.String value) {
|
||||
if (value == null) {
|
||||
throw new NullPointerException();
|
||||
}
|
||||
bitField0_ |= 0x00000004;
|
||||
content_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>optional string content = 3;</code>
|
||||
*/
|
||||
public Builder clearContent() {
|
||||
bitField0_ = (bitField0_ & ~0x00000004);
|
||||
content_ = getDefaultInstance().getContent();
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>optional string content = 3;</code>
|
||||
*/
|
||||
public Builder setContentBytes(
|
||||
com.google.protobuf.ByteString value) {
|
||||
if (value == null) {
|
||||
throw new NullPointerException();
|
||||
}
|
||||
bitField0_ |= 0x00000004;
|
||||
content_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.CarGrapRecordItem)
|
||||
}
|
||||
|
||||
static {
|
||||
defaultInstance = new CarGrapRecordItem(true);
|
||||
defaultInstance.initFields();
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.CarGrapRecordItem)
|
||||
}
|
||||
|
||||
private static com.google.protobuf.Descriptors.Descriptor
|
||||
internal_static_com_ljsd_jieling_protocols_ErrorResponse_descriptor;
|
||||
private static
|
||||
|
@ -90099,6 +90732,11 @@ public final class CommonProto {
|
|||
private static
|
||||
com.google.protobuf.GeneratedMessage.FieldAccessorTable
|
||||
internal_static_com_ljsd_jieling_protocols_MonthCardInfo_fieldAccessorTable;
|
||||
private static com.google.protobuf.Descriptors.Descriptor
|
||||
internal_static_com_ljsd_jieling_protocols_CarGrapRecordItem_descriptor;
|
||||
private static
|
||||
com.google.protobuf.GeneratedMessage.FieldAccessorTable
|
||||
internal_static_com_ljsd_jieling_protocols_CarGrapRecordItem_fieldAccessorTable;
|
||||
|
||||
public static com.google.protobuf.Descriptors.FileDescriptor
|
||||
getDescriptor() {
|
||||
|
@ -90376,7 +91014,9 @@ public final class CommonProto {
|
|||
"p\030\002 \001(\001\"/\n\017ExpeditionEquip\022\n\n\002id\030\001 \001(\t\022\020" +
|
||||
"\n\010equiptId\030\002 \001(\005\"P\n\rMonthCardInfo\022\n\n\002id\030" +
|
||||
"\001 \001(\005\022\022\n\nendingTime\030\002 \001(\005\022\r\n\005state\030\003 \001(\005" +
|
||||
"\022\020\n\010totleAmt\030\004 \001(\005B\002H\001"
|
||||
"\022\020\n\010totleAmt\030\004 \001(\005\"?\n\021CarGrapRecordItem\022" +
|
||||
"\014\n\004time\030\001 \001(\005\022\013\n\003uid\030\002 \001(\005\022\017\n\007content\030\003 ",
|
||||
"\001(\tB\002H\001"
|
||||
};
|
||||
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
|
||||
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
|
||||
|
@ -90971,6 +91611,12 @@ public final class CommonProto {
|
|||
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
|
||||
internal_static_com_ljsd_jieling_protocols_MonthCardInfo_descriptor,
|
||||
new java.lang.String[] { "Id", "EndingTime", "State", "TotleAmt", });
|
||||
internal_static_com_ljsd_jieling_protocols_CarGrapRecordItem_descriptor =
|
||||
getDescriptor().getMessageTypes().get(97);
|
||||
internal_static_com_ljsd_jieling_protocols_CarGrapRecordItem_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
|
||||
internal_static_com_ljsd_jieling_protocols_CarGrapRecordItem_descriptor,
|
||||
new java.lang.String[] { "Time", "Uid", "Content", });
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
|
|
@ -52518,6 +52518,680 @@ public final class Family {
|
|||
// @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.ChallengeDeathPathResponse)
|
||||
}
|
||||
|
||||
public interface CarGrapRecordResponseOrBuilder
|
||||
extends com.google.protobuf.MessageOrBuilder {
|
||||
|
||||
// repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
java.util.List<com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem>
|
||||
getCarChallengeItemList();
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem getCarChallengeItem(int index);
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
int getCarChallengeItemCount();
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
java.util.List<? extends com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItemOrBuilder>
|
||||
getCarChallengeItemOrBuilderList();
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItemOrBuilder getCarChallengeItemOrBuilder(
|
||||
int index);
|
||||
}
|
||||
/**
|
||||
* Protobuf type {@code com.ljsd.jieling.protocols.CarGrapRecordResponse}
|
||||
*/
|
||||
public static final class CarGrapRecordResponse extends
|
||||
com.google.protobuf.GeneratedMessage
|
||||
implements CarGrapRecordResponseOrBuilder {
|
||||
// Use CarGrapRecordResponse.newBuilder() to construct.
|
||||
private CarGrapRecordResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
|
||||
super(builder);
|
||||
this.unknownFields = builder.getUnknownFields();
|
||||
}
|
||||
private CarGrapRecordResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
|
||||
|
||||
private static final CarGrapRecordResponse defaultInstance;
|
||||
public static CarGrapRecordResponse getDefaultInstance() {
|
||||
return defaultInstance;
|
||||
}
|
||||
|
||||
public CarGrapRecordResponse getDefaultInstanceForType() {
|
||||
return defaultInstance;
|
||||
}
|
||||
|
||||
private final com.google.protobuf.UnknownFieldSet unknownFields;
|
||||
@java.lang.Override
|
||||
public final com.google.protobuf.UnknownFieldSet
|
||||
getUnknownFields() {
|
||||
return this.unknownFields;
|
||||
}
|
||||
private CarGrapRecordResponse(
|
||||
com.google.protobuf.CodedInputStream input,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws com.google.protobuf.InvalidProtocolBufferException {
|
||||
initFields();
|
||||
int mutable_bitField0_ = 0;
|
||||
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
|
||||
com.google.protobuf.UnknownFieldSet.newBuilder();
|
||||
try {
|
||||
boolean done = false;
|
||||
while (!done) {
|
||||
int tag = input.readTag();
|
||||
switch (tag) {
|
||||
case 0:
|
||||
done = true;
|
||||
break;
|
||||
default: {
|
||||
if (!parseUnknownField(input, unknownFields,
|
||||
extensionRegistry, tag)) {
|
||||
done = true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 10: {
|
||||
if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
|
||||
carChallengeItem_ = new java.util.ArrayList<com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem>();
|
||||
mutable_bitField0_ |= 0x00000001;
|
||||
}
|
||||
carChallengeItem_.add(input.readMessage(com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.PARSER, extensionRegistry));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
|
||||
throw e.setUnfinishedMessage(this);
|
||||
} catch (java.io.IOException e) {
|
||||
throw new com.google.protobuf.InvalidProtocolBufferException(
|
||||
e.getMessage()).setUnfinishedMessage(this);
|
||||
} finally {
|
||||
if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
|
||||
carChallengeItem_ = java.util.Collections.unmodifiableList(carChallengeItem_);
|
||||
}
|
||||
this.unknownFields = unknownFields.build();
|
||||
makeExtensionsImmutable();
|
||||
}
|
||||
}
|
||||
public static final com.google.protobuf.Descriptors.Descriptor
|
||||
getDescriptor() {
|
||||
return com.ljsd.jieling.protocols.Family.internal_static_com_ljsd_jieling_protocols_CarGrapRecordResponse_descriptor;
|
||||
}
|
||||
|
||||
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
|
||||
internalGetFieldAccessorTable() {
|
||||
return com.ljsd.jieling.protocols.Family.internal_static_com_ljsd_jieling_protocols_CarGrapRecordResponse_fieldAccessorTable
|
||||
.ensureFieldAccessorsInitialized(
|
||||
com.ljsd.jieling.protocols.Family.CarGrapRecordResponse.class, com.ljsd.jieling.protocols.Family.CarGrapRecordResponse.Builder.class);
|
||||
}
|
||||
|
||||
public static com.google.protobuf.Parser<CarGrapRecordResponse> PARSER =
|
||||
new com.google.protobuf.AbstractParser<CarGrapRecordResponse>() {
|
||||
public CarGrapRecordResponse parsePartialFrom(
|
||||
com.google.protobuf.CodedInputStream input,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws com.google.protobuf.InvalidProtocolBufferException {
|
||||
return new CarGrapRecordResponse(input, extensionRegistry);
|
||||
}
|
||||
};
|
||||
|
||||
@java.lang.Override
|
||||
public com.google.protobuf.Parser<CarGrapRecordResponse> getParserForType() {
|
||||
return PARSER;
|
||||
}
|
||||
|
||||
// repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;
|
||||
public static final int CARCHALLENGEITEM_FIELD_NUMBER = 1;
|
||||
private java.util.List<com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem> carChallengeItem_;
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public java.util.List<com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem> getCarChallengeItemList() {
|
||||
return carChallengeItem_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public java.util.List<? extends com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItemOrBuilder>
|
||||
getCarChallengeItemOrBuilderList() {
|
||||
return carChallengeItem_;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public int getCarChallengeItemCount() {
|
||||
return carChallengeItem_.size();
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem getCarChallengeItem(int index) {
|
||||
return carChallengeItem_.get(index);
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItemOrBuilder getCarChallengeItemOrBuilder(
|
||||
int index) {
|
||||
return carChallengeItem_.get(index);
|
||||
}
|
||||
|
||||
private void initFields() {
|
||||
carChallengeItem_ = java.util.Collections.emptyList();
|
||||
}
|
||||
private byte memoizedIsInitialized = -1;
|
||||
public final boolean isInitialized() {
|
||||
byte isInitialized = memoizedIsInitialized;
|
||||
if (isInitialized != -1) return isInitialized == 1;
|
||||
|
||||
memoizedIsInitialized = 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
public void writeTo(com.google.protobuf.CodedOutputStream output)
|
||||
throws java.io.IOException {
|
||||
getSerializedSize();
|
||||
for (int i = 0; i < carChallengeItem_.size(); i++) {
|
||||
output.writeMessage(1, carChallengeItem_.get(i));
|
||||
}
|
||||
getUnknownFields().writeTo(output);
|
||||
}
|
||||
|
||||
private int memoizedSerializedSize = -1;
|
||||
public int getSerializedSize() {
|
||||
int size = memoizedSerializedSize;
|
||||
if (size != -1) return size;
|
||||
|
||||
size = 0;
|
||||
for (int i = 0; i < carChallengeItem_.size(); i++) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeMessageSize(1, carChallengeItem_.get(i));
|
||||
}
|
||||
size += getUnknownFields().getSerializedSize();
|
||||
memoizedSerializedSize = size;
|
||||
return size;
|
||||
}
|
||||
|
||||
private static final long serialVersionUID = 0L;
|
||||
@java.lang.Override
|
||||
protected java.lang.Object writeReplace()
|
||||
throws java.io.ObjectStreamException {
|
||||
return super.writeReplace();
|
||||
}
|
||||
|
||||
public static com.ljsd.jieling.protocols.Family.CarGrapRecordResponse parseFrom(
|
||||
com.google.protobuf.ByteString data)
|
||||
throws com.google.protobuf.InvalidProtocolBufferException {
|
||||
return PARSER.parseFrom(data);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.Family.CarGrapRecordResponse parseFrom(
|
||||
com.google.protobuf.ByteString data,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws com.google.protobuf.InvalidProtocolBufferException {
|
||||
return PARSER.parseFrom(data, extensionRegistry);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.Family.CarGrapRecordResponse parseFrom(byte[] data)
|
||||
throws com.google.protobuf.InvalidProtocolBufferException {
|
||||
return PARSER.parseFrom(data);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.Family.CarGrapRecordResponse parseFrom(
|
||||
byte[] data,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws com.google.protobuf.InvalidProtocolBufferException {
|
||||
return PARSER.parseFrom(data, extensionRegistry);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.Family.CarGrapRecordResponse parseFrom(java.io.InputStream input)
|
||||
throws java.io.IOException {
|
||||
return PARSER.parseFrom(input);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.Family.CarGrapRecordResponse parseFrom(
|
||||
java.io.InputStream input,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws java.io.IOException {
|
||||
return PARSER.parseFrom(input, extensionRegistry);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.Family.CarGrapRecordResponse parseDelimitedFrom(java.io.InputStream input)
|
||||
throws java.io.IOException {
|
||||
return PARSER.parseDelimitedFrom(input);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.Family.CarGrapRecordResponse parseDelimitedFrom(
|
||||
java.io.InputStream input,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws java.io.IOException {
|
||||
return PARSER.parseDelimitedFrom(input, extensionRegistry);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.Family.CarGrapRecordResponse parseFrom(
|
||||
com.google.protobuf.CodedInputStream input)
|
||||
throws java.io.IOException {
|
||||
return PARSER.parseFrom(input);
|
||||
}
|
||||
public static com.ljsd.jieling.protocols.Family.CarGrapRecordResponse parseFrom(
|
||||
com.google.protobuf.CodedInputStream input,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws java.io.IOException {
|
||||
return PARSER.parseFrom(input, extensionRegistry);
|
||||
}
|
||||
|
||||
public static Builder newBuilder() { return Builder.create(); }
|
||||
public Builder newBuilderForType() { return newBuilder(); }
|
||||
public static Builder newBuilder(com.ljsd.jieling.protocols.Family.CarGrapRecordResponse prototype) {
|
||||
return newBuilder().mergeFrom(prototype);
|
||||
}
|
||||
public Builder toBuilder() { return newBuilder(this); }
|
||||
|
||||
@java.lang.Override
|
||||
protected Builder newBuilderForType(
|
||||
com.google.protobuf.GeneratedMessage.BuilderParent parent) {
|
||||
Builder builder = new Builder(parent);
|
||||
return builder;
|
||||
}
|
||||
/**
|
||||
* Protobuf type {@code com.ljsd.jieling.protocols.CarGrapRecordResponse}
|
||||
*/
|
||||
public static final class Builder extends
|
||||
com.google.protobuf.GeneratedMessage.Builder<Builder>
|
||||
implements com.ljsd.jieling.protocols.Family.CarGrapRecordResponseOrBuilder {
|
||||
public static final com.google.protobuf.Descriptors.Descriptor
|
||||
getDescriptor() {
|
||||
return com.ljsd.jieling.protocols.Family.internal_static_com_ljsd_jieling_protocols_CarGrapRecordResponse_descriptor;
|
||||
}
|
||||
|
||||
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
|
||||
internalGetFieldAccessorTable() {
|
||||
return com.ljsd.jieling.protocols.Family.internal_static_com_ljsd_jieling_protocols_CarGrapRecordResponse_fieldAccessorTable
|
||||
.ensureFieldAccessorsInitialized(
|
||||
com.ljsd.jieling.protocols.Family.CarGrapRecordResponse.class, com.ljsd.jieling.protocols.Family.CarGrapRecordResponse.Builder.class);
|
||||
}
|
||||
|
||||
// Construct using com.ljsd.jieling.protocols.Family.CarGrapRecordResponse.newBuilder()
|
||||
private Builder() {
|
||||
maybeForceBuilderInitialization();
|
||||
}
|
||||
|
||||
private Builder(
|
||||
com.google.protobuf.GeneratedMessage.BuilderParent parent) {
|
||||
super(parent);
|
||||
maybeForceBuilderInitialization();
|
||||
}
|
||||
private void maybeForceBuilderInitialization() {
|
||||
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
|
||||
getCarChallengeItemFieldBuilder();
|
||||
}
|
||||
}
|
||||
private static Builder create() {
|
||||
return new Builder();
|
||||
}
|
||||
|
||||
public Builder clear() {
|
||||
super.clear();
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
carChallengeItem_ = java.util.Collections.emptyList();
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
} else {
|
||||
carChallengeItemBuilder_.clear();
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder clone() {
|
||||
return create().mergeFrom(buildPartial());
|
||||
}
|
||||
|
||||
public com.google.protobuf.Descriptors.Descriptor
|
||||
getDescriptorForType() {
|
||||
return com.ljsd.jieling.protocols.Family.internal_static_com_ljsd_jieling_protocols_CarGrapRecordResponse_descriptor;
|
||||
}
|
||||
|
||||
public com.ljsd.jieling.protocols.Family.CarGrapRecordResponse getDefaultInstanceForType() {
|
||||
return com.ljsd.jieling.protocols.Family.CarGrapRecordResponse.getDefaultInstance();
|
||||
}
|
||||
|
||||
public com.ljsd.jieling.protocols.Family.CarGrapRecordResponse build() {
|
||||
com.ljsd.jieling.protocols.Family.CarGrapRecordResponse result = buildPartial();
|
||||
if (!result.isInitialized()) {
|
||||
throw newUninitializedMessageException(result);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public com.ljsd.jieling.protocols.Family.CarGrapRecordResponse buildPartial() {
|
||||
com.ljsd.jieling.protocols.Family.CarGrapRecordResponse result = new com.ljsd.jieling.protocols.Family.CarGrapRecordResponse(this);
|
||||
int from_bitField0_ = bitField0_;
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
if (((bitField0_ & 0x00000001) == 0x00000001)) {
|
||||
carChallengeItem_ = java.util.Collections.unmodifiableList(carChallengeItem_);
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
}
|
||||
result.carChallengeItem_ = carChallengeItem_;
|
||||
} else {
|
||||
result.carChallengeItem_ = carChallengeItemBuilder_.build();
|
||||
}
|
||||
onBuilt();
|
||||
return result;
|
||||
}
|
||||
|
||||
public Builder mergeFrom(com.google.protobuf.Message other) {
|
||||
if (other instanceof com.ljsd.jieling.protocols.Family.CarGrapRecordResponse) {
|
||||
return mergeFrom((com.ljsd.jieling.protocols.Family.CarGrapRecordResponse)other);
|
||||
} else {
|
||||
super.mergeFrom(other);
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
public Builder mergeFrom(com.ljsd.jieling.protocols.Family.CarGrapRecordResponse other) {
|
||||
if (other == com.ljsd.jieling.protocols.Family.CarGrapRecordResponse.getDefaultInstance()) return this;
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
if (!other.carChallengeItem_.isEmpty()) {
|
||||
if (carChallengeItem_.isEmpty()) {
|
||||
carChallengeItem_ = other.carChallengeItem_;
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
} else {
|
||||
ensureCarChallengeItemIsMutable();
|
||||
carChallengeItem_.addAll(other.carChallengeItem_);
|
||||
}
|
||||
onChanged();
|
||||
}
|
||||
} else {
|
||||
if (!other.carChallengeItem_.isEmpty()) {
|
||||
if (carChallengeItemBuilder_.isEmpty()) {
|
||||
carChallengeItemBuilder_.dispose();
|
||||
carChallengeItemBuilder_ = null;
|
||||
carChallengeItem_ = other.carChallengeItem_;
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
carChallengeItemBuilder_ =
|
||||
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
|
||||
getCarChallengeItemFieldBuilder() : null;
|
||||
} else {
|
||||
carChallengeItemBuilder_.addAllMessages(other.carChallengeItem_);
|
||||
}
|
||||
}
|
||||
}
|
||||
this.mergeUnknownFields(other.getUnknownFields());
|
||||
return this;
|
||||
}
|
||||
|
||||
public final boolean isInitialized() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public Builder mergeFrom(
|
||||
com.google.protobuf.CodedInputStream input,
|
||||
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
|
||||
throws java.io.IOException {
|
||||
com.ljsd.jieling.protocols.Family.CarGrapRecordResponse parsedMessage = null;
|
||||
try {
|
||||
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
|
||||
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
|
||||
parsedMessage = (com.ljsd.jieling.protocols.Family.CarGrapRecordResponse) e.getUnfinishedMessage();
|
||||
throw e;
|
||||
} finally {
|
||||
if (parsedMessage != null) {
|
||||
mergeFrom(parsedMessage);
|
||||
}
|
||||
}
|
||||
return this;
|
||||
}
|
||||
private int bitField0_;
|
||||
|
||||
// repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;
|
||||
private java.util.List<com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem> carChallengeItem_ =
|
||||
java.util.Collections.emptyList();
|
||||
private void ensureCarChallengeItemIsMutable() {
|
||||
if (!((bitField0_ & 0x00000001) == 0x00000001)) {
|
||||
carChallengeItem_ = new java.util.ArrayList<com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem>(carChallengeItem_);
|
||||
bitField0_ |= 0x00000001;
|
||||
}
|
||||
}
|
||||
|
||||
private com.google.protobuf.RepeatedFieldBuilder<
|
||||
com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem, com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.Builder, com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItemOrBuilder> carChallengeItemBuilder_;
|
||||
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public java.util.List<com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem> getCarChallengeItemList() {
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
return java.util.Collections.unmodifiableList(carChallengeItem_);
|
||||
} else {
|
||||
return carChallengeItemBuilder_.getMessageList();
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public int getCarChallengeItemCount() {
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
return carChallengeItem_.size();
|
||||
} else {
|
||||
return carChallengeItemBuilder_.getCount();
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem getCarChallengeItem(int index) {
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
return carChallengeItem_.get(index);
|
||||
} else {
|
||||
return carChallengeItemBuilder_.getMessage(index);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public Builder setCarChallengeItem(
|
||||
int index, com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem value) {
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
if (value == null) {
|
||||
throw new NullPointerException();
|
||||
}
|
||||
ensureCarChallengeItemIsMutable();
|
||||
carChallengeItem_.set(index, value);
|
||||
onChanged();
|
||||
} else {
|
||||
carChallengeItemBuilder_.setMessage(index, value);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public Builder setCarChallengeItem(
|
||||
int index, com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.Builder builderForValue) {
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
ensureCarChallengeItemIsMutable();
|
||||
carChallengeItem_.set(index, builderForValue.build());
|
||||
onChanged();
|
||||
} else {
|
||||
carChallengeItemBuilder_.setMessage(index, builderForValue.build());
|
||||
}
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public Builder addCarChallengeItem(com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem value) {
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
if (value == null) {
|
||||
throw new NullPointerException();
|
||||
}
|
||||
ensureCarChallengeItemIsMutable();
|
||||
carChallengeItem_.add(value);
|
||||
onChanged();
|
||||
} else {
|
||||
carChallengeItemBuilder_.addMessage(value);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public Builder addCarChallengeItem(
|
||||
int index, com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem value) {
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
if (value == null) {
|
||||
throw new NullPointerException();
|
||||
}
|
||||
ensureCarChallengeItemIsMutable();
|
||||
carChallengeItem_.add(index, value);
|
||||
onChanged();
|
||||
} else {
|
||||
carChallengeItemBuilder_.addMessage(index, value);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public Builder addCarChallengeItem(
|
||||
com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.Builder builderForValue) {
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
ensureCarChallengeItemIsMutable();
|
||||
carChallengeItem_.add(builderForValue.build());
|
||||
onChanged();
|
||||
} else {
|
||||
carChallengeItemBuilder_.addMessage(builderForValue.build());
|
||||
}
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public Builder addCarChallengeItem(
|
||||
int index, com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.Builder builderForValue) {
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
ensureCarChallengeItemIsMutable();
|
||||
carChallengeItem_.add(index, builderForValue.build());
|
||||
onChanged();
|
||||
} else {
|
||||
carChallengeItemBuilder_.addMessage(index, builderForValue.build());
|
||||
}
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public Builder addAllCarChallengeItem(
|
||||
java.lang.Iterable<? extends com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem> values) {
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
ensureCarChallengeItemIsMutable();
|
||||
super.addAll(values, carChallengeItem_);
|
||||
onChanged();
|
||||
} else {
|
||||
carChallengeItemBuilder_.addAllMessages(values);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public Builder clearCarChallengeItem() {
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
carChallengeItem_ = java.util.Collections.emptyList();
|
||||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
onChanged();
|
||||
} else {
|
||||
carChallengeItemBuilder_.clear();
|
||||
}
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public Builder removeCarChallengeItem(int index) {
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
ensureCarChallengeItemIsMutable();
|
||||
carChallengeItem_.remove(index);
|
||||
onChanged();
|
||||
} else {
|
||||
carChallengeItemBuilder_.remove(index);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.Builder getCarChallengeItemBuilder(
|
||||
int index) {
|
||||
return getCarChallengeItemFieldBuilder().getBuilder(index);
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItemOrBuilder getCarChallengeItemOrBuilder(
|
||||
int index) {
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
return carChallengeItem_.get(index); } else {
|
||||
return carChallengeItemBuilder_.getMessageOrBuilder(index);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public java.util.List<? extends com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItemOrBuilder>
|
||||
getCarChallengeItemOrBuilderList() {
|
||||
if (carChallengeItemBuilder_ != null) {
|
||||
return carChallengeItemBuilder_.getMessageOrBuilderList();
|
||||
} else {
|
||||
return java.util.Collections.unmodifiableList(carChallengeItem_);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.Builder addCarChallengeItemBuilder() {
|
||||
return getCarChallengeItemFieldBuilder().addBuilder(
|
||||
com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.getDefaultInstance());
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.Builder addCarChallengeItemBuilder(
|
||||
int index) {
|
||||
return getCarChallengeItemFieldBuilder().addBuilder(
|
||||
index, com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.getDefaultInstance());
|
||||
}
|
||||
/**
|
||||
* <code>repeated .com.ljsd.jieling.protocols.CarGrapRecordItem carChallengeItem = 1;</code>
|
||||
*/
|
||||
public java.util.List<com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.Builder>
|
||||
getCarChallengeItemBuilderList() {
|
||||
return getCarChallengeItemFieldBuilder().getBuilderList();
|
||||
}
|
||||
private com.google.protobuf.RepeatedFieldBuilder<
|
||||
com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem, com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.Builder, com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItemOrBuilder>
|
||||
getCarChallengeItemFieldBuilder() {
|
||||
if (carChallengeItemBuilder_ == null) {
|
||||
carChallengeItemBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
|
||||
com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem, com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItem.Builder, com.ljsd.jieling.protocols.CommonProto.CarGrapRecordItemOrBuilder>(
|
||||
carChallengeItem_,
|
||||
((bitField0_ & 0x00000001) == 0x00000001),
|
||||
getParentForChildren(),
|
||||
isClean());
|
||||
carChallengeItem_ = null;
|
||||
}
|
||||
return carChallengeItemBuilder_;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.CarGrapRecordResponse)
|
||||
}
|
||||
|
||||
static {
|
||||
defaultInstance = new CarGrapRecordResponse(true);
|
||||
defaultInstance.initFields();
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(class_scope:com.ljsd.jieling.protocols.CarGrapRecordResponse)
|
||||
}
|
||||
|
||||
private static com.google.protobuf.Descriptors.Descriptor
|
||||
internal_static_com_ljsd_jieling_protocols_FamilyUserInfo_descriptor;
|
||||
private static
|
||||
|
@ -52903,6 +53577,11 @@ public final class Family {
|
|||
private static
|
||||
com.google.protobuf.GeneratedMessage.FieldAccessorTable
|
||||
internal_static_com_ljsd_jieling_protocols_ChallengeDeathPathResponse_fieldAccessorTable;
|
||||
private static com.google.protobuf.Descriptors.Descriptor
|
||||
internal_static_com_ljsd_jieling_protocols_CarGrapRecordResponse_descriptor;
|
||||
private static
|
||||
com.google.protobuf.GeneratedMessage.FieldAccessorTable
|
||||
internal_static_com_ljsd_jieling_protocols_CarGrapRecordResponse_fieldAccessorTable;
|
||||
|
||||
public static com.google.protobuf.Descriptors.FileDescriptor
|
||||
getDescriptor() {
|
||||
|
@ -53085,7 +53764,9 @@ public final class Family {
|
|||
"se\0228\n\tfightData\030\001 \001(\0132%.com.ljsd.jieling" +
|
||||
".protocols.FightData\022\016\n\006damage\030\002 \001(\005\022.\n\004" +
|
||||
"drop\030\003 \001(\0132 .com.ljsd.jieling.protocols." +
|
||||
"DropB\002H\001"
|
||||
"Drop\"`\n\025CarGrapRecordResponse\022G\n\020carChal" +
|
||||
"lengeItem\030\001 \003(\0132-.com.ljsd.jieling.proto" +
|
||||
"cols.CarGrapRecordItemB\002H\001"
|
||||
};
|
||||
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
|
||||
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
|
||||
|
@ -53554,6 +54235,12 @@ public final class Family {
|
|||
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
|
||||
internal_static_com_ljsd_jieling_protocols_ChallengeDeathPathResponse_descriptor,
|
||||
new java.lang.String[] { "FightData", "Damage", "Drop", });
|
||||
internal_static_com_ljsd_jieling_protocols_CarGrapRecordResponse_descriptor =
|
||||
getDescriptor().getMessageTypes().get(77);
|
||||
internal_static_com_ljsd_jieling_protocols_CarGrapRecordResponse_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
|
||||
internal_static_com_ljsd_jieling_protocols_CarGrapRecordResponse_descriptor,
|
||||
new java.lang.String[] { "CarChallengeItem", });
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -139,6 +139,10 @@ public class RedisKey {
|
|||
|
||||
public static final String CAR_DEALY_RANK = "CAR_DEALY_RANK";
|
||||
|
||||
public static final String CAR_DEALY_PLAY = "CAR_DEALY_PLAY";
|
||||
|
||||
public static final String CAR_DEALY_GUILD_RANK = "CAR_DEALY_GUILD_RANK";
|
||||
|
||||
public static final String FAMILY_ID = "FAMILY_ID";
|
||||
|
||||
public static final String FAMILY_JOIN = "FAMILY_JOIN";
|
||||
|
@ -256,6 +260,8 @@ public class RedisKey {
|
|||
|
||||
public final static String CAR_CHALLENEG_SB = "CAR_CHALLENEG_SB"; //车迟玩法挑战记录
|
||||
|
||||
public final static String CAR_CHALLENEG_RECORD = "CAR_CHALLENEG_RECORD"; //车迟玩法挑战记录
|
||||
|
||||
|
||||
|
||||
public static Set<String> familyKey = new HashSet<>();
|
||||
|
|
|
@ -958,6 +958,18 @@ public class RedisUtil {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void removeZSetRangeByScore(String type,String key,double min,double max){
|
||||
String rkey = getKey(type, key);
|
||||
for (int i = 0; i < MAX_TRY_TIMES; i++) {
|
||||
try {
|
||||
redisTemplate.opsForZSet().removeRangeByScore(rkey,min,max);
|
||||
return;
|
||||
} catch (Exception e) {
|
||||
TimeUtils.sleep(FAILED_SLEEP);
|
||||
}
|
||||
}
|
||||
}
|
||||
public long increment(String key) {
|
||||
for (int i = 0; i < MAX_TRY_TIMES; i++) {
|
||||
try {
|
||||
|
|
|
@ -5,8 +5,11 @@ import com.ljsd.jieling.db.redis.RedisKey;
|
|||
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||
import com.ljsd.jieling.exception.ErrorCode;
|
||||
import com.ljsd.jieling.exception.ErrorCodeException;
|
||||
import com.ljsd.jieling.logic.dao.GuilidManager;
|
||||
import com.ljsd.jieling.logic.dao.TeamPosHeroInfo;
|
||||
import com.ljsd.jieling.logic.dao.UserManager;
|
||||
import com.ljsd.jieling.logic.dao.VipInfo;
|
||||
import com.ljsd.jieling.logic.dao.root.GuildInfo;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.logic.family.GuildFightLogic;
|
||||
import com.ljsd.jieling.logic.fight.FightDispatcher;
|
||||
|
@ -21,6 +24,7 @@ import com.ljsd.jieling.protocols.CommonProto;
|
|||
import com.ljsd.jieling.protocols.FightInfoProto;
|
||||
import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||
import com.ljsd.jieling.util.MessageUtil;
|
||||
import config.SErrorCodeEerverConfig;
|
||||
import config.SWorldBossConfig;
|
||||
import config.SWorldBossSetting;
|
||||
import manager.STableManager;
|
||||
|
@ -39,8 +43,16 @@ public class FastChallengeHandler extends BaseHandler<FightInfoProto.FastFightCh
|
|||
int uid = iSession.getUid();
|
||||
User user = UserManager.getUser(uid);
|
||||
SWorldBossSetting sWorldBossSetting = STableManager.getConfig(SWorldBossSetting.class).get(1);
|
||||
GuildInfo guildInfo=null;
|
||||
if(type == 1 || type == 2){
|
||||
if(GuildFightLogic.carDelayProgressIndication.getProgress()!=type){
|
||||
guildInfo = GuilidManager.guildInfoMap.get(user.getPlayerInfoManager().getGuildId());
|
||||
if(guildInfo == null){
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
|
||||
}
|
||||
if(type == 2 && GuildFightLogic.carDelayProgressIndication.getProgress()!=3) {
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
|
||||
}
|
||||
if(type == 1 && GuildFightLogic.carDelayProgressIndication.getProgress()!=1) {
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
|
||||
}
|
||||
if(user.getPlayerInfoManager().getGuildId() == 0){
|
||||
|
@ -51,12 +63,14 @@ public class FastChallengeHandler extends BaseHandler<FightInfoProto.FastFightCh
|
|||
if(teamPosHeroInfos == null || teamPosHeroInfos.isEmpty()){
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
|
||||
}
|
||||
|
||||
int privilege = sWorldBossSetting.getPrivilege()[type - 1];
|
||||
/* boolean b = PlayerLogic.getInstance().checkAndUpdate(user, privilege, 1);
|
||||
boolean b = PlayerLogic.getInstance().checkAndUpdate(user, privilege, 1);
|
||||
if(!b){
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
int hurt = 0;
|
||||
int gainScore = 0;
|
||||
int challeageId = proto.getChalleageId();
|
||||
|
@ -71,6 +85,8 @@ public class FastChallengeHandler extends BaseHandler<FightInfoProto.FastFightCh
|
|||
fightData = fightResult.getFightData();
|
||||
gainScore = (int) (hurt*(sWorldBossSetting.getScorePercent()/10000F));
|
||||
RankEnum.toRank(RankEnum.CAR_DEALY_RANK.getType()).incrementRankScore(uid,"",gainScore);
|
||||
guildInfo.addCarFightSb(uid);
|
||||
|
||||
|
||||
}break;
|
||||
case 2:{
|
||||
|
@ -81,16 +97,30 @@ public class FastChallengeHandler extends BaseHandler<FightInfoProto.FastFightCh
|
|||
RedisUtil.getInstence().putMapEntry(RedisKey.CAR_CHALLENEG_SB, String.valueOf(uid), String.valueOf(challeageId), 1);
|
||||
PVPFightEvent pvpFightEvent = new PVPFightEvent(uid,GlobalsDef.CAR_DELAY_TEAM, battleRound,"", GameFightType.CarPersonChallenge,challeageId,GlobalsDef.CAR_DELAY_TEAM);
|
||||
FightResult fightResult = FightDispatcher.dispatcher(pvpFightEvent);
|
||||
fightData = fightResult.getFightData();
|
||||
int fight = fightResult.getCheckResult()[0];
|
||||
String content = "";
|
||||
String challengeContent = "";
|
||||
String challengeName = UserManager.getUser(challeageId).getPlayerInfoManager().getNickName();
|
||||
if(fight == 1){
|
||||
int challenegScore = RedisUtil.getInstence().getZSetScore(RankEnum.CAR_DEALY_RANK.getRedisKey(), "", String.valueOf(challeageId)).intValue();
|
||||
if(challenegScore !=-1){
|
||||
gainScore = (int) (challenegScore*(sWorldBossSetting.getGrabPercent()/10000F));
|
||||
RankEnum.toRank(RankEnum.CAR_DEALY_RANK.getType()).incrementRankScore(uid,"",gainScore);
|
||||
RankEnum.toRank(RankEnum.CAR_DEALY_RANK.getType()).incrementRankScore(challeageId,"",-gainScore);
|
||||
//
|
||||
}
|
||||
content = SErrorCodeEerverConfig.getI18NMessage("worldboss_battle_win",new Object[]{challengeName,gainScore});
|
||||
challengeContent = SErrorCodeEerverConfig.getI18NMessage("worldboss_grab_win",new Object[]{user.getPlayerInfoManager().getNickName(),gainScore});
|
||||
}else{
|
||||
content = SErrorCodeEerverConfig.getI18NMessage("worldboss_battle_lose",new Object[]{challengeName,gainScore});
|
||||
challengeContent = SErrorCodeEerverConfig.getI18NMessage("worldboss_grab_lose",new Object[]{user.getPlayerInfoManager().getNickName(),gainScore});
|
||||
}
|
||||
|
||||
String key = RedisUtil.getInstence().getKey(RedisKey.CAR_CHALLENEG_RECORD, String.valueOf(uid));
|
||||
String challenegeKey = RedisUtil.getInstence().getKey(RedisKey.CAR_CHALLENEG_RECORD, String.valueOf(challeageId));
|
||||
RedisUtil.getInstence().zsetAddOne(key,content + "|" + challeageId,(int)(System.currentTimeMillis()/1000));
|
||||
RedisUtil.getInstence().zsetAddOne(challenegeKey,challengeContent + "|" + uid,(int)(System.currentTimeMillis()/1000));
|
||||
guildInfo.addCarFightSb(uid);
|
||||
}break;
|
||||
default:
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
|
||||
|
|
|
@ -0,0 +1,43 @@
|
|||
package com.ljsd.jieling.handler;
|
||||
|
||||
import com.ljsd.jieling.db.redis.RedisKey;
|
||||
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||
import com.ljsd.jieling.netty.cocdex.PacketNetData;
|
||||
import com.ljsd.jieling.network.session.ISession;
|
||||
import com.ljsd.jieling.protocols.CommonProto;
|
||||
import com.ljsd.jieling.protocols.Family;
|
||||
import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||
import com.ljsd.jieling.util.MessageUtil;
|
||||
import org.springframework.data.redis.core.ZSetOperations;
|
||||
import util.TimeUtils;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.Set;
|
||||
|
||||
public class GetCarGrapRecordHandler extends BaseHandler{
|
||||
@Override
|
||||
public MessageTypeProto.MessageType getMessageCode() {
|
||||
return MessageTypeProto.MessageType.GET_CAR_GRAP_RECORD_REQUEST;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void process(ISession iSession, PacketNetData netData) throws Exception {
|
||||
Calendar instance = Calendar.getInstance();
|
||||
instance.setTimeInMillis(System.currentTimeMillis()-2*TimeUtils.ONE_DAY);
|
||||
instance.set(Calendar.HOUR_OF_DAY,0);
|
||||
instance.set(Calendar.MINUTE,0);
|
||||
instance.set(Calendar.SECOND,0);
|
||||
long timeInMillis = instance.getTimeInMillis();
|
||||
int leatestTime = (int)(timeInMillis/1000);
|
||||
RedisUtil.getInstence().removeZSetRangeByScore(RedisKey.CAR_CHALLENEG_RECORD,String.valueOf(iSession.getUid()),0,leatestTime);
|
||||
Set<ZSetOperations.TypedTuple<String>> zsetreverseRangeWithScores = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.CAR_CHALLENEG_RECORD, String.valueOf(iSession.getUid()), 0, -1);
|
||||
Family.CarGrapRecordResponse.Builder builder = Family.CarGrapRecordResponse.newBuilder();
|
||||
for(ZSetOperations.TypedTuple<String> item : zsetreverseRangeWithScores ){
|
||||
int time = item.getScore().intValue();
|
||||
String value = item.getValue();
|
||||
String[] split = value.split("\\|");
|
||||
builder.addCarChallengeItem(CommonProto.CarGrapRecordItem.newBuilder().setTime(time).setContent(split[0]).setUid(Integer.parseInt(split[1])));
|
||||
}
|
||||
MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.GET_CAR_GRAP_RECORD_RESPONSE_VALUE,builder.build(),true);
|
||||
}
|
||||
}
|
|
@ -10,14 +10,11 @@ import com.ljsd.jieling.logic.dao.GuilidManager;
|
|||
import com.ljsd.jieling.logic.dao.Hero;
|
||||
import com.ljsd.jieling.logic.dao.TeamPosHeroInfo;
|
||||
import com.ljsd.jieling.logic.dao.UserManager;
|
||||
import com.ljsd.jieling.logic.dao.root.GuildCache;
|
||||
import com.ljsd.jieling.logic.dao.root.GuildInfo;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.logic.player.PlayerLogic;
|
||||
import com.ljsd.jieling.logic.rank.RankEnum;
|
||||
import com.ljsd.jieling.logic.hero.HeroLogic;
|
||||
import com.ljsd.jieling.netty.cocdex.PacketNetData;
|
||||
import com.ljsd.jieling.network.session.ISession;
|
||||
import com.ljsd.jieling.protocols.CommonProto;
|
||||
import com.ljsd.jieling.protocols.Family;
|
||||
import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||
import com.ljsd.jieling.util.CBean2Proto;
|
||||
|
@ -86,7 +83,6 @@ public class GetCarChallengeListHandler extends BaseHandler {
|
|||
ZSetOperations.TypedTuple<String> item = typedTupleWithRankitem.getItem();
|
||||
int challenegUid = Integer.parseInt(item.getValue());
|
||||
int rank = typedTupleWithRankitem.getRank();
|
||||
CommonProto.TeamOneInfo.Builder userTeamOneInfo = PlayerLogic.getInstance().getUserTeamOneInfo(challenegUid, GlobalsDef.CAR_DELAY_TEAM);
|
||||
User challenegeUser = UserManager.getUser(challenegUid);
|
||||
int challengeGuildId = challenegeUser.getPlayerInfoManager().getGuildId();
|
||||
|
||||
|
@ -94,11 +90,11 @@ public class GetCarChallengeListHandler extends BaseHandler {
|
|||
.setUid(challenegUid)
|
||||
.setUserName(challenegeUser.getPlayerInfoManager().getNickName())
|
||||
.setScore(item.getScore().intValue())
|
||||
.setForce(0)
|
||||
.setForce(HeroLogic.getInstance().calTeamTotalForce(challenegeUser,GlobalsDef.CAR_DELAY_TEAM,false))
|
||||
.setHadChallenge(records.containsKey(challenegUid)?1:0)
|
||||
.setRank(rank);
|
||||
for (TeamPosHeroInfo heroInfo:challenegeUser.getTeamPosManager().getTeamPosForHero().get(GlobalsDef.CAR_DELAY_TEAM)) {
|
||||
Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId());
|
||||
Hero hero = challenegeUser.getHeroManager().getHero(heroInfo.getHeroId());
|
||||
builder1.addTeamInfo(CBean2Proto.getSimpleTeamInfoByHero(hero,heroInfo.getPosition()));
|
||||
}
|
||||
if(challengeGuildId!=0){
|
||||
|
|
|
@ -51,6 +51,8 @@ public class GuildInfo extends MongoBase {
|
|||
|
||||
private int fete;// 公会祈福获得的积分
|
||||
|
||||
private Map<Integer,Integer> carFightSb = new HashMap<>();
|
||||
|
||||
public GuildInfo() {
|
||||
setRootCollection(_COLLECTION_NAME);
|
||||
}
|
||||
|
@ -229,4 +231,15 @@ public class GuildInfo extends MongoBase {
|
|||
this.intoLevel = intoLevel;
|
||||
updateString("intoLevel",intoLevel);
|
||||
}
|
||||
|
||||
public void addCarFightSb(int uid){
|
||||
if(!carFightSb.containsKey(uid)){
|
||||
carFightSb.put(uid,1);
|
||||
updateString("carFightSb." + uid,1);
|
||||
}
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getCarFightSb() {
|
||||
return carFightSb;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -107,7 +107,7 @@ public class FightUtil {
|
|||
if(pvpFightEvent.getDefFightSnapData()!=null){
|
||||
deffightTeamInfo = makeFightWithSnapData(pvpFightEvent.getDefFightSnapData());
|
||||
} else{
|
||||
if(fightEvent.getFightType() == GameFightType.ArenaPersonFight){
|
||||
if(fightEvent.getFightType() == GameFightType.ArenaPersonFight ||fightEvent.getFightType() == GameFightType.CarPersonChallenge ){
|
||||
User defInMem = UserManager.getUserInMem(pvpFightEvent.getDefUid());
|
||||
deffightTeamInfo = makePersonFightData(defInMem, pvpFightEvent.getDefTeamId(),null);
|
||||
}else{
|
||||
|
@ -138,6 +138,8 @@ public class FightUtil {
|
|||
builder.setSeed(fightSeed);
|
||||
builder.setFightTeamInfo(fightTeamInfo);
|
||||
builder.setDefFightTeamInfo(deffightTeamInfo);
|
||||
CommonProto.FightData fightData = CommonProto.FightData.newBuilder().setFightType(fightEvent.getFightType().getFightType().getType()).setHeroFightInfos(fightTeamInfo).addMonsterList(deffightTeamInfo).setFightSeed(fightSeed).setFightMaxTime(fightEvent.getMostTime()).build();
|
||||
builder.setFightData(fightData);
|
||||
return builder.build();
|
||||
}
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@ public enum GameFightType {
|
|||
DeathPathChallenge(FightType.StoryFight,new DefaultWithoutHandFightHandler(),null),
|
||||
|
||||
CarBossChallenge(FightType.CarBossFight,new DefaultWithoutHandFightHandler(),null),
|
||||
CarPersonChallenge(FightType.CarPersonFight,new DefaultWithoutHandFightHandler(),null)
|
||||
CarPersonChallenge(FightType.CarBossFight,new PVPFightHandler(),null),
|
||||
|
||||
;
|
||||
|
||||
|
|
|
@ -23,11 +23,13 @@ public enum RankEnum {
|
|||
GUILD_BOSS_RANK(12,RedisKey.GUILD_BOSS_RANK,GuildBossRank::new),//param1:时间 param2:英雄tempId param3:uid
|
||||
GUILD_RED_PACKAGE_RANK(13,RedisKey.GUILD_RED_PACKAGE_RANK,GuildRedPackageRank::new),//param1:红包总价格 param2:无 param3:无
|
||||
CAR_DEALY_RANK(14,RedisKey.CAR_DEALY_RANK,CarDealyRank::new),//param1:伤害 param2:无 param3:无
|
||||
CAR_DEALY_GUILD_RANK(19,RedisKey.CAR_DEALY_GUILD_RANK,CarDealyGuildRank::new),//param1:伤害 param2:无 param3:无
|
||||
DEATH_PATH_EVERY_PERSON_RANK(15,RedisKey.DEATH_PATH_EVERY_PERSON_RANK,DeathPathEveryPersonRank::new),//param1:当前阵玩家伤害 param2:无 param3:无
|
||||
DEATH_PATH_EVERY_GUILD_RANK(16,RedisKey.DEATH_PATH_EVERY_GUILD_RANK, DeathPathEveryGuildRank::new),//param1:当前阵公会伤害 param2:当前工会挑战人数 param3:无
|
||||
DEATH_PATH_TOTAL_PERSON_RANK(17,RedisKey.DEATH_PATH_TOTAL_PERSON_RANK,DeathPathTotalPersonRank::new),//param1:玩家总伤害 param2:无 param3:无
|
||||
DEATH_PATH_TOTAL_GUILD_RANK(18,RedisKey.DEATH_PATH_TOTAL_GUILD_RANK,DeathPathTotalGuildRank::new);//param1:工会总伤害 param2:无 param3:无
|
||||
|
||||
|
||||
private int type;
|
||||
private String redisKey;
|
||||
private BiFunction<Integer,String,AbstractRank> rankFunction;
|
||||
|
|
|
@ -0,0 +1,74 @@
|
|||
package com.ljsd.jieling.logic.rank.rankImpl;
|
||||
|
||||
import com.ljsd.jieling.logic.dao.GuilidManager;
|
||||
import com.ljsd.jieling.logic.dao.root.GuildInfo;
|
||||
import com.ljsd.jieling.protocols.CommonProto;
|
||||
import com.ljsd.jieling.protocols.PlayerInfoProto;
|
||||
import org.springframework.data.redis.core.ZSetOperations;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
public class CarDealyGuildRank extends AbstractRank{
|
||||
public CarDealyGuildRank(int type, String redisKey) {
|
||||
super(type, redisKey);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected PlayerInfoProto.RankResponse.Builder getAllUserResponse(Set<ZSetOperations.TypedTuple<String>> zsetreverseRangeWithScores, int start) throws Exception {
|
||||
// PlayerInfoProto.RankResponse.Builder allUserResponse = super.getAllUserResponse(zsetreverseRangeWithScores, start);
|
||||
// List<CommonProto.UserRank> ranksBuilderList = allUserResponse.getRanksList();
|
||||
// if(ranksBuilderList.size()<2){
|
||||
// return allUserResponse;
|
||||
// }
|
||||
// List<CommonProto.UserRank> builders = new ArrayList<>(ranksBuilderList);
|
||||
// Collections.sort(builders,(o1, o2) -> {
|
||||
// if(o1.getRankInfo().getParam1()==o2.getRankInfo().getParam1()){
|
||||
// if(o1.getForce()>o2.getForce() &&o1.getRankInfo().getRank()>o2.getRankInfo().getRank()){
|
||||
// CommonProto.UserRank rankInfo1 = o1 ;
|
||||
// o1 = o2;
|
||||
// o2 = rankInfo1;
|
||||
// }
|
||||
// }
|
||||
// return o1.getRankInfo().getRank()-o2.getRankInfo().getRank();
|
||||
// });
|
||||
// List<CommonProto.UserRank> buildersCopy = new ArrayList<>(ranksBuilderList.size());
|
||||
// for(CommonProto.UserRank userRank : builders){
|
||||
// buildersCopy.add(userRank.toBuilder().setRankInfo(userRank.toBuilder().getRankInfo().toBuilder().setRank(start).build()).build());
|
||||
// start++;
|
||||
// }
|
||||
// PlayerInfoProto.RankResponse.Builder response = PlayerInfoProto.RankResponse.newBuilder();
|
||||
// response.setMyRankInfo(allUserResponse.getMyRankInfo()).addAllRanks(buildersCopy);
|
||||
// return response;
|
||||
return super.getAllUserResponse(zsetreverseRangeWithScores,start);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int[] getDataByScore(Double score) {
|
||||
return new int[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getScore(double... data) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void getOptional(int index, ZSetOperations.TypedTuple<String> data, PlayerInfoProto.RankResponse.Builder builder) throws Exception {
|
||||
|
||||
String value = data.getValue();
|
||||
int guildId = Integer.parseInt(value);
|
||||
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(guildId);
|
||||
String familyName = guildInfo.getName();
|
||||
CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder()
|
||||
.setRank(index)
|
||||
.setParam1(getParam1(data.getScore()))
|
||||
.setParam2(guildInfo.getCarFightSb().size());
|
||||
|
||||
CommonProto.UserRank everyRank = CommonProto.UserRank.newBuilder()
|
||||
.setGuildName(familyName)
|
||||
.setRankInfo(everyRankInfo)
|
||||
.build();
|
||||
builder.addRanks(everyRank);
|
||||
}
|
||||
}
|
|
@ -1,5 +1,12 @@
|
|||
package com.ljsd.jieling.logic.rank.rankImpl;
|
||||
|
||||
|
||||
import com.ljsd.jieling.logic.dao.UserManager;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.protocols.CommonProto;
|
||||
import com.ljsd.jieling.protocols.PlayerInfoProto;
|
||||
import org.springframework.data.redis.core.ZSetOperations;
|
||||
|
||||
public class CarDealyRank extends AbstractRank{
|
||||
|
||||
public CarDealyRank(int type, String redisKey) {
|
||||
|
@ -8,11 +15,26 @@ public class CarDealyRank extends AbstractRank{
|
|||
|
||||
@Override
|
||||
public int[] getDataByScore(Double score) {
|
||||
return new int[0];
|
||||
return new int[]{score.intValue()};
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getScore(double... data) {
|
||||
return data[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void getOptional(int index, ZSetOperations.TypedTuple<String> data, PlayerInfoProto.RankResponse.Builder builder) throws Exception {
|
||||
CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder()
|
||||
.setRank(index)
|
||||
.setParam1(getParam1(data.getScore()))
|
||||
.setParam2(getParam2(data.getScore()))
|
||||
.setParam3(getParam3(data.getScore()));
|
||||
User everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true);
|
||||
CommonProto.UserRank everyRank = CommonProto.UserRank.newBuilder()
|
||||
.setUserName(everyUser.getPlayerInfoManager().getNickName())
|
||||
.setRankInfo(everyRankInfo)
|
||||
.build();
|
||||
builder.addRanks(everyRank);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue