From c8c44a126b72ca9d9c04143aca720ee2c4a124c5 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Mon, 26 Jun 2023 15:32:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=BD=A6=E6=95=B0=E6=8D=AEmode?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rep/TrainIndicationInitResponse.java | 4 +- .../rep/TrainIndicationRemoveResponse.java | 22 + .../rep/TrainIndicationUpdateResponse.java | 4 +- .../line3/rep/TrainRecordResponse.java | 3 +- .../xiannccda/dto/protos/SectionProto.java | 2072 +++++++++++++ .../xiannccda/dto/protos/TrainProto.java | 451 ++- .../xiannccda/dto/protos/WsMessageProto.java | 2704 +++++++++-------- xian-ncc-da-message | 2 +- 8 files changed, 3923 insertions(+), 1339 deletions(-) create mode 100644 src/main/java/club/joylink/xiannccda/dto/protos/SectionProto.java diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationInitResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationInitResponse.java index 497243f..f459889 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationInitResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationInitResponse.java @@ -4,6 +4,7 @@ import club.joylink.xiannccda.ats.message.MessageResponse; import club.joylink.xiannccda.ats.message.convertor.DeviceStatusConvertor; import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; import club.joylink.xiannccda.ats.message.line3.MessageCons; +import club.joylink.xiannccda.ats.message.line3.device.DeviceStatus; import club.joylink.xiannccda.ats.message.line3.device.DeviceType; import club.joylink.xiannccda.ats.message.line3.rep.DeviceStatusBitmapResponse.DeviceTypeEntity; import club.joylink.xiannccda.dto.protos.DeviceStatusProto; @@ -86,7 +87,8 @@ public class TrainIndicationInitResponse extends MessageResponse { builder.setOtpTime(trainCell.getOtpTime()); } if (trainCell.getMode() != null) { - builder.setMode(trainCell.getMode()); + DeviceStatusProto.TrainMode.Builder trainMode = DeviceStatusConvertor.convert(DeviceStatus.TRAIN_MODE.class, trainCell.getMode()); + builder.setMode(trainMode.build()); } if (trainCell.getArriveTime() != null) { builder.setArriveTime(trainCell.getArriveTime().getNano()); diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationRemoveResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationRemoveResponse.java index eb0e959..5ab9581 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationRemoveResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationRemoveResponse.java @@ -3,7 +3,12 @@ package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; import club.joylink.xiannccda.ats.message.line3.MessageCons; import club.joylink.xiannccda.ats.message.line3.device.DeviceType; +import club.joylink.xiannccda.dto.protos.DeviceStatusProto; +import club.joylink.xiannccda.dto.protos.TrainProto.NccWindow; +import club.joylink.xiannccda.dto.protos.TrainProto.TrainRemove; +import com.google.protobuf.GeneratedMessageV3.Builder; import io.netty.buffer.ByteBuf; +import java.util.List; import lombok.Getter; import lombok.Setter; @@ -68,4 +73,21 @@ public class TrainIndicationRemoveResponse extends MessageResponse { this.trainIndex = new String(trainIndex, MessageCons.STRING_CHARSET).trim(); this.groupId = new String(groupId, MessageCons.STRING_CHARSET).trim(); } + + @Override + public List generateProto() throws Exception { + TrainRemove.Builder trainRemove = TrainRemove.newBuilder(); + trainRemove.setLineId(this.lineId); + trainRemove.setRtuId(this.rtuId); + NccWindow.Builder window = NccWindow.newBuilder(); + window.setNccWindow(this.nccWindow); + window.setNccWinOffset(this.nccWindowOffset); + trainRemove.setWindow(window); + trainRemove.setDeviceType(DeviceStatusProto.DeviceType.forNumber(this.devType.getVal())); + trainRemove.setDevName(this.devName); + trainRemove.setTrainIndex(this.trainIndex); + trainRemove.setGroupId(this.groupId); + return List.of(trainRemove); + + } } diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationUpdateResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationUpdateResponse.java index e493097..ecdcf22 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationUpdateResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationUpdateResponse.java @@ -1,6 +1,7 @@ package club.joylink.xiannccda.ats.message.line3.rep; import club.joylink.xiannccda.ats.message.MessageResponse; +import club.joylink.xiannccda.ats.message.convertor.DeviceStatusConvertor; import club.joylink.xiannccda.ats.message.line3.DateTimeUtil; import club.joylink.xiannccda.ats.message.line3.MessageCons; import club.joylink.xiannccda.ats.message.line3.device.DeviceStatus; @@ -143,7 +144,8 @@ public class TrainIndicationUpdateResponse extends MessageResponse { train.setOtpTime(this.optTime); train.setArriveTime(this.arriveTime.toEpochSecond(ZoneOffset.ofHours(8)) * 1000); train.setDepartTime(this.departTime.toEpochSecond(ZoneOffset.ofHours(8)) * 1000); - train.setMode(this.mode); + DeviceStatusProto.TrainMode.Builder trainMode = DeviceStatusConvertor.convert(DeviceStatus.TRAIN_MODE.class, this.mode); + train.setMode(trainMode.build()); train.setSpeed(this.speed); train.setRate(this.rate); train.setRouteId(this.routeId); diff --git a/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainRecordResponse.java b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainRecordResponse.java index 1fdcf27..376430a 100644 --- a/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainRecordResponse.java +++ b/src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainRecordResponse.java @@ -11,6 +11,7 @@ import com.google.common.collect.Lists; import com.google.protobuf.GeneratedMessageV3; import com.google.protobuf.GeneratedMessageV3.Builder; import io.netty.buffer.ByteBuf; +import java.time.ZoneOffset; import java.util.List; import lombok.Getter; @@ -151,7 +152,7 @@ public class TrainRecordResponse extends MessageResponse { builder.setRecordType(this.getRecordType()); } if (this.getRecordTime() != null) { - builder.setRecordTime(this.getRecordTime().getNano()); + builder.setRecordTime(this.getRecordTime().toEpochSecond(ZoneOffset.ofHours(8)) * 1000); } msgBuildList.add(builder); return msgBuildList; diff --git a/src/main/java/club/joylink/xiannccda/dto/protos/SectionProto.java b/src/main/java/club/joylink/xiannccda/dto/protos/SectionProto.java new file mode 100644 index 0000000..e8035db --- /dev/null +++ b/src/main/java/club/joylink/xiannccda/dto/protos/SectionProto.java @@ -0,0 +1,2072 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: section_status.proto + +package club.joylink.xiannccda.dto.protos; + +public final class SectionProto { + private SectionProto() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface SectionOrBuilder extends + // @@protoc_insertion_point(interface_extends:state.Section) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+     * 区段编码
+     *
+ * + * string code = 1; + * @return The code. + */ + java.lang.String getCode(); + /** + * 
+     * 区段编码
+     *
+ * + * string code = 1; + * @return The bytes for code. + */ + com.google.protobuf.ByteString + getCodeBytes(); + + /** + * 
+     * 左侧区段
+     *
+ * + * .state.Section leftSection = 2; + * @return Whether the leftSection field is set. + */ + boolean hasLeftSection(); + /** + * 
+     * 左侧区段
+     *
+ * + * .state.Section leftSection = 2; + * @return The leftSection. + */ + club.joylink.xiannccda.dto.protos.SectionProto.Section getLeftSection(); + /** + * 
+     * 左侧区段
+     *
+ * + * .state.Section leftSection = 2; + */ + club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder getLeftSectionOrBuilder(); + + /** + * 
+     * 右侧区段
+     *
+ * + * .state.Section rightSection = 3; + * @return Whether the rightSection field is set. + */ + boolean hasRightSection(); + /** + * 
+     * 右侧区段
+     *
+ * + * .state.Section rightSection = 3; + * @return The rightSection. + */ + club.joylink.xiannccda.dto.protos.SectionProto.Section getRightSection(); + /** + * 
+     * 右侧区段
+     *
+ * + * .state.Section rightSection = 3; + */ + club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder getRightSectionOrBuilder(); + + /** + * 
+     * 是否计轴区段
+     *
+ * + * bool axleCounter = 4; + * @return The axleCounter. + */ + boolean getAxleCounter(); + + /** + * 
+     * 关联区段
+     *
+ * + * repeated .state.Section logicList = 5; + */ + java.util.List + getLogicListList(); + /** + * 
+     * 关联区段
+     *
+ * + * repeated .state.Section logicList = 5; + */ + club.joylink.xiannccda.dto.protos.SectionProto.Section getLogicList(int index); + /** + * 
+     * 关联区段
+     *
+ * + * repeated .state.Section logicList = 5; + */ + int getLogicListCount(); + /** + * 
+     * 关联区段
+     *
+ * + * repeated .state.Section logicList = 5; + */ + java.util.List + getLogicListOrBuilderList(); + /** + * 
+     * 关联区段
+     *
+ * + * repeated .state.Section logicList = 5; + */ + club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder getLogicListOrBuilder( + int index); + + /** + * 
+     * 左侧公里标
+     *
+ * + * string leftKilometerCode = 6; + * @return The leftKilometerCode. + */ + java.lang.String getLeftKilometerCode(); + /** + * 
+     * 左侧公里标
+     *
+ * + * string leftKilometerCode = 6; + * @return The bytes for leftKilometerCode. + */ + com.google.protobuf.ByteString + getLeftKilometerCodeBytes(); + + /** + * 
+     * 右侧公里标
+     *
+ * + * string rightKilometerCode = 7; + * @return The rightKilometerCode. + */ + java.lang.String getRightKilometerCode(); + /** + * 
+     * 右侧公里标
+     *
+ * + * string rightKilometerCode = 7; + * @return The bytes for rightKilometerCode. + */ + com.google.protobuf.ByteString + getRightKilometerCodeBytes(); + } + /** + * Protobuf type {@code state.Section} + */ + public static final class Section extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:state.Section) + SectionOrBuilder { + private static final long serialVersionUID = 0L; + // Use Section.newBuilder() to construct. + private Section(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private Section() { + code_ = ""; + logicList_ = java.util.Collections.emptyList(); + leftKilometerCode_ = ""; + rightKilometerCode_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new Section(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return club.joylink.xiannccda.dto.protos.SectionProto.internal_static_state_Section_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return club.joylink.xiannccda.dto.protos.SectionProto.internal_static_state_Section_fieldAccessorTable + .ensureFieldAccessorsInitialized( + club.joylink.xiannccda.dto.protos.SectionProto.Section.class, club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder.class); + } + + public static final int CODE_FIELD_NUMBER = 1; + @SuppressWarnings("serial") + private volatile java.lang.Object code_ = ""; + /** + * 
+     * 区段编码
+     *
+ * + * string code = 1; + * @return The code. + */ + @java.lang.Override + public java.lang.String getCode() { + java.lang.Object ref = code_; + 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(); + code_ = s; + return s; + } + } + /** + * 
+     * 区段编码
+     *
+ * + * string code = 1; + * @return The bytes for code. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getCodeBytes() { + java.lang.Object ref = code_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + code_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int LEFTSECTION_FIELD_NUMBER = 2; + private club.joylink.xiannccda.dto.protos.SectionProto.Section leftSection_; + /** + * 
+     * 左侧区段
+     *
+ * + * .state.Section leftSection = 2; + * @return Whether the leftSection field is set. + */ + @java.lang.Override + public boolean hasLeftSection() { + return leftSection_ != null; + } + /** + * 
+     * 左侧区段
+     *
+ * + * .state.Section leftSection = 2; + * @return The leftSection. + */ + @java.lang.Override + public club.joylink.xiannccda.dto.protos.SectionProto.Section getLeftSection() { + return leftSection_ == null ? club.joylink.xiannccda.dto.protos.SectionProto.Section.getDefaultInstance() : leftSection_; + } + /** + * 
+     * 左侧区段
+     *
+ * + * .state.Section leftSection = 2; + */ + @java.lang.Override + public club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder getLeftSectionOrBuilder() { + return leftSection_ == null ? club.joylink.xiannccda.dto.protos.SectionProto.Section.getDefaultInstance() : leftSection_; + } + + public static final int RIGHTSECTION_FIELD_NUMBER = 3; + private club.joylink.xiannccda.dto.protos.SectionProto.Section rightSection_; + /** + * 
+     * 右侧区段
+     *
+ * + * .state.Section rightSection = 3; + * @return Whether the rightSection field is set. + */ + @java.lang.Override + public boolean hasRightSection() { + return rightSection_ != null; + } + /** + * 
+     * 右侧区段
+     *
+ * + * .state.Section rightSection = 3; + * @return The rightSection. + */ + @java.lang.Override + public club.joylink.xiannccda.dto.protos.SectionProto.Section getRightSection() { + return rightSection_ == null ? club.joylink.xiannccda.dto.protos.SectionProto.Section.getDefaultInstance() : rightSection_; + } + /** + * 
+     * 右侧区段
+     *
+ * + * .state.Section rightSection = 3; + */ + @java.lang.Override + public club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder getRightSectionOrBuilder() { + return rightSection_ == null ? club.joylink.xiannccda.dto.protos.SectionProto.Section.getDefaultInstance() : rightSection_; + } + + public static final int AXLECOUNTER_FIELD_NUMBER = 4; + private boolean axleCounter_ = false; + /** + * 
+     * 是否计轴区段
+     *
+ * + * bool axleCounter = 4; + * @return The axleCounter. + */ + @java.lang.Override + public boolean getAxleCounter() { + return axleCounter_; + } + + public static final int LOGICLIST_FIELD_NUMBER = 5; + @SuppressWarnings("serial") + private java.util.List logicList_; + /** + * 
+     * 关联区段
+     *
+ * + * repeated .state.Section logicList = 5; + */ + @java.lang.Override + public java.util.List getLogicListList() { + return logicList_; + } + /** + * 
+     * 关联区段
+     *
+ * + * repeated .state.Section logicList = 5; + */ + @java.lang.Override + public java.util.List + getLogicListOrBuilderList() { + return logicList_; + } + /** + * 
+     * 关联区段
+     *
+ * + * repeated .state.Section logicList = 5; + */ + @java.lang.Override + public int getLogicListCount() { + return logicList_.size(); + } + /** + * 
+     * 关联区段
+     *
+ * + * repeated .state.Section logicList = 5; + */ + @java.lang.Override + public club.joylink.xiannccda.dto.protos.SectionProto.Section getLogicList(int index) { + return logicList_.get(index); + } + /** + * 
+     * 关联区段
+     *
+ * + * repeated .state.Section logicList = 5; + */ + @java.lang.Override + public club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder getLogicListOrBuilder( + int index) { + return logicList_.get(index); + } + + public static final int LEFTKILOMETERCODE_FIELD_NUMBER = 6; + @SuppressWarnings("serial") + private volatile java.lang.Object leftKilometerCode_ = ""; + /** + * 
+     * 左侧公里标
+     *
+ * + * string leftKilometerCode = 6; + * @return The leftKilometerCode. + */ + @java.lang.Override + public java.lang.String getLeftKilometerCode() { + java.lang.Object ref = leftKilometerCode_; + 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(); + leftKilometerCode_ = s; + return s; + } + } + /** + * 
+     * 左侧公里标
+     *
+ * + * string leftKilometerCode = 6; + * @return The bytes for leftKilometerCode. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getLeftKilometerCodeBytes() { + java.lang.Object ref = leftKilometerCode_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + leftKilometerCode_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int RIGHTKILOMETERCODE_FIELD_NUMBER = 7; + @SuppressWarnings("serial") + private volatile java.lang.Object rightKilometerCode_ = ""; + /** + * 
+     * 右侧公里标
+     *
+ * + * string rightKilometerCode = 7; + * @return The rightKilometerCode. + */ + @java.lang.Override + public java.lang.String getRightKilometerCode() { + java.lang.Object ref = rightKilometerCode_; + 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(); + rightKilometerCode_ = s; + return s; + } + } + /** + * 
+     * 右侧公里标
+     *
+ * + * string rightKilometerCode = 7; + * @return The bytes for rightKilometerCode. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getRightKilometerCodeBytes() { + java.lang.Object ref = rightKilometerCode_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + rightKilometerCode_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, code_); + } + if (leftSection_ != null) { + output.writeMessage(2, getLeftSection()); + } + if (rightSection_ != null) { + output.writeMessage(3, getRightSection()); + } + if (axleCounter_ != false) { + output.writeBool(4, axleCounter_); + } + for (int i = 0; i < logicList_.size(); i++) { + output.writeMessage(5, logicList_.get(i)); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(leftKilometerCode_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 6, leftKilometerCode_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(rightKilometerCode_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 7, rightKilometerCode_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, code_); + } + if (leftSection_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getLeftSection()); + } + if (rightSection_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, getRightSection()); + } + if (axleCounter_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(4, axleCounter_); + } + for (int i = 0; i < logicList_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, logicList_.get(i)); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(leftKilometerCode_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, leftKilometerCode_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(rightKilometerCode_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, rightKilometerCode_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof club.joylink.xiannccda.dto.protos.SectionProto.Section)) { + return super.equals(obj); + } + club.joylink.xiannccda.dto.protos.SectionProto.Section other = (club.joylink.xiannccda.dto.protos.SectionProto.Section) obj; + + if (!getCode() + .equals(other.getCode())) return false; + if (hasLeftSection() != other.hasLeftSection()) return false; + if (hasLeftSection()) { + if (!getLeftSection() + .equals(other.getLeftSection())) return false; + } + if (hasRightSection() != other.hasRightSection()) return false; + if (hasRightSection()) { + if (!getRightSection() + .equals(other.getRightSection())) return false; + } + if (getAxleCounter() + != other.getAxleCounter()) return false; + if (!getLogicListList() + .equals(other.getLogicListList())) return false; + if (!getLeftKilometerCode() + .equals(other.getLeftKilometerCode())) return false; + if (!getRightKilometerCode() + .equals(other.getRightKilometerCode())) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + CODE_FIELD_NUMBER; + hash = (53 * hash) + getCode().hashCode(); + if (hasLeftSection()) { + hash = (37 * hash) + LEFTSECTION_FIELD_NUMBER; + hash = (53 * hash) + getLeftSection().hashCode(); + } + if (hasRightSection()) { + hash = (37 * hash) + RIGHTSECTION_FIELD_NUMBER; + hash = (53 * hash) + getRightSection().hashCode(); + } + hash = (37 * hash) + AXLECOUNTER_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getAxleCounter()); + if (getLogicListCount() > 0) { + hash = (37 * hash) + LOGICLIST_FIELD_NUMBER; + hash = (53 * hash) + getLogicListList().hashCode(); + } + hash = (37 * hash) + LEFTKILOMETERCODE_FIELD_NUMBER; + hash = (53 * hash) + getLeftKilometerCode().hashCode(); + hash = (37 * hash) + RIGHTKILOMETERCODE_FIELD_NUMBER; + hash = (53 * hash) + getRightKilometerCode().hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static club.joylink.xiannccda.dto.protos.SectionProto.Section parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static club.joylink.xiannccda.dto.protos.SectionProto.Section parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static club.joylink.xiannccda.dto.protos.SectionProto.Section parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static club.joylink.xiannccda.dto.protos.SectionProto.Section parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static club.joylink.xiannccda.dto.protos.SectionProto.Section parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static club.joylink.xiannccda.dto.protos.SectionProto.Section parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static club.joylink.xiannccda.dto.protos.SectionProto.Section parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static club.joylink.xiannccda.dto.protos.SectionProto.Section parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static club.joylink.xiannccda.dto.protos.SectionProto.Section parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static club.joylink.xiannccda.dto.protos.SectionProto.Section parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static club.joylink.xiannccda.dto.protos.SectionProto.Section parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static club.joylink.xiannccda.dto.protos.SectionProto.Section parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(club.joylink.xiannccda.dto.protos.SectionProto.Section prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code state.Section} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:state.Section) + club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return club.joylink.xiannccda.dto.protos.SectionProto.internal_static_state_Section_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return club.joylink.xiannccda.dto.protos.SectionProto.internal_static_state_Section_fieldAccessorTable + .ensureFieldAccessorsInitialized( + club.joylink.xiannccda.dto.protos.SectionProto.Section.class, club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder.class); + } + + // Construct using club.joylink.xiannccda.dto.protos.SectionProto.Section.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + code_ = ""; + leftSection_ = null; + if (leftSectionBuilder_ != null) { + leftSectionBuilder_.dispose(); + leftSectionBuilder_ = null; + } + rightSection_ = null; + if (rightSectionBuilder_ != null) { + rightSectionBuilder_.dispose(); + rightSectionBuilder_ = null; + } + axleCounter_ = false; + if (logicListBuilder_ == null) { + logicList_ = java.util.Collections.emptyList(); + } else { + logicList_ = null; + logicListBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000010); + leftKilometerCode_ = ""; + rightKilometerCode_ = ""; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return club.joylink.xiannccda.dto.protos.SectionProto.internal_static_state_Section_descriptor; + } + + @java.lang.Override + public club.joylink.xiannccda.dto.protos.SectionProto.Section getDefaultInstanceForType() { + return club.joylink.xiannccda.dto.protos.SectionProto.Section.getDefaultInstance(); + } + + @java.lang.Override + public club.joylink.xiannccda.dto.protos.SectionProto.Section build() { + club.joylink.xiannccda.dto.protos.SectionProto.Section result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public club.joylink.xiannccda.dto.protos.SectionProto.Section buildPartial() { + club.joylink.xiannccda.dto.protos.SectionProto.Section result = new club.joylink.xiannccda.dto.protos.SectionProto.Section(this); + buildPartialRepeatedFields(result); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartialRepeatedFields(club.joylink.xiannccda.dto.protos.SectionProto.Section result) { + if (logicListBuilder_ == null) { + if (((bitField0_ & 0x00000010) != 0)) { + logicList_ = java.util.Collections.unmodifiableList(logicList_); + bitField0_ = (bitField0_ & ~0x00000010); + } + result.logicList_ = logicList_; + } else { + result.logicList_ = logicListBuilder_.build(); + } + } + + private void buildPartial0(club.joylink.xiannccda.dto.protos.SectionProto.Section result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.code_ = code_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.leftSection_ = leftSectionBuilder_ == null + ? leftSection_ + : leftSectionBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.rightSection_ = rightSectionBuilder_ == null + ? rightSection_ + : rightSectionBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.axleCounter_ = axleCounter_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.leftKilometerCode_ = leftKilometerCode_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.rightKilometerCode_ = rightKilometerCode_; + } + } + + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof club.joylink.xiannccda.dto.protos.SectionProto.Section) { + return mergeFrom((club.joylink.xiannccda.dto.protos.SectionProto.Section)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(club.joylink.xiannccda.dto.protos.SectionProto.Section other) { + if (other == club.joylink.xiannccda.dto.protos.SectionProto.Section.getDefaultInstance()) return this; + if (!other.getCode().isEmpty()) { + code_ = other.code_; + bitField0_ |= 0x00000001; + onChanged(); + } + if (other.hasLeftSection()) { + mergeLeftSection(other.getLeftSection()); + } + if (other.hasRightSection()) { + mergeRightSection(other.getRightSection()); + } + if (other.getAxleCounter() != false) { + setAxleCounter(other.getAxleCounter()); + } + if (logicListBuilder_ == null) { + if (!other.logicList_.isEmpty()) { + if (logicList_.isEmpty()) { + logicList_ = other.logicList_; + bitField0_ = (bitField0_ & ~0x00000010); + } else { + ensureLogicListIsMutable(); + logicList_.addAll(other.logicList_); + } + onChanged(); + } + } else { + if (!other.logicList_.isEmpty()) { + if (logicListBuilder_.isEmpty()) { + logicListBuilder_.dispose(); + logicListBuilder_ = null; + logicList_ = other.logicList_; + bitField0_ = (bitField0_ & ~0x00000010); + logicListBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getLogicListFieldBuilder() : null; + } else { + logicListBuilder_.addAllMessages(other.logicList_); + } + } + } + if (!other.getLeftKilometerCode().isEmpty()) { + leftKilometerCode_ = other.leftKilometerCode_; + bitField0_ |= 0x00000020; + onChanged(); + } + if (!other.getRightKilometerCode().isEmpty()) { + rightKilometerCode_ = other.rightKilometerCode_; + bitField0_ |= 0x00000040; + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + code_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + input.readMessage( + getLeftSectionFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 26: { + input.readMessage( + getRightSectionFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000004; + break; + } // case 26 + case 32: { + axleCounter_ = input.readBool(); + bitField0_ |= 0x00000008; + break; + } // case 32 + case 42: { + club.joylink.xiannccda.dto.protos.SectionProto.Section m = + input.readMessage( + club.joylink.xiannccda.dto.protos.SectionProto.Section.parser(), + extensionRegistry); + if (logicListBuilder_ == null) { + ensureLogicListIsMutable(); + logicList_.add(m); + } else { + logicListBuilder_.addMessage(m); + } + break; + } // case 42 + case 50: { + leftKilometerCode_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000020; + break; + } // case 50 + case 58: { + rightKilometerCode_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000040; + break; + } // case 58 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private java.lang.Object code_ = ""; + /** + * 
+       * 区段编码
+       *
+ * + * string code = 1; + * @return The code. + */ + public java.lang.String getCode() { + java.lang.Object ref = code_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + code_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+       * 区段编码
+       *
+ * + * string code = 1; + * @return The bytes for code. + */ + public com.google.protobuf.ByteString + getCodeBytes() { + java.lang.Object ref = code_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + code_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+       * 区段编码
+       *
+ * + * string code = 1; + * @param value The code to set. + * @return This builder for chaining. + */ + public Builder setCode( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + code_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * 
+       * 区段编码
+       *
+ * + * string code = 1; + * @return This builder for chaining. + */ + public Builder clearCode() { + code_ = getDefaultInstance().getCode(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + /** + * 
+       * 区段编码
+       *
+ * + * string code = 1; + * @param value The bytes for code to set. + * @return This builder for chaining. + */ + public Builder setCodeBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + code_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + + private club.joylink.xiannccda.dto.protos.SectionProto.Section leftSection_; + private com.google.protobuf.SingleFieldBuilderV3< + club.joylink.xiannccda.dto.protos.SectionProto.Section, club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder, club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder> leftSectionBuilder_; + /** + * 
+       * 左侧区段
+       *
+ * + * .state.Section leftSection = 2; + * @return Whether the leftSection field is set. + */ + public boolean hasLeftSection() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * 
+       * 左侧区段
+       *
+ * + * .state.Section leftSection = 2; + * @return The leftSection. + */ + public club.joylink.xiannccda.dto.protos.SectionProto.Section getLeftSection() { + if (leftSectionBuilder_ == null) { + return leftSection_ == null ? club.joylink.xiannccda.dto.protos.SectionProto.Section.getDefaultInstance() : leftSection_; + } else { + return leftSectionBuilder_.getMessage(); + } + } + /** + * 
+       * 左侧区段
+       *
+ * + * .state.Section leftSection = 2; + */ + public Builder setLeftSection(club.joylink.xiannccda.dto.protos.SectionProto.Section value) { + if (leftSectionBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + leftSection_ = value; + } else { + leftSectionBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * 
+       * 左侧区段
+       *
+ * + * .state.Section leftSection = 2; + */ + public Builder setLeftSection( + club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder builderForValue) { + if (leftSectionBuilder_ == null) { + leftSection_ = builderForValue.build(); + } else { + leftSectionBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * 
+       * 左侧区段
+       *
+ * + * .state.Section leftSection = 2; + */ + public Builder mergeLeftSection(club.joylink.xiannccda.dto.protos.SectionProto.Section value) { + if (leftSectionBuilder_ == null) { + if (((bitField0_ & 0x00000002) != 0) && + leftSection_ != null && + leftSection_ != club.joylink.xiannccda.dto.protos.SectionProto.Section.getDefaultInstance()) { + getLeftSectionBuilder().mergeFrom(value); + } else { + leftSection_ = value; + } + } else { + leftSectionBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * 
+       * 左侧区段
+       *
+ * + * .state.Section leftSection = 2; + */ + public Builder clearLeftSection() { + bitField0_ = (bitField0_ & ~0x00000002); + leftSection_ = null; + if (leftSectionBuilder_ != null) { + leftSectionBuilder_.dispose(); + leftSectionBuilder_ = null; + } + onChanged(); + return this; + } + /** + * 
+       * 左侧区段
+       *
+ * + * .state.Section leftSection = 2; + */ + public club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder getLeftSectionBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getLeftSectionFieldBuilder().getBuilder(); + } + /** + * 
+       * 左侧区段
+       *
+ * + * .state.Section leftSection = 2; + */ + public club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder getLeftSectionOrBuilder() { + if (leftSectionBuilder_ != null) { + return leftSectionBuilder_.getMessageOrBuilder(); + } else { + return leftSection_ == null ? + club.joylink.xiannccda.dto.protos.SectionProto.Section.getDefaultInstance() : leftSection_; + } + } + /** + * 
+       * 左侧区段
+       *
+ * + * .state.Section leftSection = 2; + */ + private com.google.protobuf.SingleFieldBuilderV3< + club.joylink.xiannccda.dto.protos.SectionProto.Section, club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder, club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder> + getLeftSectionFieldBuilder() { + if (leftSectionBuilder_ == null) { + leftSectionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + club.joylink.xiannccda.dto.protos.SectionProto.Section, club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder, club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder>( + getLeftSection(), + getParentForChildren(), + isClean()); + leftSection_ = null; + } + return leftSectionBuilder_; + } + + private club.joylink.xiannccda.dto.protos.SectionProto.Section rightSection_; + private com.google.protobuf.SingleFieldBuilderV3< + club.joylink.xiannccda.dto.protos.SectionProto.Section, club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder, club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder> rightSectionBuilder_; + /** + * 
+       * 右侧区段
+       *
+ * + * .state.Section rightSection = 3; + * @return Whether the rightSection field is set. + */ + public boolean hasRightSection() { + return ((bitField0_ & 0x00000004) != 0); + } + /** + * 
+       * 右侧区段
+       *
+ * + * .state.Section rightSection = 3; + * @return The rightSection. + */ + public club.joylink.xiannccda.dto.protos.SectionProto.Section getRightSection() { + if (rightSectionBuilder_ == null) { + return rightSection_ == null ? club.joylink.xiannccda.dto.protos.SectionProto.Section.getDefaultInstance() : rightSection_; + } else { + return rightSectionBuilder_.getMessage(); + } + } + /** + * 
+       * 右侧区段
+       *
+ * + * .state.Section rightSection = 3; + */ + public Builder setRightSection(club.joylink.xiannccda.dto.protos.SectionProto.Section value) { + if (rightSectionBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + rightSection_ = value; + } else { + rightSectionBuilder_.setMessage(value); + } + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * 
+       * 右侧区段
+       *
+ * + * .state.Section rightSection = 3; + */ + public Builder setRightSection( + club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder builderForValue) { + if (rightSectionBuilder_ == null) { + rightSection_ = builderForValue.build(); + } else { + rightSectionBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * 
+       * 右侧区段
+       *
+ * + * .state.Section rightSection = 3; + */ + public Builder mergeRightSection(club.joylink.xiannccda.dto.protos.SectionProto.Section value) { + if (rightSectionBuilder_ == null) { + if (((bitField0_ & 0x00000004) != 0) && + rightSection_ != null && + rightSection_ != club.joylink.xiannccda.dto.protos.SectionProto.Section.getDefaultInstance()) { + getRightSectionBuilder().mergeFrom(value); + } else { + rightSection_ = value; + } + } else { + rightSectionBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * 
+       * 右侧区段
+       *
+ * + * .state.Section rightSection = 3; + */ + public Builder clearRightSection() { + bitField0_ = (bitField0_ & ~0x00000004); + rightSection_ = null; + if (rightSectionBuilder_ != null) { + rightSectionBuilder_.dispose(); + rightSectionBuilder_ = null; + } + onChanged(); + return this; + } + /** + * 
+       * 右侧区段
+       *
+ * + * .state.Section rightSection = 3; + */ + public club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder getRightSectionBuilder() { + bitField0_ |= 0x00000004; + onChanged(); + return getRightSectionFieldBuilder().getBuilder(); + } + /** + * 
+       * 右侧区段
+       *
+ * + * .state.Section rightSection = 3; + */ + public club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder getRightSectionOrBuilder() { + if (rightSectionBuilder_ != null) { + return rightSectionBuilder_.getMessageOrBuilder(); + } else { + return rightSection_ == null ? + club.joylink.xiannccda.dto.protos.SectionProto.Section.getDefaultInstance() : rightSection_; + } + } + /** + * 
+       * 右侧区段
+       *
+ * + * .state.Section rightSection = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + club.joylink.xiannccda.dto.protos.SectionProto.Section, club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder, club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder> + getRightSectionFieldBuilder() { + if (rightSectionBuilder_ == null) { + rightSectionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + club.joylink.xiannccda.dto.protos.SectionProto.Section, club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder, club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder>( + getRightSection(), + getParentForChildren(), + isClean()); + rightSection_ = null; + } + return rightSectionBuilder_; + } + + private boolean axleCounter_ ; + /** + * 
+       * 是否计轴区段
+       *
+ * + * bool axleCounter = 4; + * @return The axleCounter. + */ + @java.lang.Override + public boolean getAxleCounter() { + return axleCounter_; + } + /** + * 
+       * 是否计轴区段
+       *
+ * + * bool axleCounter = 4; + * @param value The axleCounter to set. + * @return This builder for chaining. + */ + public Builder setAxleCounter(boolean value) { + + axleCounter_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * 
+       * 是否计轴区段
+       *
+ * + * bool axleCounter = 4; + * @return This builder for chaining. + */ + public Builder clearAxleCounter() { + bitField0_ = (bitField0_ & ~0x00000008); + axleCounter_ = false; + onChanged(); + return this; + } + + private java.util.List logicList_ = + java.util.Collections.emptyList(); + private void ensureLogicListIsMutable() { + if (!((bitField0_ & 0x00000010) != 0)) { + logicList_ = new java.util.ArrayList(logicList_); + bitField0_ |= 0x00000010; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + club.joylink.xiannccda.dto.protos.SectionProto.Section, club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder, club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder> logicListBuilder_; + + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public java.util.List getLogicListList() { + if (logicListBuilder_ == null) { + return java.util.Collections.unmodifiableList(logicList_); + } else { + return logicListBuilder_.getMessageList(); + } + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public int getLogicListCount() { + if (logicListBuilder_ == null) { + return logicList_.size(); + } else { + return logicListBuilder_.getCount(); + } + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public club.joylink.xiannccda.dto.protos.SectionProto.Section getLogicList(int index) { + if (logicListBuilder_ == null) { + return logicList_.get(index); + } else { + return logicListBuilder_.getMessage(index); + } + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public Builder setLogicList( + int index, club.joylink.xiannccda.dto.protos.SectionProto.Section value) { + if (logicListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureLogicListIsMutable(); + logicList_.set(index, value); + onChanged(); + } else { + logicListBuilder_.setMessage(index, value); + } + return this; + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public Builder setLogicList( + int index, club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder builderForValue) { + if (logicListBuilder_ == null) { + ensureLogicListIsMutable(); + logicList_.set(index, builderForValue.build()); + onChanged(); + } else { + logicListBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public Builder addLogicList(club.joylink.xiannccda.dto.protos.SectionProto.Section value) { + if (logicListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureLogicListIsMutable(); + logicList_.add(value); + onChanged(); + } else { + logicListBuilder_.addMessage(value); + } + return this; + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public Builder addLogicList( + int index, club.joylink.xiannccda.dto.protos.SectionProto.Section value) { + if (logicListBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureLogicListIsMutable(); + logicList_.add(index, value); + onChanged(); + } else { + logicListBuilder_.addMessage(index, value); + } + return this; + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public Builder addLogicList( + club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder builderForValue) { + if (logicListBuilder_ == null) { + ensureLogicListIsMutable(); + logicList_.add(builderForValue.build()); + onChanged(); + } else { + logicListBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public Builder addLogicList( + int index, club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder builderForValue) { + if (logicListBuilder_ == null) { + ensureLogicListIsMutable(); + logicList_.add(index, builderForValue.build()); + onChanged(); + } else { + logicListBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public Builder addAllLogicList( + java.lang.Iterable values) { + if (logicListBuilder_ == null) { + ensureLogicListIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, logicList_); + onChanged(); + } else { + logicListBuilder_.addAllMessages(values); + } + return this; + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public Builder clearLogicList() { + if (logicListBuilder_ == null) { + logicList_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010); + onChanged(); + } else { + logicListBuilder_.clear(); + } + return this; + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public Builder removeLogicList(int index) { + if (logicListBuilder_ == null) { + ensureLogicListIsMutable(); + logicList_.remove(index); + onChanged(); + } else { + logicListBuilder_.remove(index); + } + return this; + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder getLogicListBuilder( + int index) { + return getLogicListFieldBuilder().getBuilder(index); + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder getLogicListOrBuilder( + int index) { + if (logicListBuilder_ == null) { + return logicList_.get(index); } else { + return logicListBuilder_.getMessageOrBuilder(index); + } + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public java.util.List + getLogicListOrBuilderList() { + if (logicListBuilder_ != null) { + return logicListBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(logicList_); + } + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder addLogicListBuilder() { + return getLogicListFieldBuilder().addBuilder( + club.joylink.xiannccda.dto.protos.SectionProto.Section.getDefaultInstance()); + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder addLogicListBuilder( + int index) { + return getLogicListFieldBuilder().addBuilder( + index, club.joylink.xiannccda.dto.protos.SectionProto.Section.getDefaultInstance()); + } + /** + * 
+       * 关联区段
+       *
+ * + * repeated .state.Section logicList = 5; + */ + public java.util.List + getLogicListBuilderList() { + return getLogicListFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + club.joylink.xiannccda.dto.protos.SectionProto.Section, club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder, club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder> + getLogicListFieldBuilder() { + if (logicListBuilder_ == null) { + logicListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + club.joylink.xiannccda.dto.protos.SectionProto.Section, club.joylink.xiannccda.dto.protos.SectionProto.Section.Builder, club.joylink.xiannccda.dto.protos.SectionProto.SectionOrBuilder>( + logicList_, + ((bitField0_ & 0x00000010) != 0), + getParentForChildren(), + isClean()); + logicList_ = null; + } + return logicListBuilder_; + } + + private java.lang.Object leftKilometerCode_ = ""; + /** + * 
+       * 左侧公里标
+       *
+ * + * string leftKilometerCode = 6; + * @return The leftKilometerCode. + */ + public java.lang.String getLeftKilometerCode() { + java.lang.Object ref = leftKilometerCode_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + leftKilometerCode_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+       * 左侧公里标
+       *
+ * + * string leftKilometerCode = 6; + * @return The bytes for leftKilometerCode. + */ + public com.google.protobuf.ByteString + getLeftKilometerCodeBytes() { + java.lang.Object ref = leftKilometerCode_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + leftKilometerCode_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+       * 左侧公里标
+       *
+ * + * string leftKilometerCode = 6; + * @param value The leftKilometerCode to set. + * @return This builder for chaining. + */ + public Builder setLeftKilometerCode( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + leftKilometerCode_ = value; + bitField0_ |= 0x00000020; + onChanged(); + return this; + } + /** + * 
+       * 左侧公里标
+       *
+ * + * string leftKilometerCode = 6; + * @return This builder for chaining. + */ + public Builder clearLeftKilometerCode() { + leftKilometerCode_ = getDefaultInstance().getLeftKilometerCode(); + bitField0_ = (bitField0_ & ~0x00000020); + onChanged(); + return this; + } + /** + * 
+       * 左侧公里标
+       *
+ * + * string leftKilometerCode = 6; + * @param value The bytes for leftKilometerCode to set. + * @return This builder for chaining. + */ + public Builder setLeftKilometerCodeBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + leftKilometerCode_ = value; + bitField0_ |= 0x00000020; + onChanged(); + return this; + } + + private java.lang.Object rightKilometerCode_ = ""; + /** + * 
+       * 右侧公里标
+       *
+ * + * string rightKilometerCode = 7; + * @return The rightKilometerCode. + */ + public java.lang.String getRightKilometerCode() { + java.lang.Object ref = rightKilometerCode_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + rightKilometerCode_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+       * 右侧公里标
+       *
+ * + * string rightKilometerCode = 7; + * @return The bytes for rightKilometerCode. + */ + public com.google.protobuf.ByteString + getRightKilometerCodeBytes() { + java.lang.Object ref = rightKilometerCode_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + rightKilometerCode_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+       * 右侧公里标
+       *
+ * + * string rightKilometerCode = 7; + * @param value The rightKilometerCode to set. + * @return This builder for chaining. + */ + public Builder setRightKilometerCode( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + rightKilometerCode_ = value; + bitField0_ |= 0x00000040; + onChanged(); + return this; + } + /** + * 
+       * 右侧公里标
+       *
+ * + * string rightKilometerCode = 7; + * @return This builder for chaining. + */ + public Builder clearRightKilometerCode() { + rightKilometerCode_ = getDefaultInstance().getRightKilometerCode(); + bitField0_ = (bitField0_ & ~0x00000040); + onChanged(); + return this; + } + /** + * 
+       * 右侧公里标
+       *
+ * + * string rightKilometerCode = 7; + * @param value The bytes for rightKilometerCode to set. + * @return This builder for chaining. + */ + public Builder setRightKilometerCodeBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + rightKilometerCode_ = value; + bitField0_ |= 0x00000040; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:state.Section) + } + + // @@protoc_insertion_point(class_scope:state.Section) + private static final club.joylink.xiannccda.dto.protos.SectionProto.Section DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new club.joylink.xiannccda.dto.protos.SectionProto.Section(); + } + + public static club.joylink.xiannccda.dto.protos.SectionProto.Section getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser
+ PARSER = new com.google.protobuf.AbstractParser
() { + @java.lang.Override + public Section parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser
parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser
getParserForType() { + return PARSER; + } + + @java.lang.Override + public club.joylink.xiannccda.dto.protos.SectionProto.Section getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_state_Section_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_state_Section_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\024section_status.proto\022\005state\"\321\001\n\007Sectio" + + "n\022\014\n\004code\030\001 \001(\t\022#\n\013leftSection\030\002 \001(\0132\016.s" + + "tate.Section\022$\n\014rightSection\030\003 \001(\0132\016.sta" + + "te.Section\022\023\n\013axleCounter\030\004 \001(\010\022!\n\tlogic" + + "List\030\005 \003(\0132\016.state.Section\022\031\n\021leftKilome" + + "terCode\030\006 \001(\t\022\032\n\022rightKilometerCode\030\007 \001(" + + "\tB1\n!club.joylink.xiannccda.dto.protosB\014" + + "SectionProtob\006proto3" + }; + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_state_Section_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_state_Section_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_state_Section_descriptor, + new java.lang.String[] { "Code", "LeftSection", "RightSection", "AxleCounter", "LogicList", "LeftKilometerCode", "RightKilometerCode", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/src/main/java/club/joylink/xiannccda/dto/protos/TrainProto.java b/src/main/java/club/joylink/xiannccda/dto/protos/TrainProto.java index 33c6f20..0739862 100644 --- a/src/main/java/club/joylink/xiannccda/dto/protos/TrainProto.java +++ b/src/main/java/club/joylink/xiannccda/dto/protos/TrainProto.java @@ -225,12 +225,32 @@ public final class TrainProto { /** * 
      * 列车状态
+     *  int32 mode = 14;
      *
* - * int32 mode = 14; + * .state.TrainMode mode = 14; + * @return Whether the mode field is set. + */ + boolean hasMode(); + /** + * 
+     * 列车状态
+     *  int32 mode = 14;
+     *
+ * + * .state.TrainMode mode = 14; * @return The mode. */ - int getMode(); + club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode getMode(); + /** + * 
+     * 列车状态
+     *  int32 mode = 14;
+     *
+ * + * .state.TrainMode mode = 14; + */ + club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainModeOrBuilder getModeOrBuilder(); /** * 
@@ -758,18 +778,44 @@ public final class TrainProto {
     }
 
     public static final int MODE_FIELD_NUMBER = 14;
-    private int mode_ = 0;
+    private club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode mode_;
     /**
      * 
      * 列车状态
+     *  int32 mode = 14;
      * 

      *
-     * int32 mode = 14;
+     * .state.TrainMode mode = 14;
+     * @return Whether the mode field is set.
+     */
+    @java.lang.Override
+    public boolean hasMode() {
+      return mode_ != null;
+    }
+    /**
+     * 
+     * 列车状态
+     *  int32 mode = 14;
+     * 

+     *
+     * .state.TrainMode mode = 14;
      * @return The mode.
      */
     @java.lang.Override
-    public int getMode() {
-      return mode_;
+    public club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode getMode() {
+      return mode_ == null ? club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.getDefaultInstance() : mode_;
+    }
+    /**
+     * 
+     * 列车状态
+     *  int32 mode = 14;
+     * 

+     *
+     * .state.TrainMode mode = 14;
+     */
+    @java.lang.Override
+    public club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainModeOrBuilder getModeOrBuilder() {
+      return mode_ == null ? club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.getDefaultInstance() : mode_;
     }
 
     public static final int ARRIVETIME_FIELD_NUMBER = 15;
@@ -930,8 +976,8 @@ public final class TrainProto {
       if (otpTime_ != 0) {
         output.writeInt32(13, otpTime_);
       }
-      if (mode_ != 0) {
-        output.writeInt32(14, mode_);
+      if (mode_ != null) {
+        output.writeMessage(14, getMode());
       }
       if (arriveTime_ != 0L) {
         output.writeInt64(15, arriveTime_);
@@ -1009,9 +1055,9 @@ public final class TrainProto {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(13, otpTime_);
       }
-      if (mode_ != 0) {
+      if (mode_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(14, mode_);
+          .computeMessageSize(14, getMode());
       }
       if (arriveTime_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
@@ -1084,8 +1130,11 @@ public final class TrainProto {
           .equals(other.getDriverId())) return false;
       if (getOtpTime()
           != other.getOtpTime()) return false;
-      if (getMode()
-          != other.getMode()) return false;
+      if (hasMode() != other.hasMode()) return false;
+      if (hasMode()) {
+        if (!getMode()
+            .equals(other.getMode())) return false;
+      }
       if (getArriveTime()
           != other.getArriveTime()) return false;
       if (getDepartTime()
@@ -1140,8 +1189,10 @@ public final class TrainProto {
       hash = (53 * hash) + getDriverId().hashCode();
       hash = (37 * hash) + OTPTIME_FIELD_NUMBER;
       hash = (53 * hash) + getOtpTime();
-      hash = (37 * hash) + MODE_FIELD_NUMBER;
-      hash = (53 * hash) + getMode();
+      if (hasMode()) {
+        hash = (37 * hash) + MODE_FIELD_NUMBER;
+        hash = (53 * hash) + getMode().hashCode();
+      }
       hash = (37 * hash) + ARRIVETIME_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getArriveTime());
@@ -1313,7 +1364,11 @@ public final class TrainProto {
         rollingStock_ = 0;
         driverId_ = "";
         otpTime_ = 0;
-        mode_ = 0;
+        mode_ = null;
+        if (modeBuilder_ != null) {
+          modeBuilder_.dispose();
+          modeBuilder_ = null;
+        }
         arriveTime_ = 0L;
         departTime_ = 0L;
         speed_ = 0F;
@@ -1396,7 +1451,9 @@ public final class TrainProto {
           result.otpTime_ = otpTime_;
         }
         if (((from_bitField0_ & 0x00002000) != 0)) {
-          result.mode_ = mode_;
+          result.mode_ = modeBuilder_ == null
+              ? mode_
+              : modeBuilder_.build();
         }
         if (((from_bitField0_ & 0x00004000) != 0)) {
           result.arriveTime_ = arriveTime_;
@@ -1484,8 +1541,8 @@ public final class TrainProto {
         if (other.getOtpTime() != 0) {
           setOtpTime(other.getOtpTime());
         }
-        if (other.getMode() != 0) {
-          setMode(other.getMode());
+        if (other.hasMode()) {
+          mergeMode(other.getMode());
         }
         if (other.getArriveTime() != 0L) {
           setArriveTime(other.getArriveTime());
@@ -1601,11 +1658,13 @@ public final class TrainProto {
                 bitField0_ |= 0x00001000;
                 break;
               } // case 104
-              case 112: {
-                mode_ = input.readInt32();
+              case 114: {
+                input.readMessage(
+                    getModeFieldBuilder().getBuilder(),
+                    extensionRegistry);
                 bitField0_ |= 0x00002000;
                 break;
-              } // case 112
+              } // case 114
               case 120: {
                 arriveTime_ = input.readInt64();
                 bitField0_ |= 0x00004000;
@@ -2622,31 +2681,54 @@ public final class TrainProto {
         return this;
       }
 
-      private int mode_ ;
+      private club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode mode_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.Builder, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainModeOrBuilder> modeBuilder_;
       /**
        * 
        * 列车状态
+       *  int32 mode = 14;
        * 

        *
-       * int32 mode = 14;
-       * @return The mode.
+       * .state.TrainMode mode = 14;
+       * @return Whether the mode field is set.
        */
-      @java.lang.Override
-      public int getMode() {
-        return mode_;
+      public boolean hasMode() {
+        return ((bitField0_ & 0x00002000) != 0);
       }
       /**
        * 
        * 列车状态
+       *  int32 mode = 14;
        * 

        *
-       * int32 mode = 14;
-       * @param value The mode to set.
-       * @return This builder for chaining.
+       * .state.TrainMode mode = 14;
+       * @return The mode.
        */
-      public Builder setMode(int value) {
-
-        mode_ = value;
+      public club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode getMode() {
+        if (modeBuilder_ == null) {
+          return mode_ == null ? club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.getDefaultInstance() : mode_;
+        } else {
+          return modeBuilder_.getMessage();
+        }
+      }
+      /**
+       * 
+       * 列车状态
+       *  int32 mode = 14;
+       * 

+       *
+       * .state.TrainMode mode = 14;
+       */
+      public Builder setMode(club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode value) {
+        if (modeBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          mode_ = value;
+        } else {
+          modeBuilder_.setMessage(value);
+        }
         bitField0_ |= 0x00002000;
         onChanged();
         return this;
@@ -2654,17 +2736,114 @@ public final class TrainProto {
       /**
        * 
        * 列车状态
+       *  int32 mode = 14;
        * 

        *
-       * int32 mode = 14;
-       * @return This builder for chaining.
+       * .state.TrainMode mode = 14;
+       */
+      public Builder setMode(
+          club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.Builder builderForValue) {
+        if (modeBuilder_ == null) {
+          mode_ = builderForValue.build();
+        } else {
+          modeBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * 
+       * 列车状态
+       *  int32 mode = 14;
+       * 

+       *
+       * .state.TrainMode mode = 14;
+       */
+      public Builder mergeMode(club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode value) {
+        if (modeBuilder_ == null) {
+          if (((bitField0_ & 0x00002000) != 0) &&
+            mode_ != null &&
+            mode_ != club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.getDefaultInstance()) {
+            getModeBuilder().mergeFrom(value);
+          } else {
+            mode_ = value;
+          }
+        } else {
+          modeBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00002000;
+        onChanged();
+        return this;
+      }
+      /**
+       * 
+       * 列车状态
+       *  int32 mode = 14;
+       * 

+       *
+       * .state.TrainMode mode = 14;
        */
       public Builder clearMode() {
         bitField0_ = (bitField0_ & ~0x00002000);
-        mode_ = 0;
+        mode_ = null;
+        if (modeBuilder_ != null) {
+          modeBuilder_.dispose();
+          modeBuilder_ = null;
+        }
         onChanged();
         return this;
       }
+      /**
+       * 
+       * 列车状态
+       *  int32 mode = 14;
+       * 

+       *
+       * .state.TrainMode mode = 14;
+       */
+      public club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.Builder getModeBuilder() {
+        bitField0_ |= 0x00002000;
+        onChanged();
+        return getModeFieldBuilder().getBuilder();
+      }
+      /**
+       * 
+       * 列车状态
+       *  int32 mode = 14;
+       * 

+       *
+       * .state.TrainMode mode = 14;
+       */
+      public club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainModeOrBuilder getModeOrBuilder() {
+        if (modeBuilder_ != null) {
+          return modeBuilder_.getMessageOrBuilder();
+        } else {
+          return mode_ == null ?
+              club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.getDefaultInstance() : mode_;
+        }
+      }
+      /**
+       * 
+       * 列车状态
+       *  int32 mode = 14;
+       * 

+       *
+       * .state.TrainMode mode = 14;
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.Builder, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainModeOrBuilder> 
+          getModeFieldBuilder() {
+        if (modeBuilder_ == null) {
+          modeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.Builder, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainModeOrBuilder>(
+                  getMode(),
+                  getParentForChildren(),
+                  isClean());
+          mode_ = null;
+        }
+        return modeBuilder_;
+      }
 
       private long arriveTime_ ;
       /**
@@ -3639,10 +3818,20 @@ public final class TrainProto {
      *  列车标示号，全线唯一（若无法提供，缺省值为0）
      *
* - * int32 trainIndex = 6; + * string trainIndex = 6; * @return The trainIndex. */ - int getTrainIndex(); + java.lang.String getTrainIndex(); + /** + * 
+     *  列车标示号，全线唯一（若无法提供，缺省值为0）
+     *
+ * + * string trainIndex = 6; + * @return The bytes for trainIndex. + */ + com.google.protobuf.ByteString + getTrainIndexBytes(); /** * 
@@ -3683,6 +3872,7 @@ public final class TrainProto {
     private TrainRemove() {
       deviceType_ = 0;
       devName_ = "";
+      trainIndex_ = "";
       groupId_ = "";
     }
 
@@ -3839,18 +4029,50 @@ public final class TrainProto {
     }
 
     public static final int TRAININDEX_FIELD_NUMBER = 6;
-    private int trainIndex_ = 0;
+    @SuppressWarnings("serial")
+    private volatile java.lang.Object trainIndex_ = "";
     /**
      * 
      *  列车标示号，全线唯一（若无法提供，缺省值为0）
      * 

      *
-     * int32 trainIndex = 6;
+     * string trainIndex = 6;
      * @return The trainIndex.
      */
     @java.lang.Override
-    public int getTrainIndex() {
-      return trainIndex_;
+    public java.lang.String getTrainIndex() {
+      java.lang.Object ref = trainIndex_;
+      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();
+        trainIndex_ = s;
+        return s;
+      }
+    }
+    /**
+     * 
+     *  列车标示号，全线唯一（若无法提供，缺省值为0）
+     * 

+     *
+     * string trainIndex = 6;
+     * @return The bytes for trainIndex.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getTrainIndexBytes() {
+      java.lang.Object ref = trainIndex_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        trainIndex_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
     public static final int GROUPID_FIELD_NUMBER = 7;
@@ -3929,8 +4151,8 @@ public final class TrainProto {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(devName_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 5, devName_);
       }
-      if (trainIndex_ != 0) {
-        output.writeInt32(6, trainIndex_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(trainIndex_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 6, trainIndex_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(groupId_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 7, groupId_);
@@ -3963,9 +4185,8 @@ public final class TrainProto {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(devName_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, devName_);
       }
-      if (trainIndex_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, trainIndex_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(trainIndex_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, trainIndex_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(groupId_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, groupId_);
@@ -3997,8 +4218,8 @@ public final class TrainProto {
       if (deviceType_ != other.deviceType_) return false;
       if (!getDevName()
           .equals(other.getDevName())) return false;
-      if (getTrainIndex()
-          != other.getTrainIndex()) return false;
+      if (!getTrainIndex()
+          .equals(other.getTrainIndex())) return false;
       if (!getGroupId()
           .equals(other.getGroupId())) return false;
       if (!getUnknownFields().equals(other.getUnknownFields())) return false;
@@ -4025,7 +4246,7 @@ public final class TrainProto {
       hash = (37 * hash) + DEVNAME_FIELD_NUMBER;
       hash = (53 * hash) + getDevName().hashCode();
       hash = (37 * hash) + TRAININDEX_FIELD_NUMBER;
-      hash = (53 * hash) + getTrainIndex();
+      hash = (53 * hash) + getTrainIndex().hashCode();
       hash = (37 * hash) + GROUPID_FIELD_NUMBER;
       hash = (53 * hash) + getGroupId().hashCode();
       hash = (29 * hash) + getUnknownFields().hashCode();
@@ -4172,7 +4393,7 @@ public final class TrainProto {
         }
         deviceType_ = 0;
         devName_ = "";
-        trainIndex_ = 0;
+        trainIndex_ = "";
         groupId_ = "";
         return this;
       }
@@ -4261,8 +4482,10 @@ public final class TrainProto {
           bitField0_ |= 0x00000010;
           onChanged();
         }
-        if (other.getTrainIndex() != 0) {
-          setTrainIndex(other.getTrainIndex());
+        if (!other.getTrainIndex().isEmpty()) {
+          trainIndex_ = other.trainIndex_;
+          bitField0_ |= 0x00000020;
+          onChanged();
         }
         if (!other.getGroupId().isEmpty()) {
           groupId_ = other.groupId_;
@@ -4322,11 +4545,11 @@ public final class TrainProto {
                 bitField0_ |= 0x00000010;
                 break;
               } // case 42
-              case 48: {
-                trainIndex_ = input.readInt32();
+              case 50: {
+                trainIndex_ = input.readStringRequireUtf8();
                 bitField0_ |= 0x00000020;
                 break;
-              } // case 48
+              } // case 50
               case 58: {
                 groupId_ = input.readStringRequireUtf8();
                 bitField0_ |= 0x00000040;
@@ -4734,30 +4957,60 @@ public final class TrainProto {
         return this;
       }
 
-      private int trainIndex_ ;
+      private java.lang.Object trainIndex_ = "";
       /**
        * 
        *  列车标示号，全线唯一（若无法提供，缺省值为0）
        * 

        *
-       * int32 trainIndex = 6;
+       * string trainIndex = 6;
        * @return The trainIndex.
        */
-      @java.lang.Override
-      public int getTrainIndex() {
-        return trainIndex_;
+      public java.lang.String getTrainIndex() {
+        java.lang.Object ref = trainIndex_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          trainIndex_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
        * 
        *  列车标示号，全线唯一（若无法提供，缺省值为0）
        * 

        *
-       * int32 trainIndex = 6;
+       * string trainIndex = 6;
+       * @return The bytes for trainIndex.
+       */
+      public com.google.protobuf.ByteString
+          getTrainIndexBytes() {
+        java.lang.Object ref = trainIndex_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          trainIndex_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * 
+       *  列车标示号，全线唯一（若无法提供，缺省值为0）
+       * 

+       *
+       * string trainIndex = 6;
        * @param value The trainIndex to set.
        * @return This builder for chaining.
        */
-      public Builder setTrainIndex(int value) {
-
+      public Builder setTrainIndex(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
         trainIndex_ = value;
         bitField0_ |= 0x00000020;
         onChanged();
@@ -4768,12 +5021,30 @@ public final class TrainProto {
        *  列车标示号，全线唯一（若无法提供，缺省值为0）
        *
* - * int32 trainIndex = 6; + * string trainIndex = 6; * @return This builder for chaining. */ public Builder clearTrainIndex() { + trainIndex_ = getDefaultInstance().getTrainIndex(); bitField0_ = (bitField0_ & ~0x00000020); - trainIndex_ = 0; + onChanged(); + return this; + } + /** + * 
+       *  列车标示号，全线唯一（若无法提供，缺省值为0）
+       *
+ * + * string trainIndex = 6; + * @param value The bytes for trainIndex to set. + * @return This builder for chaining. + */ + public Builder setTrainIndexBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + trainIndex_ = value; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -8607,36 +8878,36 @@ public final class TrainProto { static { java.lang.String[] descriptorData = { "\n\013train.proto\022\005train\032\023device_status.prot" + - "o\"\231\003\n\tTrainInfo\022\016\n\006lineId\030\001 \001(\005\022\r\n\005rtuId" + + "o\"\253\003\n\tTrainInfo\022\016\n\006lineId\030\001 \001(\005\022\r\n\005rtuId" + "\030\002 \001(\005\022 \n\006window\030\003 \001(\0132\020.train.NccWindow" + "\022\"\n\007devType\030\004 \001(\0162\021.state.DeviceType\022\017\n\007" + "devName\030\005 \001(\t\022\022\n\ntrainIndex\030\006 \001(\t\022\017\n\007gro" + "upId\030\007 \001(\t\022\017\n\007trainId\030\010 \001(\t\022\020\n\010globalId\030" + "\t \001(\t\022\025\n\rdestinationId\030\n \001(\005\022\024\n\014rollingS" + "tock\030\013 \001(\005\022\020\n\010driverId\030\014 \001(\t\022\017\n\007otpTime\030" + - "\r \001(\005\022\014\n\004mode\030\016 \001(\005\022\022\n\narriveTime\030\017 \001(\003\022" + - "\022\n\ndepartTime\030\020 \001(\003\022\r\n\005speed\030\021 \001(\002\022\014\n\004sh" + - "ow\030\022 \001(\010\022\014\n\004type\030\023 \001(\010\022\017\n\007routeId\030\024 \001(\005\022" + - "\014\n\004rate\030\025 \001(\005\"4\n\tNccWindow\022\021\n\tnccWindow\030" + - "\001 \001(\005\022\024\n\014nccWinOffset\030\002 \001(\005\"\253\001\n\013TrainRem" + - "ove\022\016\n\006lineId\030\001 \001(\005\022\r\n\005rtuId\030\002 \001(\005\022 \n\006wi" + - "ndow\030\003 \001(\0132\020.train.NccWindow\022%\n\ndeviceTy" + - "pe\030\004 \001(\0162\021.state.DeviceType\022\017\n\007devName\030\005" + - " \001(\t\022\022\n\ntrainIndex\030\006 \001(\005\022\017\n\007groupId\030\007 \001(" + - "\t\"\343\001\n\nTrainBlock\022\016\n\006lineId\030\001 \001(\005\022\017\n\007grou" + - "pId\030\002 \001(\t\022\017\n\007trainId\030\003 \001(\t\022\021\n\tdirection\030" + - "\004 \001(\005\022\031\n\021stationIDInUpSide\030\005 \001(\005\022\033\n\023stat" + - "ionIDInDownSide\030\006 \001(\005\022\r\n\005rtuId\030\007 \001(\005\022%\n\n" + - "deviceType\030\010 \001(\0162\021.state.DeviceType\022\017\n\007D" + - "evName\030\t \001(\t\022\021\n\tblockFlag\030\n \001(\005\"\372\001\n\013Trai" + - "nRecord\022\016\n\006lineId\030\001 \001(\005\022\017\n\007trainId\030\002 \001(\t" + - "\022\020\n\010globalId\030\003 \001(\t\022\022\n\nlocalSubId\030\004 \001(\005\022\017" + - "\n\007groupId\030\005 \001(\t\022\025\n\rdestinationId\030\006 \001(\005\022\021" + - "\n\ttrainType\030\007 \001(\005\022\013\n\003dir\030\010 \001(\005\022\021\n\tstatio" + - "nId\030\t \001(\005\022\016\n\006sideId\030\n \001(\005\022\021\n\ttrackName\030\013" + - " \001(\t\022\022\n\nrecordType\030\014 \001(\010\022\022\n\nrecordTime\030\r" + - " \001(\003B/\n!club.joylink.xiannccda.dto.proto" + - "sB\nTrainProtob\006proto3" + "\r \001(\005\022\036\n\004mode\030\016 \001(\0132\020.state.TrainMode\022\022\n" + + "\narriveTime\030\017 \001(\003\022\022\n\ndepartTime\030\020 \001(\003\022\r\n" + + "\005speed\030\021 \001(\002\022\014\n\004show\030\022 \001(\010\022\014\n\004type\030\023 \001(\010" + + "\022\017\n\007routeId\030\024 \001(\005\022\014\n\004rate\030\025 \001(\005\"4\n\tNccWi" + + "ndow\022\021\n\tnccWindow\030\001 \001(\005\022\024\n\014nccWinOffset\030" + + "\002 \001(\005\"\253\001\n\013TrainRemove\022\016\n\006lineId\030\001 \001(\005\022\r\n" + + "\005rtuId\030\002 \001(\005\022 \n\006window\030\003 \001(\0132\020.train.Ncc" + + "Window\022%\n\ndeviceType\030\004 \001(\0162\021.state.Devic" + + "eType\022\017\n\007devName\030\005 \001(\t\022\022\n\ntrainIndex\030\006 \001" + + "(\t\022\017\n\007groupId\030\007 \001(\t\"\343\001\n\nTrainBlock\022\016\n\006li" + + "neId\030\001 \001(\005\022\017\n\007groupId\030\002 \001(\t\022\017\n\007trainId\030\003" + + " \001(\t\022\021\n\tdirection\030\004 \001(\005\022\031\n\021stationIDInUp" + + "Side\030\005 \001(\005\022\033\n\023stationIDInDownSide\030\006 \001(\005\022" + + "\r\n\005rtuId\030\007 \001(\005\022%\n\ndeviceType\030\010 \001(\0162\021.sta" + + "te.DeviceType\022\017\n\007DevName\030\t \001(\t\022\021\n\tblockF" + + "lag\030\n \001(\005\"\372\001\n\013TrainRecord\022\016\n\006lineId\030\001 \001(" + + "\005\022\017\n\007trainId\030\002 \001(\t\022\020\n\010globalId\030\003 \001(\t\022\022\n\n" + + "localSubId\030\004 \001(\005\022\017\n\007groupId\030\005 \001(\t\022\025\n\rdes" + + "tinationId\030\006 \001(\005\022\021\n\ttrainType\030\007 \001(\005\022\013\n\003d" + + "ir\030\010 \001(\005\022\021\n\tstationId\030\t \001(\005\022\016\n\006sideId\030\n " + + "\001(\005\022\021\n\ttrackName\030\013 \001(\t\022\022\n\nrecordType\030\014 \001" + + "(\010\022\022\n\nrecordTime\030\r \001(\003B/\n!club.joylink.x" + + "iannccda.dto.protosB\nTrainProtob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, diff --git a/src/main/java/club/joylink/xiannccda/dto/protos/WsMessageProto.java b/src/main/java/club/joylink/xiannccda/dto/protos/WsMessageProto.java index e227ca8..586ea87 100644 --- a/src/main/java/club/joylink/xiannccda/dto/protos/WsMessageProto.java +++ b/src/main/java/club/joylink/xiannccda/dto/protos/WsMessageProto.java @@ -505,87 +505,53 @@ public final class WsMessageProto { /** * 
      *列车模式
-     *
- * - * repeated .state.TrainMode trainMode = 12; - */ - java.util.List - getTrainModeList(); - /** - * 
-     *列车模式
-     *
- * - * repeated .state.TrainMode trainMode = 12; - */ - club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode getTrainMode(int index); - /** - * 
-     *列车模式
-     *
- * - * repeated .state.TrainMode trainMode = 12; - */ - int getTrainModeCount(); - /** - * 
-     *列车模式
-     *
- * - * repeated .state.TrainMode trainMode = 12; - */ - java.util.List - getTrainModeOrBuilderList(); - /** - * 
-     *列车模式
-     *
- * - * repeated .state.TrainMode trainMode = 12; - */ - club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainModeOrBuilder getTrainModeOrBuilder( - int index); - - /** - * 
+     *  repeated state.TrainMode trainMode = 12;
      *信息源网络状态消息
      *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ java.util.List getNetWorkList(); /** * 
+     *列车模式
+     *  repeated state.TrainMode trainMode = 12;
      *信息源网络状态消息
      *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork getNetWork(int index); /** * 
+     *列车模式
+     *  repeated state.TrainMode trainMode = 12;
      *信息源网络状态消息
      *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ int getNetWorkCount(); /** * 
+     *列车模式
+     *  repeated state.TrainMode trainMode = 12;
      *信息源网络状态消息
      *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ java.util.List getNetWorkOrBuilderList(); /** * 
+     *列车模式
+     *  repeated state.TrainMode trainMode = 12;
      *信息源网络状态消息
      *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetworkOrBuilder getNetWorkOrBuilder( int index); @@ -595,7 +561,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ java.util.List getTrainList(); @@ -604,7 +570,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo getTrain(int index); /** @@ -612,7 +578,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ int getTrainCount(); /** @@ -620,7 +586,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ java.util.List getTrainOrBuilderList(); @@ -629,7 +595,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ club.joylink.xiannccda.dto.protos.TrainProto.TrainInfoOrBuilder getTrainOrBuilder( int index); @@ -658,7 +624,6 @@ public final class WsMessageProto { waterProofDoor_ = java.util.Collections.emptyList(); workArea_ = java.util.Collections.emptyList(); gama_ = java.util.Collections.emptyList(); - trainMode_ = java.util.Collections.emptyList(); netWork_ = java.util.Collections.emptyList(); train_ = java.util.Collections.emptyList(); } @@ -1354,76 +1319,17 @@ public final class WsMessageProto { return gama_.get(index); } - public static final int TRAINMODE_FIELD_NUMBER = 12; - @SuppressWarnings("serial") - private java.util.List trainMode_; - /** - * 
-     *列车模式
-     *
- * - * repeated .state.TrainMode trainMode = 12; - */ - @java.lang.Override - public java.util.List getTrainModeList() { - return trainMode_; - } - /** - * 
-     *列车模式
-     *
- * - * repeated .state.TrainMode trainMode = 12; - */ - @java.lang.Override - public java.util.List - getTrainModeOrBuilderList() { - return trainMode_; - } - /** - * 
-     *列车模式
-     *
- * - * repeated .state.TrainMode trainMode = 12; - */ - @java.lang.Override - public int getTrainModeCount() { - return trainMode_.size(); - } - /** - * 
-     *列车模式
-     *
- * - * repeated .state.TrainMode trainMode = 12; - */ - @java.lang.Override - public club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode getTrainMode(int index) { - return trainMode_.get(index); - } - /** - * 
-     *列车模式
-     *
- * - * repeated .state.TrainMode trainMode = 12; - */ - @java.lang.Override - public club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainModeOrBuilder getTrainModeOrBuilder( - int index) { - return trainMode_.get(index); - } - - public static final int NETWORK_FIELD_NUMBER = 13; + public static final int NETWORK_FIELD_NUMBER = 12; @SuppressWarnings("serial") private java.util.List netWork_; /** * 
+     *列车模式
+     *  repeated state.TrainMode trainMode = 12;
      *信息源网络状态消息
      *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ @java.lang.Override public java.util.List getNetWorkList() { @@ -1431,10 +1337,12 @@ public final class WsMessageProto { } /** * 
+     *列车模式
+     *  repeated state.TrainMode trainMode = 12;
      *信息源网络状态消息
      *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ @java.lang.Override public java.util.List @@ -1443,10 +1351,12 @@ public final class WsMessageProto { } /** * 
+     *列车模式
+     *  repeated state.TrainMode trainMode = 12;
      *信息源网络状态消息
      *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ @java.lang.Override public int getNetWorkCount() { @@ -1454,10 +1364,12 @@ public final class WsMessageProto { } /** * 
+     *列车模式
+     *  repeated state.TrainMode trainMode = 12;
      *信息源网络状态消息
      *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ @java.lang.Override public club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork getNetWork(int index) { @@ -1465,10 +1377,12 @@ public final class WsMessageProto { } /** * 
+     *列车模式
+     *  repeated state.TrainMode trainMode = 12;
      *信息源网络状态消息
      *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ @java.lang.Override public club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetworkOrBuilder getNetWorkOrBuilder( @@ -1476,7 +1390,7 @@ public final class WsMessageProto { return netWork_.get(index); } - public static final int TRAIN_FIELD_NUMBER = 14; + public static final int TRAIN_FIELD_NUMBER = 13; @SuppressWarnings("serial") private java.util.List train_; /** @@ -1484,7 +1398,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ @java.lang.Override public java.util.List getTrainList() { @@ -1495,7 +1409,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ @java.lang.Override public java.util.List @@ -1507,7 +1421,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ @java.lang.Override public int getTrainCount() { @@ -1518,7 +1432,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ @java.lang.Override public club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo getTrain(int index) { @@ -1529,7 +1443,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ @java.lang.Override public club.joylink.xiannccda.dto.protos.TrainProto.TrainInfoOrBuilder getTrainOrBuilder( @@ -1584,14 +1498,11 @@ public final class WsMessageProto { for (int i = 0; i < gama_.size(); i++) { output.writeMessage(11, gama_.get(i)); } - for (int i = 0; i < trainMode_.size(); i++) { - output.writeMessage(12, trainMode_.get(i)); - } for (int i = 0; i < netWork_.size(); i++) { - output.writeMessage(13, netWork_.get(i)); + output.writeMessage(12, netWork_.get(i)); } for (int i = 0; i < train_.size(); i++) { - output.writeMessage(14, train_.get(i)); + output.writeMessage(13, train_.get(i)); } getUnknownFields().writeTo(output); } @@ -1646,17 +1557,13 @@ public final class WsMessageProto { size += com.google.protobuf.CodedOutputStream .computeMessageSize(11, gama_.get(i)); } - for (int i = 0; i < trainMode_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, trainMode_.get(i)); - } for (int i = 0; i < netWork_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, netWork_.get(i)); + .computeMessageSize(12, netWork_.get(i)); } for (int i = 0; i < train_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(14, train_.get(i)); + .computeMessageSize(13, train_.get(i)); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -1695,8 +1602,6 @@ public final class WsMessageProto { .equals(other.getWorkAreaList())) return false; if (!getGamaList() .equals(other.getGamaList())) return false; - if (!getTrainModeList() - .equals(other.getTrainModeList())) return false; if (!getNetWorkList() .equals(other.getNetWorkList())) return false; if (!getTrainList() @@ -1756,10 +1661,6 @@ public final class WsMessageProto { hash = (37 * hash) + GAMA_FIELD_NUMBER; hash = (53 * hash) + getGamaList().hashCode(); } - if (getTrainModeCount() > 0) { - hash = (37 * hash) + TRAINMODE_FIELD_NUMBER; - hash = (53 * hash) + getTrainModeList().hashCode(); - } if (getNetWorkCount() > 0) { hash = (37 * hash) + NETWORK_FIELD_NUMBER; hash = (53 * hash) + getNetWorkList().hashCode(); @@ -1976,27 +1877,20 @@ public final class WsMessageProto { gamaBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000400); - if (trainModeBuilder_ == null) { - trainMode_ = java.util.Collections.emptyList(); - } else { - trainMode_ = null; - trainModeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000800); if (netWorkBuilder_ == null) { netWork_ = java.util.Collections.emptyList(); } else { netWork_ = null; netWorkBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00001000); + bitField0_ = (bitField0_ & ~0x00000800); if (trainBuilder_ == null) { train_ = java.util.Collections.emptyList(); } else { train_ = null; trainBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00002000); + bitField0_ = (bitField0_ & ~0x00001000); return this; } @@ -2129,28 +2023,19 @@ public final class WsMessageProto { } else { result.gama_ = gamaBuilder_.build(); } - if (trainModeBuilder_ == null) { - if (((bitField0_ & 0x00000800) != 0)) { - trainMode_ = java.util.Collections.unmodifiableList(trainMode_); - bitField0_ = (bitField0_ & ~0x00000800); - } - result.trainMode_ = trainMode_; - } else { - result.trainMode_ = trainModeBuilder_.build(); - } if (netWorkBuilder_ == null) { - if (((bitField0_ & 0x00001000) != 0)) { + if (((bitField0_ & 0x00000800) != 0)) { netWork_ = java.util.Collections.unmodifiableList(netWork_); - bitField0_ = (bitField0_ & ~0x00001000); + bitField0_ = (bitField0_ & ~0x00000800); } result.netWork_ = netWork_; } else { result.netWork_ = netWorkBuilder_.build(); } if (trainBuilder_ == null) { - if (((bitField0_ & 0x00002000) != 0)) { + if (((bitField0_ & 0x00001000) != 0)) { train_ = java.util.Collections.unmodifiableList(train_); - bitField0_ = (bitField0_ & ~0x00002000); + bitField0_ = (bitField0_ & ~0x00001000); } result.train_ = train_; } else { @@ -2460,37 +2345,11 @@ public final class WsMessageProto { } } } - if (trainModeBuilder_ == null) { - if (!other.trainMode_.isEmpty()) { - if (trainMode_.isEmpty()) { - trainMode_ = other.trainMode_; - bitField0_ = (bitField0_ & ~0x00000800); - } else { - ensureTrainModeIsMutable(); - trainMode_.addAll(other.trainMode_); - } - onChanged(); - } - } else { - if (!other.trainMode_.isEmpty()) { - if (trainModeBuilder_.isEmpty()) { - trainModeBuilder_.dispose(); - trainModeBuilder_ = null; - trainMode_ = other.trainMode_; - bitField0_ = (bitField0_ & ~0x00000800); - trainModeBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getTrainModeFieldBuilder() : null; - } else { - trainModeBuilder_.addAllMessages(other.trainMode_); - } - } - } if (netWorkBuilder_ == null) { if (!other.netWork_.isEmpty()) { if (netWork_.isEmpty()) { netWork_ = other.netWork_; - bitField0_ = (bitField0_ & ~0x00001000); + bitField0_ = (bitField0_ & ~0x00000800); } else { ensureNetWorkIsMutable(); netWork_.addAll(other.netWork_); @@ -2503,7 +2362,7 @@ public final class WsMessageProto { netWorkBuilder_.dispose(); netWorkBuilder_ = null; netWork_ = other.netWork_; - bitField0_ = (bitField0_ & ~0x00001000); + bitField0_ = (bitField0_ & ~0x00000800); netWorkBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getNetWorkFieldBuilder() : null; @@ -2516,7 +2375,7 @@ public final class WsMessageProto { if (!other.train_.isEmpty()) { if (train_.isEmpty()) { train_ = other.train_; - bitField0_ = (bitField0_ & ~0x00002000); + bitField0_ = (bitField0_ & ~0x00001000); } else { ensureTrainIsMutable(); train_.addAll(other.train_); @@ -2529,7 +2388,7 @@ public final class WsMessageProto { trainBuilder_.dispose(); trainBuilder_ = null; train_ = other.train_; - bitField0_ = (bitField0_ & ~0x00002000); + bitField0_ = (bitField0_ & ~0x00001000); trainBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getTrainFieldBuilder() : null; @@ -2708,19 +2567,6 @@ public final class WsMessageProto { break; } // case 90 case 98: { - club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode m = - input.readMessage( - club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.parser(), - extensionRegistry); - if (trainModeBuilder_ == null) { - ensureTrainModeIsMutable(); - trainMode_.add(m); - } else { - trainModeBuilder_.addMessage(m); - } - break; - } // case 98 - case 106: { club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork m = input.readMessage( club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork.parser(), @@ -2732,8 +2578,8 @@ public final class WsMessageProto { netWorkBuilder_.addMessage(m); } break; - } // case 106 - case 114: { + } // case 98 + case 106: { club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo m = input.readMessage( club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.parser(), @@ -2745,7 +2591,7 @@ public final class WsMessageProto { trainBuilder_.addMessage(m); } break; - } // case 114 + } // case 106 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -6195,324 +6041,12 @@ public final class WsMessageProto { return gamaBuilder_; } - private java.util.List trainMode_ = - java.util.Collections.emptyList(); - private void ensureTrainModeIsMutable() { - if (!((bitField0_ & 0x00000800) != 0)) { - trainMode_ = new java.util.ArrayList(trainMode_); - bitField0_ |= 0x00000800; - } - } - - private com.google.protobuf.RepeatedFieldBuilderV3< - club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.Builder, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainModeOrBuilder> trainModeBuilder_; - - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public java.util.List getTrainModeList() { - if (trainModeBuilder_ == null) { - return java.util.Collections.unmodifiableList(trainMode_); - } else { - return trainModeBuilder_.getMessageList(); - } - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public int getTrainModeCount() { - if (trainModeBuilder_ == null) { - return trainMode_.size(); - } else { - return trainModeBuilder_.getCount(); - } - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode getTrainMode(int index) { - if (trainModeBuilder_ == null) { - return trainMode_.get(index); - } else { - return trainModeBuilder_.getMessage(index); - } - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public Builder setTrainMode( - int index, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode value) { - if (trainModeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTrainModeIsMutable(); - trainMode_.set(index, value); - onChanged(); - } else { - trainModeBuilder_.setMessage(index, value); - } - return this; - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public Builder setTrainMode( - int index, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.Builder builderForValue) { - if (trainModeBuilder_ == null) { - ensureTrainModeIsMutable(); - trainMode_.set(index, builderForValue.build()); - onChanged(); - } else { - trainModeBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public Builder addTrainMode(club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode value) { - if (trainModeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTrainModeIsMutable(); - trainMode_.add(value); - onChanged(); - } else { - trainModeBuilder_.addMessage(value); - } - return this; - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public Builder addTrainMode( - int index, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode value) { - if (trainModeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTrainModeIsMutable(); - trainMode_.add(index, value); - onChanged(); - } else { - trainModeBuilder_.addMessage(index, value); - } - return this; - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public Builder addTrainMode( - club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.Builder builderForValue) { - if (trainModeBuilder_ == null) { - ensureTrainModeIsMutable(); - trainMode_.add(builderForValue.build()); - onChanged(); - } else { - trainModeBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public Builder addTrainMode( - int index, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.Builder builderForValue) { - if (trainModeBuilder_ == null) { - ensureTrainModeIsMutable(); - trainMode_.add(index, builderForValue.build()); - onChanged(); - } else { - trainModeBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public Builder addAllTrainMode( - java.lang.Iterable values) { - if (trainModeBuilder_ == null) { - ensureTrainModeIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, trainMode_); - onChanged(); - } else { - trainModeBuilder_.addAllMessages(values); - } - return this; - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public Builder clearTrainMode() { - if (trainModeBuilder_ == null) { - trainMode_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000800); - onChanged(); - } else { - trainModeBuilder_.clear(); - } - return this; - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public Builder removeTrainMode(int index) { - if (trainModeBuilder_ == null) { - ensureTrainModeIsMutable(); - trainMode_.remove(index); - onChanged(); - } else { - trainModeBuilder_.remove(index); - } - return this; - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.Builder getTrainModeBuilder( - int index) { - return getTrainModeFieldBuilder().getBuilder(index); - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainModeOrBuilder getTrainModeOrBuilder( - int index) { - if (trainModeBuilder_ == null) { - return trainMode_.get(index); } else { - return trainModeBuilder_.getMessageOrBuilder(index); - } - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public java.util.List - getTrainModeOrBuilderList() { - if (trainModeBuilder_ != null) { - return trainModeBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(trainMode_); - } - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.Builder addTrainModeBuilder() { - return getTrainModeFieldBuilder().addBuilder( - club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.getDefaultInstance()); - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.Builder addTrainModeBuilder( - int index) { - return getTrainModeFieldBuilder().addBuilder( - index, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.getDefaultInstance()); - } - /** - * 
-       *列车模式
-       *
- * - * repeated .state.TrainMode trainMode = 12; - */ - public java.util.List - getTrainModeBuilderList() { - return getTrainModeFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.Builder, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainModeOrBuilder> - getTrainModeFieldBuilder() { - if (trainModeBuilder_ == null) { - trainModeBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainMode.Builder, club.joylink.xiannccda.dto.protos.DeviceStatusProto.TrainModeOrBuilder>( - trainMode_, - ((bitField0_ & 0x00000800) != 0), - getParentForChildren(), - isClean()); - trainMode_ = null; - } - return trainModeBuilder_; - } - private java.util.List netWork_ = java.util.Collections.emptyList(); private void ensureNetWorkIsMutable() { - if (!((bitField0_ & 0x00001000) != 0)) { + if (!((bitField0_ & 0x00000800) != 0)) { netWork_ = new java.util.ArrayList(netWork_); - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; } } @@ -6521,10 +6055,12 @@ public final class WsMessageProto { /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public java.util.List getNetWorkList() { if (netWorkBuilder_ == null) { @@ -6535,10 +6071,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public int getNetWorkCount() { if (netWorkBuilder_ == null) { @@ -6549,10 +6087,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork getNetWork(int index) { if (netWorkBuilder_ == null) { @@ -6563,10 +6103,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public Builder setNetWork( int index, club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork value) { @@ -6584,10 +6126,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public Builder setNetWork( int index, club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork.Builder builderForValue) { @@ -6602,10 +6146,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public Builder addNetWork(club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork value) { if (netWorkBuilder_ == null) { @@ -6622,10 +6168,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public Builder addNetWork( int index, club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork value) { @@ -6643,10 +6191,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public Builder addNetWork( club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork.Builder builderForValue) { @@ -6661,10 +6211,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public Builder addNetWork( int index, club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork.Builder builderForValue) { @@ -6679,10 +6231,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public Builder addAllNetWork( java.lang.Iterable values) { @@ -6698,15 +6252,17 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public Builder clearNetWork() { if (netWorkBuilder_ == null) { netWork_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00001000); + bitField0_ = (bitField0_ & ~0x00000800); onChanged(); } else { netWorkBuilder_.clear(); @@ -6715,10 +6271,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public Builder removeNetWork(int index) { if (netWorkBuilder_ == null) { @@ -6732,10 +6290,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork.Builder getNetWorkBuilder( int index) { @@ -6743,10 +6303,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetworkOrBuilder getNetWorkOrBuilder( int index) { @@ -6757,10 +6319,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public java.util.List getNetWorkOrBuilderList() { @@ -6772,10 +6336,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork.Builder addNetWorkBuilder() { return getNetWorkFieldBuilder().addBuilder( @@ -6783,10 +6349,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork.Builder addNetWorkBuilder( int index) { @@ -6795,10 +6363,12 @@ public final class WsMessageProto { } /** * 
+       *列车模式
+       *  repeated state.TrainMode trainMode = 12;
        *信息源网络状态消息
        *
* - * repeated .state.OccNccFepNetwork netWork = 13; + * repeated .state.OccNccFepNetwork netWork = 12; */ public java.util.List getNetWorkBuilderList() { @@ -6811,7 +6381,7 @@ public final class WsMessageProto { netWorkBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork, club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetwork.Builder, club.joylink.xiannccda.dto.protos.DeviceStatusProto.OccNccFepNetworkOrBuilder>( netWork_, - ((bitField0_ & 0x00001000) != 0), + ((bitField0_ & 0x00000800) != 0), getParentForChildren(), isClean()); netWork_ = null; @@ -6822,9 +6392,9 @@ public final class WsMessageProto { private java.util.List train_ = java.util.Collections.emptyList(); private void ensureTrainIsMutable() { - if (!((bitField0_ & 0x00002000) != 0)) { + if (!((bitField0_ & 0x00001000) != 0)) { train_ = new java.util.ArrayList(train_); - bitField0_ |= 0x00002000; + bitField0_ |= 0x00001000; } } @@ -6836,7 +6406,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public java.util.List getTrainList() { if (trainBuilder_ == null) { @@ -6850,7 +6420,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public int getTrainCount() { if (trainBuilder_ == null) { @@ -6864,7 +6434,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo getTrain(int index) { if (trainBuilder_ == null) { @@ -6878,7 +6448,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public Builder setTrain( int index, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo value) { @@ -6899,7 +6469,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public Builder setTrain( int index, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder builderForValue) { @@ -6917,7 +6487,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public Builder addTrain(club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo value) { if (trainBuilder_ == null) { @@ -6937,7 +6507,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public Builder addTrain( int index, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo value) { @@ -6958,7 +6528,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public Builder addTrain( club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder builderForValue) { @@ -6976,7 +6546,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public Builder addTrain( int index, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder builderForValue) { @@ -6994,7 +6564,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public Builder addAllTrain( java.lang.Iterable values) { @@ -7013,12 +6583,12 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public Builder clearTrain() { if (trainBuilder_ == null) { train_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00002000); + bitField0_ = (bitField0_ & ~0x00001000); onChanged(); } else { trainBuilder_.clear(); @@ -7030,7 +6600,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public Builder removeTrain(int index) { if (trainBuilder_ == null) { @@ -7047,7 +6617,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder getTrainBuilder( int index) { @@ -7058,7 +6628,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public club.joylink.xiannccda.dto.protos.TrainProto.TrainInfoOrBuilder getTrainOrBuilder( int index) { @@ -7072,7 +6642,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public java.util.List getTrainOrBuilderList() { @@ -7087,7 +6657,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder addTrainBuilder() { return getTrainFieldBuilder().addBuilder( @@ -7098,7 +6668,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder addTrainBuilder( int index) { @@ -7110,7 +6680,7 @@ public final class WsMessageProto { *列车信息 * * - * repeated .train.TrainInfo train = 14; + * repeated .train.TrainInfo train = 13; */ public java.util.List getTrainBuilderList() { @@ -7123,7 +6693,7 @@ public final class WsMessageProto { trainBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfoOrBuilder>( train_, - ((bitField0_ & 0x00002000) != 0), + ((bitField0_ & 0x00001000) != 0), getParentForChildren(), isClean()); train_ = null; @@ -7203,87 +6773,43 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - java.util.List - getDiagramList(); + java.util.List + getOffsetList(); /** * 
      *线网车辆位置
      *
* - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram getDiagram(int index); + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage getOffset(int index); /** * 
      *线网车辆位置
      *
* - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - int getDiagramCount(); + int getOffsetCount(); /** * 
      *线网车辆位置
      *
* - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - java.util.List - getDiagramOrBuilderList(); + java.util.List + getOffsetOrBuilderList(); /** * 
      *线网车辆位置
      *
* - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagramOrBuilder getDiagramOrBuilder( - int index); - - /** - * 
-     *列车信息
-     *
- * - * repeated .train.TrainInfo train = 2; - */ - java.util.List - getTrainList(); - /** - * 
-     *列车信息
-     *
- * - * repeated .train.TrainInfo train = 2; - */ - club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo getTrain(int index); - /** - * 
-     *列车信息
-     *
- * - * repeated .train.TrainInfo train = 2; - */ - int getTrainCount(); - /** - * 
-     *列车信息
-     *
- * - * repeated .train.TrainInfo train = 2; - */ - java.util.List - getTrainOrBuilderList(); - /** - * 
-     *列车信息
-     *
- * - * repeated .train.TrainInfo train = 2; - */ - club.joylink.xiannccda.dto.protos.TrainProto.TrainInfoOrBuilder getTrainOrBuilder( + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessageOrBuilder getOffsetOrBuilder( int index); } /** @@ -7303,8 +6829,7 @@ public final class WsMessageProto { super(builder); } private WsLineNetMessage() { - diagram_ = java.util.Collections.emptyList(); - train_ = java.util.Collections.emptyList(); + offset_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -7327,126 +6852,65 @@ public final class WsMessageProto { club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetMessage.class, club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetMessage.Builder.class); } - public static final int DIAGRAM_FIELD_NUMBER = 1; + public static final int OFFSET_FIELD_NUMBER = 1; @SuppressWarnings("serial") - private java.util.List diagram_; + private java.util.List offset_; /** * 
      *线网车辆位置
      *
* - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ @java.lang.Override - public java.util.List getDiagramList() { - return diagram_; + public java.util.List getOffsetList() { + return offset_; } /** * 
      *线网车辆位置
      *
* - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ @java.lang.Override - public java.util.List - getDiagramOrBuilderList() { - return diagram_; + public java.util.List + getOffsetOrBuilderList() { + return offset_; } /** * 
      *线网车辆位置
      *
* - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ @java.lang.Override - public int getDiagramCount() { - return diagram_.size(); + public int getOffsetCount() { + return offset_.size(); } /** * 
      *线网车辆位置
      *
* - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ @java.lang.Override - public club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram getDiagram(int index) { - return diagram_.get(index); + public club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage getOffset(int index) { + return offset_.get(index); } /** * 
      *线网车辆位置
      *
* - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ @java.lang.Override - public club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagramOrBuilder getDiagramOrBuilder( + public club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessageOrBuilder getOffsetOrBuilder( int index) { - return diagram_.get(index); - } - - public static final int TRAIN_FIELD_NUMBER = 2; - @SuppressWarnings("serial") - private java.util.List train_; - /** - * 
-     *列车信息
-     *
- * - * repeated .train.TrainInfo train = 2; - */ - @java.lang.Override - public java.util.List getTrainList() { - return train_; - } - /** - * 
-     *列车信息
-     *
- * - * repeated .train.TrainInfo train = 2; - */ - @java.lang.Override - public java.util.List - getTrainOrBuilderList() { - return train_; - } - /** - * 
-     *列车信息
-     *
- * - * repeated .train.TrainInfo train = 2; - */ - @java.lang.Override - public int getTrainCount() { - return train_.size(); - } - /** - * 
-     *列车信息
-     *
- * - * repeated .train.TrainInfo train = 2; - */ - @java.lang.Override - public club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo getTrain(int index) { - return train_.get(index); - } - /** - * 
-     *列车信息
-     *
- * - * repeated .train.TrainInfo train = 2; - */ - @java.lang.Override - public club.joylink.xiannccda.dto.protos.TrainProto.TrainInfoOrBuilder getTrainOrBuilder( - int index) { - return train_.get(index); + return offset_.get(index); } private byte memoizedIsInitialized = -1; @@ -7463,11 +6927,8 @@ public final class WsMessageProto { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < diagram_.size(); i++) { - output.writeMessage(1, diagram_.get(i)); - } - for (int i = 0; i < train_.size(); i++) { - output.writeMessage(2, train_.get(i)); + for (int i = 0; i < offset_.size(); i++) { + output.writeMessage(1, offset_.get(i)); } getUnknownFields().writeTo(output); } @@ -7478,13 +6939,9 @@ public final class WsMessageProto { if (size != -1) return size; size = 0; - for (int i = 0; i < diagram_.size(); i++) { + for (int i = 0; i < offset_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, diagram_.get(i)); - } - for (int i = 0; i < train_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, train_.get(i)); + .computeMessageSize(1, offset_.get(i)); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -7501,10 +6958,8 @@ public final class WsMessageProto { } club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetMessage other = (club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetMessage) obj; - if (!getDiagramList() - .equals(other.getDiagramList())) return false; - if (!getTrainList() - .equals(other.getTrainList())) return false; + if (!getOffsetList() + .equals(other.getOffsetList())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -7516,13 +6971,9 @@ public final class WsMessageProto { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getDiagramCount() > 0) { - hash = (37 * hash) + DIAGRAM_FIELD_NUMBER; - hash = (53 * hash) + getDiagramList().hashCode(); - } - if (getTrainCount() > 0) { - hash = (37 * hash) + TRAIN_FIELD_NUMBER; - hash = (53 * hash) + getTrainList().hashCode(); + if (getOffsetCount() > 0) { + hash = (37 * hash) + OFFSET_FIELD_NUMBER; + hash = (53 * hash) + getOffsetList().hashCode(); } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; @@ -7659,20 +7110,13 @@ public final class WsMessageProto { public Builder clear() { super.clear(); bitField0_ = 0; - if (diagramBuilder_ == null) { - diagram_ = java.util.Collections.emptyList(); + if (offsetBuilder_ == null) { + offset_ = java.util.Collections.emptyList(); } else { - diagram_ = null; - diagramBuilder_.clear(); + offset_ = null; + offsetBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); - if (trainBuilder_ == null) { - train_ = java.util.Collections.emptyList(); - } else { - train_ = null; - trainBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -7706,23 +7150,14 @@ public final class WsMessageProto { } private void buildPartialRepeatedFields(club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetMessage result) { - if (diagramBuilder_ == null) { + if (offsetBuilder_ == null) { if (((bitField0_ & 0x00000001) != 0)) { - diagram_ = java.util.Collections.unmodifiableList(diagram_); + offset_ = java.util.Collections.unmodifiableList(offset_); bitField0_ = (bitField0_ & ~0x00000001); } - result.diagram_ = diagram_; + result.offset_ = offset_; } else { - result.diagram_ = diagramBuilder_.build(); - } - if (trainBuilder_ == null) { - if (((bitField0_ & 0x00000002) != 0)) { - train_ = java.util.Collections.unmodifiableList(train_); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.train_ = train_; - } else { - result.train_ = trainBuilder_.build(); + result.offset_ = offsetBuilder_.build(); } } @@ -7742,55 +7177,29 @@ public final class WsMessageProto { public Builder mergeFrom(club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetMessage other) { if (other == club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetMessage.getDefaultInstance()) return this; - if (diagramBuilder_ == null) { - if (!other.diagram_.isEmpty()) { - if (diagram_.isEmpty()) { - diagram_ = other.diagram_; + if (offsetBuilder_ == null) { + if (!other.offset_.isEmpty()) { + if (offset_.isEmpty()) { + offset_ = other.offset_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureDiagramIsMutable(); - diagram_.addAll(other.diagram_); + ensureOffsetIsMutable(); + offset_.addAll(other.offset_); } onChanged(); } } else { - if (!other.diagram_.isEmpty()) { - if (diagramBuilder_.isEmpty()) { - diagramBuilder_.dispose(); - diagramBuilder_ = null; - diagram_ = other.diagram_; + if (!other.offset_.isEmpty()) { + if (offsetBuilder_.isEmpty()) { + offsetBuilder_.dispose(); + offsetBuilder_ = null; + offset_ = other.offset_; bitField0_ = (bitField0_ & ~0x00000001); - diagramBuilder_ = + offsetBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getDiagramFieldBuilder() : null; + getOffsetFieldBuilder() : null; } else { - diagramBuilder_.addAllMessages(other.diagram_); - } - } - } - if (trainBuilder_ == null) { - if (!other.train_.isEmpty()) { - if (train_.isEmpty()) { - train_ = other.train_; - bitField0_ = (bitField0_ & ~0x00000002); - } else { - ensureTrainIsMutable(); - train_.addAll(other.train_); - } - onChanged(); - } - } else { - if (!other.train_.isEmpty()) { - if (trainBuilder_.isEmpty()) { - trainBuilder_.dispose(); - trainBuilder_ = null; - train_ = other.train_; - bitField0_ = (bitField0_ & ~0x00000002); - trainBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getTrainFieldBuilder() : null; - } else { - trainBuilder_.addAllMessages(other.train_); + offsetBuilder_.addAllMessages(other.offset_); } } } @@ -7821,31 +7230,18 @@ public final class WsMessageProto { done = true; break; case 10: { - club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram m = + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage m = input.readMessage( - club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram.parser(), + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.parser(), extensionRegistry); - if (diagramBuilder_ == null) { - ensureDiagramIsMutable(); - diagram_.add(m); + if (offsetBuilder_ == null) { + ensureOffsetIsMutable(); + offset_.add(m); } else { - diagramBuilder_.addMessage(m); + offsetBuilder_.addMessage(m); } break; } // case 10 - case 18: { - club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo m = - input.readMessage( - club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.parser(), - extensionRegistry); - if (trainBuilder_ == null) { - ensureTrainIsMutable(); - train_.add(m); - } else { - trainBuilder_.addMessage(m); - } - break; - } // case 18 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -7863,30 +7259,30 @@ public final class WsMessageProto { } private int bitField0_; - private java.util.List diagram_ = + private java.util.List offset_ = java.util.Collections.emptyList(); - private void ensureDiagramIsMutable() { + private void ensureOffsetIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - diagram_ = new java.util.ArrayList(diagram_); + offset_ = new java.util.ArrayList(offset_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram, club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram.Builder, club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagramOrBuilder> diagramBuilder_; + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage, club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.Builder, club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessageOrBuilder> offsetBuilder_; /** * 
        *线网车辆位置
        *
* - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public java.util.List getDiagramList() { - if (diagramBuilder_ == null) { - return java.util.Collections.unmodifiableList(diagram_); + public java.util.List getOffsetList() { + if (offsetBuilder_ == null) { + return java.util.Collections.unmodifiableList(offset_); } else { - return diagramBuilder_.getMessageList(); + return offsetBuilder_.getMessageList(); } } /** @@ -7894,13 +7290,13 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public int getDiagramCount() { - if (diagramBuilder_ == null) { - return diagram_.size(); + public int getOffsetCount() { + if (offsetBuilder_ == null) { + return offset_.size(); } else { - return diagramBuilder_.getCount(); + return offsetBuilder_.getCount(); } } /** @@ -7908,13 +7304,13 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram getDiagram(int index) { - if (diagramBuilder_ == null) { - return diagram_.get(index); + public club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage getOffset(int index) { + if (offsetBuilder_ == null) { + return offset_.get(index); } else { - return diagramBuilder_.getMessage(index); + return offsetBuilder_.getMessage(index); } } /** @@ -7922,19 +7318,19 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public Builder setDiagram( - int index, club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram value) { - if (diagramBuilder_ == null) { + public Builder setOffset( + int index, club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage value) { + if (offsetBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureDiagramIsMutable(); - diagram_.set(index, value); + ensureOffsetIsMutable(); + offset_.set(index, value); onChanged(); } else { - diagramBuilder_.setMessage(index, value); + offsetBuilder_.setMessage(index, value); } return this; } @@ -7943,16 +7339,16 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public Builder setDiagram( - int index, club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram.Builder builderForValue) { - if (diagramBuilder_ == null) { - ensureDiagramIsMutable(); - diagram_.set(index, builderForValue.build()); + public Builder setOffset( + int index, club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.Builder builderForValue) { + if (offsetBuilder_ == null) { + ensureOffsetIsMutable(); + offset_.set(index, builderForValue.build()); onChanged(); } else { - diagramBuilder_.setMessage(index, builderForValue.build()); + offsetBuilder_.setMessage(index, builderForValue.build()); } return this; } @@ -7961,18 +7357,18 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public Builder addDiagram(club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram value) { - if (diagramBuilder_ == null) { + public Builder addOffset(club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage value) { + if (offsetBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureDiagramIsMutable(); - diagram_.add(value); + ensureOffsetIsMutable(); + offset_.add(value); onChanged(); } else { - diagramBuilder_.addMessage(value); + offsetBuilder_.addMessage(value); } return this; } @@ -7981,19 +7377,19 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public Builder addDiagram( - int index, club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram value) { - if (diagramBuilder_ == null) { + public Builder addOffset( + int index, club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage value) { + if (offsetBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureDiagramIsMutable(); - diagram_.add(index, value); + ensureOffsetIsMutable(); + offset_.add(index, value); onChanged(); } else { - diagramBuilder_.addMessage(index, value); + offsetBuilder_.addMessage(index, value); } return this; } @@ -8002,16 +7398,16 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public Builder addDiagram( - club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram.Builder builderForValue) { - if (diagramBuilder_ == null) { - ensureDiagramIsMutable(); - diagram_.add(builderForValue.build()); + public Builder addOffset( + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.Builder builderForValue) { + if (offsetBuilder_ == null) { + ensureOffsetIsMutable(); + offset_.add(builderForValue.build()); onChanged(); } else { - diagramBuilder_.addMessage(builderForValue.build()); + offsetBuilder_.addMessage(builderForValue.build()); } return this; } @@ -8020,16 +7416,16 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public Builder addDiagram( - int index, club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram.Builder builderForValue) { - if (diagramBuilder_ == null) { - ensureDiagramIsMutable(); - diagram_.add(index, builderForValue.build()); + public Builder addOffset( + int index, club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.Builder builderForValue) { + if (offsetBuilder_ == null) { + ensureOffsetIsMutable(); + offset_.add(index, builderForValue.build()); onChanged(); } else { - diagramBuilder_.addMessage(index, builderForValue.build()); + offsetBuilder_.addMessage(index, builderForValue.build()); } return this; } @@ -8038,17 +7434,17 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public Builder addAllDiagram( - java.lang.Iterable values) { - if (diagramBuilder_ == null) { - ensureDiagramIsMutable(); + public Builder addAllOffset( + java.lang.Iterable values) { + if (offsetBuilder_ == null) { + ensureOffsetIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, diagram_); + values, offset_); onChanged(); } else { - diagramBuilder_.addAllMessages(values); + offsetBuilder_.addAllMessages(values); } return this; } @@ -8057,15 +7453,15 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public Builder clearDiagram() { - if (diagramBuilder_ == null) { - diagram_ = java.util.Collections.emptyList(); + public Builder clearOffset() { + if (offsetBuilder_ == null) { + offset_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { - diagramBuilder_.clear(); + offsetBuilder_.clear(); } return this; } @@ -8074,15 +7470,15 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public Builder removeDiagram(int index) { - if (diagramBuilder_ == null) { - ensureDiagramIsMutable(); - diagram_.remove(index); + public Builder removeOffset(int index) { + if (offsetBuilder_ == null) { + ensureOffsetIsMutable(); + offset_.remove(index); onChanged(); } else { - diagramBuilder_.remove(index); + offsetBuilder_.remove(index); } return this; } @@ -8091,24 +7487,24 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram.Builder getDiagramBuilder( + public club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.Builder getOffsetBuilder( int index) { - return getDiagramFieldBuilder().getBuilder(index); + return getOffsetFieldBuilder().getBuilder(index); } /** * 
        *线网车辆位置
        *
* - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagramOrBuilder getDiagramOrBuilder( + public club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessageOrBuilder getOffsetOrBuilder( int index) { - if (diagramBuilder_ == null) { - return diagram_.get(index); } else { - return diagramBuilder_.getMessageOrBuilder(index); + if (offsetBuilder_ == null) { + return offset_.get(index); } else { + return offsetBuilder_.getMessageOrBuilder(index); } } /** @@ -8116,14 +7512,14 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public java.util.List - getDiagramOrBuilderList() { - if (diagramBuilder_ != null) { - return diagramBuilder_.getMessageOrBuilderList(); + public java.util.List + getOffsetOrBuilderList() { + if (offsetBuilder_ != null) { + return offsetBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(diagram_); + return java.util.Collections.unmodifiableList(offset_); } } /** @@ -8131,360 +7527,48 @@ public final class WsMessageProto { *线网车辆位置 * * - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram.Builder addDiagramBuilder() { - return getDiagramFieldBuilder().addBuilder( - club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram.getDefaultInstance()); + public club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.Builder addOffsetBuilder() { + return getOffsetFieldBuilder().addBuilder( + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.getDefaultInstance()); } /** * 
        *线网车辆位置
        *
* - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram.Builder addDiagramBuilder( + public club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.Builder addOffsetBuilder( int index) { - return getDiagramFieldBuilder().addBuilder( - index, club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram.getDefaultInstance()); + return getOffsetFieldBuilder().addBuilder( + index, club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.getDefaultInstance()); } /** * 
        *线网车辆位置
        *
* - * repeated .diagram.LineNetTrainOffsetDiagram diagram = 1; + * repeated .state.WsLineNetTrainOffsetMessage offset = 1; */ - public java.util.List - getDiagramBuilderList() { - return getDiagramFieldBuilder().getBuilderList(); + public java.util.List + getOffsetBuilderList() { + return getOffsetFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram, club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram.Builder, club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagramOrBuilder> - getDiagramFieldBuilder() { - if (diagramBuilder_ == null) { - diagramBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram, club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagram.Builder, club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.LineNetTrainOffsetDiagramOrBuilder>( - diagram_, + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage, club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.Builder, club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessageOrBuilder> + getOffsetFieldBuilder() { + if (offsetBuilder_ == null) { + offsetBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage, club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.Builder, club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessageOrBuilder>( + offset_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); - diagram_ = null; + offset_ = null; } - return diagramBuilder_; - } - - private java.util.List train_ = - java.util.Collections.emptyList(); - private void ensureTrainIsMutable() { - if (!((bitField0_ & 0x00000002) != 0)) { - train_ = new java.util.ArrayList(train_); - bitField0_ |= 0x00000002; - } - } - - private com.google.protobuf.RepeatedFieldBuilderV3< - club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfoOrBuilder> trainBuilder_; - - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public java.util.List getTrainList() { - if (trainBuilder_ == null) { - return java.util.Collections.unmodifiableList(train_); - } else { - return trainBuilder_.getMessageList(); - } - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public int getTrainCount() { - if (trainBuilder_ == null) { - return train_.size(); - } else { - return trainBuilder_.getCount(); - } - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo getTrain(int index) { - if (trainBuilder_ == null) { - return train_.get(index); - } else { - return trainBuilder_.getMessage(index); - } - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public Builder setTrain( - int index, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo value) { - if (trainBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTrainIsMutable(); - train_.set(index, value); - onChanged(); - } else { - trainBuilder_.setMessage(index, value); - } - return this; - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public Builder setTrain( - int index, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder builderForValue) { - if (trainBuilder_ == null) { - ensureTrainIsMutable(); - train_.set(index, builderForValue.build()); - onChanged(); - } else { - trainBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public Builder addTrain(club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo value) { - if (trainBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTrainIsMutable(); - train_.add(value); - onChanged(); - } else { - trainBuilder_.addMessage(value); - } - return this; - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public Builder addTrain( - int index, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo value) { - if (trainBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTrainIsMutable(); - train_.add(index, value); - onChanged(); - } else { - trainBuilder_.addMessage(index, value); - } - return this; - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public Builder addTrain( - club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder builderForValue) { - if (trainBuilder_ == null) { - ensureTrainIsMutable(); - train_.add(builderForValue.build()); - onChanged(); - } else { - trainBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public Builder addTrain( - int index, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder builderForValue) { - if (trainBuilder_ == null) { - ensureTrainIsMutable(); - train_.add(index, builderForValue.build()); - onChanged(); - } else { - trainBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public Builder addAllTrain( - java.lang.Iterable values) { - if (trainBuilder_ == null) { - ensureTrainIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, train_); - onChanged(); - } else { - trainBuilder_.addAllMessages(values); - } - return this; - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public Builder clearTrain() { - if (trainBuilder_ == null) { - train_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); - onChanged(); - } else { - trainBuilder_.clear(); - } - return this; - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public Builder removeTrain(int index) { - if (trainBuilder_ == null) { - ensureTrainIsMutable(); - train_.remove(index); - onChanged(); - } else { - trainBuilder_.remove(index); - } - return this; - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder getTrainBuilder( - int index) { - return getTrainFieldBuilder().getBuilder(index); - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public club.joylink.xiannccda.dto.protos.TrainProto.TrainInfoOrBuilder getTrainOrBuilder( - int index) { - if (trainBuilder_ == null) { - return train_.get(index); } else { - return trainBuilder_.getMessageOrBuilder(index); - } - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public java.util.List - getTrainOrBuilderList() { - if (trainBuilder_ != null) { - return trainBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(train_); - } - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder addTrainBuilder() { - return getTrainFieldBuilder().addBuilder( - club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.getDefaultInstance()); - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder addTrainBuilder( - int index) { - return getTrainFieldBuilder().addBuilder( - index, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.getDefaultInstance()); - } - /** - * 
-       *列车信息
-       *
- * - * repeated .train.TrainInfo train = 2; - */ - public java.util.List - getTrainBuilderList() { - return getTrainFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfoOrBuilder> - getTrainFieldBuilder() { - if (trainBuilder_ == null) { - trainBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfo.Builder, club.joylink.xiannccda.dto.protos.TrainProto.TrainInfoOrBuilder>( - train_, - ((bitField0_ & 0x00000002) != 0), - getParentForChildren(), - isClean()); - train_ = null; - } - return trainBuilder_; + return offsetBuilder_; } @java.lang.Override public final Builder setUnknownFields( @@ -8550,6 +7634,1123 @@ public final class WsMessageProto { } + public interface WsLineNetTrainOffsetMessageOrBuilder extends + // @@protoc_insertion_point(interface_extends:state.WsLineNetTrainOffsetMessage) + com.google.protobuf.MessageOrBuilder { + + /** + * 
+     *线路id
+     *
+ * + * int32 lineId = 1; + * @return The lineId. + */ + int getLineId(); + + /** + * 
+     * 列车标示号，全线唯一
+     *
+ * + * string trainIndex = 2; + * @return The trainIndex. + */ + java.lang.String getTrainIndex(); + /** + * 
+     * 列车标示号，全线唯一
+     *
+ * + * string trainIndex = 2; + * @return The bytes for trainIndex. + */ + com.google.protobuf.ByteString + getTrainIndexBytes(); + + /** + * 
+     * 目的地ID
+     *
+ * + * int32 destinationId = 3; + * @return The destinationId. + */ + int getDestinationId(); + + /** + * 
+     *是否显示
+     *
+ * + * bool show = 4; + * @return The show. + */ + boolean getShow(); + + /** + * 
+     * 列车公里标
+     *
+ * + * string kilometerCode = 5; + * @return The kilometerCode. + */ + java.lang.String getKilometerCode(); + /** + * 
+     * 列车公里标
+     *
+ * + * string kilometerCode = 5; + * @return The bytes for kilometerCode. + */ + com.google.protobuf.ByteString + getKilometerCodeBytes(); + + /** + * 
+     * 运行方向
+     *
+ * + * int32 dir = 6; + * @return The dir. + */ + int getDir(); + } + /** + * 
+   * 线网列车位置信息
+   *
+ * + * Protobuf type {@code state.WsLineNetTrainOffsetMessage} + */ + public static final class WsLineNetTrainOffsetMessage extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:state.WsLineNetTrainOffsetMessage) + WsLineNetTrainOffsetMessageOrBuilder { + private static final long serialVersionUID = 0L; + // Use WsLineNetTrainOffsetMessage.newBuilder() to construct. + private WsLineNetTrainOffsetMessage(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private WsLineNetTrainOffsetMessage() { + trainIndex_ = ""; + kilometerCode_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new WsLineNetTrainOffsetMessage(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return club.joylink.xiannccda.dto.protos.WsMessageProto.internal_static_state_WsLineNetTrainOffsetMessage_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return club.joylink.xiannccda.dto.protos.WsMessageProto.internal_static_state_WsLineNetTrainOffsetMessage_fieldAccessorTable + .ensureFieldAccessorsInitialized( + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.class, club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.Builder.class); + } + + public static final int LINEID_FIELD_NUMBER = 1; + private int lineId_ = 0; + /** + * 
+     *线路id
+     *
+ * + * int32 lineId = 1; + * @return The lineId. + */ + @java.lang.Override + public int getLineId() { + return lineId_; + } + + public static final int TRAININDEX_FIELD_NUMBER = 2; + @SuppressWarnings("serial") + private volatile java.lang.Object trainIndex_ = ""; + /** + * 
+     * 列车标示号，全线唯一
+     *
+ * + * string trainIndex = 2; + * @return The trainIndex. + */ + @java.lang.Override + public java.lang.String getTrainIndex() { + java.lang.Object ref = trainIndex_; + 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(); + trainIndex_ = s; + return s; + } + } + /** + * 
+     * 列车标示号，全线唯一
+     *
+ * + * string trainIndex = 2; + * @return The bytes for trainIndex. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getTrainIndexBytes() { + java.lang.Object ref = trainIndex_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + trainIndex_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int DESTINATIONID_FIELD_NUMBER = 3; + private int destinationId_ = 0; + /** + * 
+     * 目的地ID
+     *
+ * + * int32 destinationId = 3; + * @return The destinationId. + */ + @java.lang.Override + public int getDestinationId() { + return destinationId_; + } + + public static final int SHOW_FIELD_NUMBER = 4; + private boolean show_ = false; + /** + * 
+     *是否显示
+     *
+ * + * bool show = 4; + * @return The show. + */ + @java.lang.Override + public boolean getShow() { + return show_; + } + + public static final int KILOMETERCODE_FIELD_NUMBER = 5; + @SuppressWarnings("serial") + private volatile java.lang.Object kilometerCode_ = ""; + /** + * 
+     * 列车公里标
+     *
+ * + * string kilometerCode = 5; + * @return The kilometerCode. + */ + @java.lang.Override + public java.lang.String getKilometerCode() { + java.lang.Object ref = kilometerCode_; + 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(); + kilometerCode_ = s; + return s; + } + } + /** + * 
+     * 列车公里标
+     *
+ * + * string kilometerCode = 5; + * @return The bytes for kilometerCode. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getKilometerCodeBytes() { + java.lang.Object ref = kilometerCode_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + kilometerCode_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int DIR_FIELD_NUMBER = 6; + private int dir_ = 0; + /** + * 
+     * 运行方向
+     *
+ * + * int32 dir = 6; + * @return The dir. + */ + @java.lang.Override + public int getDir() { + return dir_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (lineId_ != 0) { + output.writeInt32(1, lineId_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(trainIndex_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, trainIndex_); + } + if (destinationId_ != 0) { + output.writeInt32(3, destinationId_); + } + if (show_ != false) { + output.writeBool(4, show_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kilometerCode_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, kilometerCode_); + } + if (dir_ != 0) { + output.writeInt32(6, dir_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (lineId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, lineId_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(trainIndex_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, trainIndex_); + } + if (destinationId_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, destinationId_); + } + if (show_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(4, show_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kilometerCode_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, kilometerCode_); + } + if (dir_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(6, dir_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage)) { + return super.equals(obj); + } + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage other = (club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage) obj; + + if (getLineId() + != other.getLineId()) return false; + if (!getTrainIndex() + .equals(other.getTrainIndex())) return false; + if (getDestinationId() + != other.getDestinationId()) return false; + if (getShow() + != other.getShow()) return false; + if (!getKilometerCode() + .equals(other.getKilometerCode())) return false; + if (getDir() + != other.getDir()) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + LINEID_FIELD_NUMBER; + hash = (53 * hash) + getLineId(); + hash = (37 * hash) + TRAININDEX_FIELD_NUMBER; + hash = (53 * hash) + getTrainIndex().hashCode(); + hash = (37 * hash) + DESTINATIONID_FIELD_NUMBER; + hash = (53 * hash) + getDestinationId(); + hash = (37 * hash) + SHOW_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getShow()); + hash = (37 * hash) + KILOMETERCODE_FIELD_NUMBER; + hash = (53 * hash) + getKilometerCode().hashCode(); + hash = (37 * hash) + DIR_FIELD_NUMBER; + hash = (53 * hash) + getDir(); + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + + public static club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * 
+     * 线网列车位置信息
+     *
+ * + * Protobuf type {@code state.WsLineNetTrainOffsetMessage} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:state.WsLineNetTrainOffsetMessage) + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessageOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return club.joylink.xiannccda.dto.protos.WsMessageProto.internal_static_state_WsLineNetTrainOffsetMessage_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return club.joylink.xiannccda.dto.protos.WsMessageProto.internal_static_state_WsLineNetTrainOffsetMessage_fieldAccessorTable + .ensureFieldAccessorsInitialized( + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.class, club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.Builder.class); + } + + // Construct using club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + lineId_ = 0; + trainIndex_ = ""; + destinationId_ = 0; + show_ = false; + kilometerCode_ = ""; + dir_ = 0; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return club.joylink.xiannccda.dto.protos.WsMessageProto.internal_static_state_WsLineNetTrainOffsetMessage_descriptor; + } + + @java.lang.Override + public club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage getDefaultInstanceForType() { + return club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.getDefaultInstance(); + } + + @java.lang.Override + public club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage build() { + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage buildPartial() { + club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage result = new club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.lineId_ = lineId_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.trainIndex_ = trainIndex_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.destinationId_ = destinationId_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.show_ = show_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.kilometerCode_ = kilometerCode_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.dir_ = dir_; + } + } + + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage) { + return mergeFrom((club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage other) { + if (other == club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage.getDefaultInstance()) return this; + if (other.getLineId() != 0) { + setLineId(other.getLineId()); + } + if (!other.getTrainIndex().isEmpty()) { + trainIndex_ = other.trainIndex_; + bitField0_ |= 0x00000002; + onChanged(); + } + if (other.getDestinationId() != 0) { + setDestinationId(other.getDestinationId()); + } + if (other.getShow() != false) { + setShow(other.getShow()); + } + if (!other.getKilometerCode().isEmpty()) { + kilometerCode_ = other.kilometerCode_; + bitField0_ |= 0x00000010; + onChanged(); + } + if (other.getDir() != 0) { + setDir(other.getDir()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 8: { + lineId_ = input.readInt32(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 18: { + trainIndex_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 24: { + destinationId_ = input.readInt32(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 32: { + show_ = input.readBool(); + bitField0_ |= 0x00000008; + break; + } // case 32 + case 42: { + kilometerCode_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000010; + break; + } // case 42 + case 48: { + dir_ = input.readInt32(); + bitField0_ |= 0x00000020; + break; + } // case 48 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private int lineId_ ; + /** + * 
+       *线路id
+       *
+ * + * int32 lineId = 1; + * @return The lineId. + */ + @java.lang.Override + public int getLineId() { + return lineId_; + } + /** + * 
+       *线路id
+       *
+ * + * int32 lineId = 1; + * @param value The lineId to set. + * @return This builder for chaining. + */ + public Builder setLineId(int value) { + + lineId_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * 
+       *线路id
+       *
+ * + * int32 lineId = 1; + * @return This builder for chaining. + */ + public Builder clearLineId() { + bitField0_ = (bitField0_ & ~0x00000001); + lineId_ = 0; + onChanged(); + return this; + } + + private java.lang.Object trainIndex_ = ""; + /** + * 
+       * 列车标示号，全线唯一
+       *
+ * + * string trainIndex = 2; + * @return The trainIndex. + */ + public java.lang.String getTrainIndex() { + java.lang.Object ref = trainIndex_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + trainIndex_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+       * 列车标示号，全线唯一
+       *
+ * + * string trainIndex = 2; + * @return The bytes for trainIndex. + */ + public com.google.protobuf.ByteString + getTrainIndexBytes() { + java.lang.Object ref = trainIndex_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + trainIndex_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+       * 列车标示号，全线唯一
+       *
+ * + * string trainIndex = 2; + * @param value The trainIndex to set. + * @return This builder for chaining. + */ + public Builder setTrainIndex( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + trainIndex_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * 
+       * 列车标示号，全线唯一
+       *
+ * + * string trainIndex = 2; + * @return This builder for chaining. + */ + public Builder clearTrainIndex() { + trainIndex_ = getDefaultInstance().getTrainIndex(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + /** + * 
+       * 列车标示号，全线唯一
+       *
+ * + * string trainIndex = 2; + * @param value The bytes for trainIndex to set. + * @return This builder for chaining. + */ + public Builder setTrainIndexBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + trainIndex_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + + private int destinationId_ ; + /** + * 
+       * 目的地ID
+       *
+ * + * int32 destinationId = 3; + * @return The destinationId. + */ + @java.lang.Override + public int getDestinationId() { + return destinationId_; + } + /** + * 
+       * 目的地ID
+       *
+ * + * int32 destinationId = 3; + * @param value The destinationId to set. + * @return This builder for chaining. + */ + public Builder setDestinationId(int value) { + + destinationId_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * 
+       * 目的地ID
+       *
+ * + * int32 destinationId = 3; + * @return This builder for chaining. + */ + public Builder clearDestinationId() { + bitField0_ = (bitField0_ & ~0x00000004); + destinationId_ = 0; + onChanged(); + return this; + } + + private boolean show_ ; + /** + * 
+       *是否显示
+       *
+ * + * bool show = 4; + * @return The show. + */ + @java.lang.Override + public boolean getShow() { + return show_; + } + /** + * 
+       *是否显示
+       *
+ * + * bool show = 4; + * @param value The show to set. + * @return This builder for chaining. + */ + public Builder setShow(boolean value) { + + show_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * 
+       *是否显示
+       *
+ * + * bool show = 4; + * @return This builder for chaining. + */ + public Builder clearShow() { + bitField0_ = (bitField0_ & ~0x00000008); + show_ = false; + onChanged(); + return this; + } + + private java.lang.Object kilometerCode_ = ""; + /** + * 
+       * 列车公里标
+       *
+ * + * string kilometerCode = 5; + * @return The kilometerCode. + */ + public java.lang.String getKilometerCode() { + java.lang.Object ref = kilometerCode_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kilometerCode_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * 
+       * 列车公里标
+       *
+ * + * string kilometerCode = 5; + * @return The bytes for kilometerCode. + */ + public com.google.protobuf.ByteString + getKilometerCodeBytes() { + java.lang.Object ref = kilometerCode_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + kilometerCode_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * 
+       * 列车公里标
+       *
+ * + * string kilometerCode = 5; + * @param value The kilometerCode to set. + * @return This builder for chaining. + */ + public Builder setKilometerCode( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + kilometerCode_ = value; + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * 
+       * 列车公里标
+       *
+ * + * string kilometerCode = 5; + * @return This builder for chaining. + */ + public Builder clearKilometerCode() { + kilometerCode_ = getDefaultInstance().getKilometerCode(); + bitField0_ = (bitField0_ & ~0x00000010); + onChanged(); + return this; + } + /** + * 
+       * 列车公里标
+       *
+ * + * string kilometerCode = 5; + * @param value The bytes for kilometerCode to set. + * @return This builder for chaining. + */ + public Builder setKilometerCodeBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + kilometerCode_ = value; + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + + private int dir_ ; + /** + * 
+       * 运行方向
+       *
+ * + * int32 dir = 6; + * @return The dir. + */ + @java.lang.Override + public int getDir() { + return dir_; + } + /** + * 
+       * 运行方向
+       *
+ * + * int32 dir = 6; + * @param value The dir to set. + * @return This builder for chaining. + */ + public Builder setDir(int value) { + + dir_ = value; + bitField0_ |= 0x00000020; + onChanged(); + return this; + } + /** + * 
+       * 运行方向
+       *
+ * + * int32 dir = 6; + * @return This builder for chaining. + */ + public Builder clearDir() { + bitField0_ = (bitField0_ & ~0x00000020); + dir_ = 0; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:state.WsLineNetTrainOffsetMessage) + } + + // @@protoc_insertion_point(class_scope:state.WsLineNetTrainOffsetMessage) + private static final club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage(); + } + + public static club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public WsLineNetTrainOffsetMessage parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public club.joylink.xiannccda.dto.protos.WsMessageProto.WsLineNetTrainOffsetMessage getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + private static final com.google.protobuf.Descriptors.Descriptor internal_static_state_WsLineMessage_descriptor; private static final @@ -8560,6 +8761,11 @@ public final class WsMessageProto { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_state_WsLineNetMessage_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_state_WsLineNetTrainOffsetMessage_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_state_WsLineNetTrainOffsetMessage_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -8571,7 +8777,7 @@ public final class WsMessageProto { java.lang.String[] descriptorData = { "\n\020ws_message.proto\022\005state\032\023device_status" + ".proto\032\013train.proto\032\037LineNetTrainOffsetD" + - "iagram.proto\"\336\003\n\rWsLineMessage\022\027\n\003rtu\030\001 " + + "iagram.proto\"\271\003\n\rWsLineMessage\022\027\n\003rtu\030\001 " + "\003(\0132\n.state.Rtu\022\037\n\007station\030\002 \003(\0132\016.state" + ".Station\022\035\n\006signal\030\003 \003(\0132\r.state.Signal\022" + "\033\n\005entry\030\004 \003(\0132\014.state.Entry\022\035\n\006switch\030\005" + @@ -8580,14 +8786,16 @@ public final class WsMessageProto { "orm\022\033\n\005scada\030\010 \003(\0132\014.state.Scada\022-\n\016wate" + "rProofDoor\030\t \003(\0132\025.state.WaterProofDoor\022" + "!\n\010workArea\030\n \003(\0132\017.state.WorkArea\022\031\n\004ga" + - "ma\030\013 \003(\0132\013.state.Gama\022#\n\ttrainMode\030\014 \003(\013" + - "2\020.state.TrainMode\022(\n\007netWork\030\r \003(\0132\027.st" + - "ate.OccNccFepNetwork\022\037\n\005train\030\016 \003(\0132\020.tr" + - "ain.TrainInfo\"h\n\020WsLineNetMessage\0223\n\007dia" + - "gram\030\001 \003(\0132\".diagram.LineNetTrainOffsetD" + - "iagram\022\037\n\005train\030\002 \003(\0132\020.train.TrainInfoB" + - "3\n!club.joylink.xiannccda.dto.protosB\016Ws" + - "MessageProtob\006proto3" + "ma\030\013 \003(\0132\013.state.Gama\022(\n\007netWork\030\014 \003(\0132\027" + + ".state.OccNccFepNetwork\022\037\n\005train\030\r \003(\0132\020" + + ".train.TrainInfo\"F\n\020WsLineNetMessage\0222\n\006" + + "offset\030\001 \003(\0132\".state.WsLineNetTrainOffse" + + "tMessage\"\212\001\n\033WsLineNetTrainOffsetMessage" + + "\022\016\n\006lineId\030\001 \001(\005\022\022\n\ntrainIndex\030\002 \001(\t\022\025\n\r" + + "destinationId\030\003 \001(\005\022\014\n\004show\030\004 \001(\010\022\025\n\rkil" + + "ometerCode\030\005 \001(\t\022\013\n\003dir\030\006 \001(\005B3\n!club.jo" + + "ylink.xiannccda.dto.protosB\016WsMessagePro" + + "tob\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -8601,13 +8809,19 @@ public final class WsMessageProto { internal_static_state_WsLineMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_state_WsLineMessage_descriptor, - new java.lang.String[] { "Rtu", "Station", "Signal", "Entry", "Switch", "Track", "Platform", "Scada", "WaterProofDoor", "WorkArea", "Gama", "TrainMode", "NetWork", "Train", }); + new java.lang.String[] { "Rtu", "Station", "Signal", "Entry", "Switch", "Track", "Platform", "Scada", "WaterProofDoor", "WorkArea", "Gama", "NetWork", "Train", }); internal_static_state_WsLineNetMessage_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_state_WsLineNetMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_state_WsLineNetMessage_descriptor, - new java.lang.String[] { "Diagram", "Train", }); + new java.lang.String[] { "Offset", }); + internal_static_state_WsLineNetTrainOffsetMessage_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_state_WsLineNetTrainOffsetMessage_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_state_WsLineNetTrainOffsetMessage_descriptor, + new java.lang.String[] { "LineId", "TrainIndex", "DestinationId", "Show", "KilometerCode", "Dir", }); club.joylink.xiannccda.dto.protos.DeviceStatusProto.getDescriptor(); club.joylink.xiannccda.dto.protos.TrainProto.getDescriptor(); club.joylink.xiannccda.dto.protos.LineNetTrainOffsetDiagramProto.getDescriptor(); diff --git a/xian-ncc-da-message b/xian-ncc-da-message index 911d199..b5d0bb7 160000 --- a/xian-ncc-da-message +++ b/xian-ncc-da-message @@ -1 +1 @@ -Subproject commit 911d1999d0df58db7fefb59471487bd5c524269f +Subproject commit b5d0bb7fedf61cfe5cdfdfc75637bd02c875b19c