- * 区段类型
+ * 关联区段
*
*
- * .graphicData.Section.SectionType type = 3;
- * @return The enum numeric value on the wire for type.
+ * repeated string childrenId = 3;
+ * @return A list containing the childrenId.
*/
- int getTypeValue();
- /**
- * - * 区段类型 - *- * - *
.graphicData.Section.SectionType type = 3;
- * @return The type.
- */
- club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType getType();
-
+ java.util.List
* 关联区段
*
*
- * repeated .state.Section children = 4;
+ * repeated string childrenId = 3;
+ * @return The count of childrenId.
*/
- java.util.List
* 关联区段
*
*
- * repeated .state.Section children = 4;
+ * repeated string childrenId = 3;
+ * @param index The index of the element to return.
+ * @return The childrenId at the given index.
*/
- club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section getChildren(int index);
+ java.lang.String getChildrenId(int index);
/**
*
* 关联区段
*
*
- * repeated .state.Section children = 4;
+ * repeated string childrenId = 3;
+ * @param index The index of the value to return.
+ * @return The bytes of the childrenId at the given index.
*/
- int getChildrenCount();
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- java.util.List
- getChildrenOrBuilderList();
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- club.joylink.xiannccda.dto.protos.DeviceInfoProto.SectionOrBuilder getChildrenOrBuilder(
- int index);
+ com.google.protobuf.ByteString
+ getChildrenIdBytes(int index);
/**
*
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
java.util.Listrepeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem getKilometerSystem(int index);
/**
@@ -135,7 +113,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
int getKilometerSystemCount();
/**
@@ -143,7 +121,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
java.util.List
getKilometerSystemOrBuilderList();
@@ -152,7 +130,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder getKilometerSystemOrBuilder(
int index);
@@ -162,7 +140,7 @@ public final class DeviceInfoProto {
* 转换后的公里标数字
*
*
- * repeated int64 convertKilometer = 7;
+ * repeated int64 convertKilometer = 5;
* @return A list containing the convertKilometer.
*/
java.util.Listrepeated int64 convertKilometer = 7;
+ * repeated int64 convertKilometer = 5;
* @return The count of convertKilometer.
*/
int getConvertKilometerCount();
@@ -180,11 +158,31 @@ public final class DeviceInfoProto {
* 转换后的公里标数字
*
*
- * repeated int64 convertKilometer = 7;
+ * repeated int64 convertKilometer = 5;
* @param index The index of the element to return.
* @return The convertKilometer at the given index.
*/
long getConvertKilometer(int index);
+
+ /**
+ * + * 物理区段Id + *+ * + *
string physicalSectionId = 6;
+ * @return The physicalSectionId.
+ */
+ java.lang.String getPhysicalSectionId();
+ /**
+ * + * 物理区段Id + *+ * + *
string physicalSectionId = 6;
+ * @return The bytes for physicalSectionId.
+ */
+ com.google.protobuf.ByteString
+ getPhysicalSectionIdBytes();
}
/**
*
@@ -205,10 +203,11 @@ public final class DeviceInfoProto {
private Section() {
id_ = "";
code_ = "";
- type_ = 0;
- children_ = java.util.Collections.emptyList();
+ childrenId_ =
+ com.google.protobuf.LazyStringArrayList.emptyList();
kilometerSystem_ = java.util.Collections.emptyList();
convertKilometer_ = emptyLongList();
+ physicalSectionId_ = "";
}
@java.lang.Override
@@ -317,94 +316,60 @@ public final class DeviceInfoProto {
}
}
- public static final int TYPE_FIELD_NUMBER = 3;
- private int type_ = 0;
- /**
- *
- * 区段类型
- *
- *
- * .graphicData.Section.SectionType type = 3;
- * @return The enum numeric value on the wire for type.
- */
- @java.lang.Override public int getTypeValue() {
- return type_;
- }
- /**
- *
- * 区段类型
- *
- *
- * .graphicData.Section.SectionType type = 3;
- * @return The type.
- */
- @java.lang.Override public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType getType() {
- club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType result = club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType.forNumber(type_);
- return result == null ? club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType.UNRECOGNIZED : result;
- }
-
- public static final int CHILDREN_FIELD_NUMBER = 4;
+ public static final int CHILDRENID_FIELD_NUMBER = 3;
@SuppressWarnings("serial")
- private java.util.List children_;
+ private com.google.protobuf.LazyStringArrayList childrenId_ =
+ com.google.protobuf.LazyStringArrayList.emptyList();
/**
*
* 关联区段
*
*
- * repeated .state.Section children = 4;
+ * repeated string childrenId = 3;
+ * @return A list containing the childrenId.
*/
- @java.lang.Override
- public java.util.List getChildrenList() {
- return children_;
+ public com.google.protobuf.ProtocolStringList
+ getChildrenIdList() {
+ return childrenId_;
}
/**
*
* 关联区段
*
*
- * repeated .state.Section children = 4;
+ * repeated string childrenId = 3;
+ * @return The count of childrenId.
*/
- @java.lang.Override
- public java.util.List
- getChildrenOrBuilderList() {
- return children_;
+ public int getChildrenIdCount() {
+ return childrenId_.size();
}
/**
*
* 关联区段
*
*
- * repeated .state.Section children = 4;
+ * repeated string childrenId = 3;
+ * @param index The index of the element to return.
+ * @return The childrenId at the given index.
*/
- @java.lang.Override
- public int getChildrenCount() {
- return children_.size();
+ public java.lang.String getChildrenId(int index) {
+ return childrenId_.get(index);
}
/**
*
* 关联区段
*
*
- * repeated .state.Section children = 4;
+ * repeated string childrenId = 3;
+ * @param index The index of the value to return.
+ * @return The bytes of the childrenId at the given index.
*/
- @java.lang.Override
- public club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section getChildren(int index) {
- return children_.get(index);
- }
- /**
- *
- * 关联区段
- *
- *
- * repeated .state.Section children = 4;
- */
- @java.lang.Override
- public club.joylink.xiannccda.dto.protos.DeviceInfoProto.SectionOrBuilder getChildrenOrBuilder(
- int index) {
- return children_.get(index);
+ public com.google.protobuf.ByteString
+ getChildrenIdBytes(int index) {
+ return childrenId_.getByteString(index);
}
- public static final int KILOMETERSYSTEM_FIELD_NUMBER = 5;
+ public static final int KILOMETERSYSTEM_FIELD_NUMBER = 4;
@SuppressWarnings("serial")
private java.util.List kilometerSystem_;
/**
@@ -412,7 +377,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
@java.lang.Override
public java.util.Listrepeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
@java.lang.Override
public java.util.List
@@ -435,7 +400,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
@java.lang.Override
public int getKilometerSystemCount() {
@@ -446,7 +411,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
@java.lang.Override
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem getKilometerSystem(int index) {
@@ -457,7 +422,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
@java.lang.Override
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder getKilometerSystemOrBuilder(
@@ -465,7 +430,7 @@ public final class DeviceInfoProto {
return kilometerSystem_.get(index);
}
- public static final int CONVERTKILOMETER_FIELD_NUMBER = 7;
+ public static final int CONVERTKILOMETER_FIELD_NUMBER = 5;
@SuppressWarnings("serial")
private com.google.protobuf.Internal.LongList convertKilometer_;
/**
@@ -473,7 +438,7 @@ public final class DeviceInfoProto {
* 转换后的公里标数字
*
*
- * repeated int64 convertKilometer = 7;
+ * repeated int64 convertKilometer = 5;
* @return A list containing the convertKilometer.
*/
@java.lang.Override
@@ -486,7 +451,7 @@ public final class DeviceInfoProto {
* 转换后的公里标数字
*
*
- * repeated int64 convertKilometer = 7;
+ * repeated int64 convertKilometer = 5;
* @return The count of convertKilometer.
*/
public int getConvertKilometerCount() {
@@ -497,7 +462,7 @@ public final class DeviceInfoProto {
* 转换后的公里标数字
*
*
- * repeated int64 convertKilometer = 7;
+ * repeated int64 convertKilometer = 5;
* @param index The index of the element to return.
* @return The convertKilometer at the given index.
*/
@@ -506,6 +471,53 @@ public final class DeviceInfoProto {
}
private int convertKilometerMemoizedSerializedSize = -1;
+ public static final int PHYSICALSECTIONID_FIELD_NUMBER = 6;
+ @SuppressWarnings("serial")
+ private volatile java.lang.Object physicalSectionId_ = "";
+ /**
+ * + * 物理区段Id + *+ * + *
string physicalSectionId = 6;
+ * @return The physicalSectionId.
+ */
+ @java.lang.Override
+ public java.lang.String getPhysicalSectionId() {
+ java.lang.Object ref = physicalSectionId_;
+ 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();
+ physicalSectionId_ = s;
+ return s;
+ }
+ }
+ /**
+ * + * 物理区段Id + *+ * + *
string physicalSectionId = 6;
+ * @return The bytes for physicalSectionId.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString
+ getPhysicalSectionIdBytes() {
+ java.lang.Object ref = physicalSectionId_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ physicalSectionId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -527,22 +539,22 @@ public final class DeviceInfoProto {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, code_);
}
- if (type_ != club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType.Physical.getNumber()) {
- output.writeEnum(3, type_);
- }
- for (int i = 0; i < children_.size(); i++) {
- output.writeMessage(4, children_.get(i));
+ for (int i = 0; i < childrenId_.size(); i++) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 3, childrenId_.getRaw(i));
}
for (int i = 0; i < kilometerSystem_.size(); i++) {
- output.writeMessage(5, kilometerSystem_.get(i));
+ output.writeMessage(4, kilometerSystem_.get(i));
}
if (getConvertKilometerList().size() > 0) {
- output.writeUInt32NoTag(58);
+ output.writeUInt32NoTag(42);
output.writeUInt32NoTag(convertKilometerMemoizedSerializedSize);
}
for (int i = 0; i < convertKilometer_.size(); i++) {
output.writeInt64NoTag(convertKilometer_.getLong(i));
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(physicalSectionId_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 6, physicalSectionId_);
+ }
getUnknownFields().writeTo(output);
}
@@ -558,17 +570,17 @@ public final class DeviceInfoProto {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(code_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, code_);
}
- if (type_ != club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType.Physical.getNumber()) {
- size += com.google.protobuf.CodedOutputStream
- .computeEnumSize(3, type_);
- }
- for (int i = 0; i < children_.size(); i++) {
- size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(4, children_.get(i));
+ {
+ int dataSize = 0;
+ for (int i = 0; i < childrenId_.size(); i++) {
+ dataSize += computeStringSizeNoTag(childrenId_.getRaw(i));
+ }
+ size += dataSize;
+ size += 1 * getChildrenIdList().size();
}
for (int i = 0; i < kilometerSystem_.size(); i++) {
size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(5, kilometerSystem_.get(i));
+ .computeMessageSize(4, kilometerSystem_.get(i));
}
{
int dataSize = 0;
@@ -584,6 +596,9 @@ public final class DeviceInfoProto {
}
convertKilometerMemoizedSerializedSize = dataSize;
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(physicalSectionId_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, physicalSectionId_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
@@ -603,13 +618,14 @@ public final class DeviceInfoProto {
.equals(other.getId())) return false;
if (!getCode()
.equals(other.getCode())) return false;
- if (type_ != other.type_) return false;
- if (!getChildrenList()
- .equals(other.getChildrenList())) return false;
+ if (!getChildrenIdList()
+ .equals(other.getChildrenIdList())) return false;
if (!getKilometerSystemList()
.equals(other.getKilometerSystemList())) return false;
if (!getConvertKilometerList()
.equals(other.getConvertKilometerList())) return false;
+ if (!getPhysicalSectionId()
+ .equals(other.getPhysicalSectionId())) return false;
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}
@@ -625,11 +641,9 @@ public final class DeviceInfoProto {
hash = (53 * hash) + getId().hashCode();
hash = (37 * hash) + CODE_FIELD_NUMBER;
hash = (53 * hash) + getCode().hashCode();
- hash = (37 * hash) + TYPE_FIELD_NUMBER;
- hash = (53 * hash) + type_;
- if (getChildrenCount() > 0) {
- hash = (37 * hash) + CHILDREN_FIELD_NUMBER;
- hash = (53 * hash) + getChildrenList().hashCode();
+ if (getChildrenIdCount() > 0) {
+ hash = (37 * hash) + CHILDRENID_FIELD_NUMBER;
+ hash = (53 * hash) + getChildrenIdList().hashCode();
}
if (getKilometerSystemCount() > 0) {
hash = (37 * hash) + KILOMETERSYSTEM_FIELD_NUMBER;
@@ -639,6 +653,8 @@ public final class DeviceInfoProto {
hash = (37 * hash) + CONVERTKILOMETER_FIELD_NUMBER;
hash = (53 * hash) + getConvertKilometerList().hashCode();
}
+ hash = (37 * hash) + PHYSICALSECTIONID_FIELD_NUMBER;
+ hash = (53 * hash) + getPhysicalSectionId().hashCode();
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
@@ -776,22 +792,17 @@ public final class DeviceInfoProto {
bitField0_ = 0;
id_ = "";
code_ = "";
- type_ = 0;
- if (childrenBuilder_ == null) {
- children_ = java.util.Collections.emptyList();
- } else {
- children_ = null;
- childrenBuilder_.clear();
- }
- bitField0_ = (bitField0_ & ~0x00000008);
+ childrenId_ =
+ com.google.protobuf.LazyStringArrayList.emptyList();
if (kilometerSystemBuilder_ == null) {
kilometerSystem_ = java.util.Collections.emptyList();
} else {
kilometerSystem_ = null;
kilometerSystemBuilder_.clear();
}
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
convertKilometer_ = emptyLongList();
+ physicalSectionId_ = "";
return this;
}
@@ -825,27 +836,18 @@ public final class DeviceInfoProto {
}
private void buildPartialRepeatedFields(club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section result) {
- if (childrenBuilder_ == null) {
- if (((bitField0_ & 0x00000008) != 0)) {
- children_ = java.util.Collections.unmodifiableList(children_);
- bitField0_ = (bitField0_ & ~0x00000008);
- }
- result.children_ = children_;
- } else {
- result.children_ = childrenBuilder_.build();
- }
if (kilometerSystemBuilder_ == null) {
- if (((bitField0_ & 0x00000010) != 0)) {
+ if (((bitField0_ & 0x00000008) != 0)) {
kilometerSystem_ = java.util.Collections.unmodifiableList(kilometerSystem_);
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
}
result.kilometerSystem_ = kilometerSystem_;
} else {
result.kilometerSystem_ = kilometerSystemBuilder_.build();
}
- if (((bitField0_ & 0x00000020) != 0)) {
+ if (((bitField0_ & 0x00000010) != 0)) {
convertKilometer_.makeImmutable();
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
}
result.convertKilometer_ = convertKilometer_;
}
@@ -859,7 +861,11 @@ public final class DeviceInfoProto {
result.code_ = code_;
}
if (((from_bitField0_ & 0x00000004) != 0)) {
- result.type_ = type_;
+ childrenId_.makeImmutable();
+ result.childrenId_ = childrenId_;
+ }
+ if (((from_bitField0_ & 0x00000020) != 0)) {
+ result.physicalSectionId_ = physicalSectionId_;
}
}
@@ -885,40 +891,21 @@ public final class DeviceInfoProto {
bitField0_ |= 0x00000002;
onChanged();
}
- if (other.type_ != 0) {
- setTypeValue(other.getTypeValue());
- }
- if (childrenBuilder_ == null) {
- if (!other.children_.isEmpty()) {
- if (children_.isEmpty()) {
- children_ = other.children_;
- bitField0_ = (bitField0_ & ~0x00000008);
- } else {
- ensureChildrenIsMutable();
- children_.addAll(other.children_);
- }
- onChanged();
- }
- } else {
- if (!other.children_.isEmpty()) {
- if (childrenBuilder_.isEmpty()) {
- childrenBuilder_.dispose();
- childrenBuilder_ = null;
- children_ = other.children_;
- bitField0_ = (bitField0_ & ~0x00000008);
- childrenBuilder_ =
- com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
- getChildrenFieldBuilder() : null;
- } else {
- childrenBuilder_.addAllMessages(other.children_);
- }
+ if (!other.childrenId_.isEmpty()) {
+ if (childrenId_.isEmpty()) {
+ childrenId_ = other.childrenId_;
+ bitField0_ |= 0x00000004;
+ } else {
+ ensureChildrenIdIsMutable();
+ childrenId_.addAll(other.childrenId_);
}
+ onChanged();
}
if (kilometerSystemBuilder_ == null) {
if (!other.kilometerSystem_.isEmpty()) {
if (kilometerSystem_.isEmpty()) {
kilometerSystem_ = other.kilometerSystem_;
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
} else {
ensureKilometerSystemIsMutable();
kilometerSystem_.addAll(other.kilometerSystem_);
@@ -931,7 +918,7 @@ public final class DeviceInfoProto {
kilometerSystemBuilder_.dispose();
kilometerSystemBuilder_ = null;
kilometerSystem_ = other.kilometerSystem_;
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
kilometerSystemBuilder_ =
com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
getKilometerSystemFieldBuilder() : null;
@@ -943,13 +930,18 @@ public final class DeviceInfoProto {
if (!other.convertKilometer_.isEmpty()) {
if (convertKilometer_.isEmpty()) {
convertKilometer_ = other.convertKilometer_;
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000010);
} else {
ensureConvertKilometerIsMutable();
convertKilometer_.addAll(other.convertKilometer_);
}
onChanged();
}
+ if (!other.getPhysicalSectionId().isEmpty()) {
+ physicalSectionId_ = other.physicalSectionId_;
+ bitField0_ |= 0x00000020;
+ onChanged();
+ }
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
@@ -986,25 +978,13 @@ public final class DeviceInfoProto {
bitField0_ |= 0x00000002;
break;
} // case 18
- case 24: {
- type_ = input.readEnum();
- bitField0_ |= 0x00000004;
+ case 26: {
+ java.lang.String s = input.readStringRequireUtf8();
+ ensureChildrenIdIsMutable();
+ childrenId_.add(s);
break;
- } // case 24
+ } // case 26
case 34: {
- club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section m =
- input.readMessage(
- club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section.parser(),
- extensionRegistry);
- if (childrenBuilder_ == null) {
- ensureChildrenIsMutable();
- children_.add(m);
- } else {
- childrenBuilder_.addMessage(m);
- }
- break;
- } // case 34
- case 42: {
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem m =
input.readMessage(
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.parser(),
@@ -1016,14 +996,14 @@ public final class DeviceInfoProto {
kilometerSystemBuilder_.addMessage(m);
}
break;
- } // case 42
- case 56: {
+ } // case 34
+ case 40: {
long v = input.readInt64();
ensureConvertKilometerIsMutable();
convertKilometer_.addLong(v);
break;
- } // case 56
- case 58: {
+ } // case 40
+ case 42: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
ensureConvertKilometerIsMutable();
@@ -1032,7 +1012,12 @@ public final class DeviceInfoProto {
}
input.popLimit(limit);
break;
- } // case 58
+ } // case 42
+ case 50: {
+ physicalSectionId_ = input.readStringRequireUtf8();
+ bitField0_ |= 0x00000020;
+ break;
+ } // case 50
default: {
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
done = true; // was an endgroup tag
@@ -1214,152 +1199,131 @@ public final class DeviceInfoProto {
return this;
}
- private int type_ = 0;
- /**
- * - * 区段类型 - *- * - *
.graphicData.Section.SectionType type = 3;
- * @return The enum numeric value on the wire for type.
- */
- @java.lang.Override public int getTypeValue() {
- return type_;
+ private com.google.protobuf.LazyStringArrayList childrenId_ =
+ com.google.protobuf.LazyStringArrayList.emptyList();
+ private void ensureChildrenIdIsMutable() {
+ if (!childrenId_.isModifiable()) {
+ childrenId_ = new com.google.protobuf.LazyStringArrayList(childrenId_);
+ }
+ bitField0_ |= 0x00000004;
}
/**
*
- * 区段类型
+ * 关联区段
*
*
- * .graphicData.Section.SectionType type = 3;
- * @param value The enum numeric value on the wire for type to set.
+ * repeated string childrenId = 3;
+ * @return A list containing the childrenId.
+ */
+ public com.google.protobuf.ProtocolStringList
+ getChildrenIdList() {
+ childrenId_.makeImmutable();
+ return childrenId_;
+ }
+ /**
+ * + * 关联区段 + *+ * + *
repeated string childrenId = 3;
+ * @return The count of childrenId.
+ */
+ public int getChildrenIdCount() {
+ return childrenId_.size();
+ }
+ /**
+ * + * 关联区段 + *+ * + *
repeated string childrenId = 3;
+ * @param index The index of the element to return.
+ * @return The childrenId at the given index.
+ */
+ public java.lang.String getChildrenId(int index) {
+ return childrenId_.get(index);
+ }
+ /**
+ * + * 关联区段 + *+ * + *
repeated string childrenId = 3;
+ * @param index The index of the value to return.
+ * @return The bytes of the childrenId at the given index.
+ */
+ public com.google.protobuf.ByteString
+ getChildrenIdBytes(int index) {
+ return childrenId_.getByteString(index);
+ }
+ /**
+ * + * 关联区段 + *+ * + *
repeated string childrenId = 3;
+ * @param index The index to set the value at.
+ * @param value The childrenId to set.
* @return This builder for chaining.
*/
- public Builder setTypeValue(int value) {
- type_ = value;
+ public Builder setChildrenId(
+ int index, java.lang.String value) {
+ if (value == null) { throw new NullPointerException(); }
+ ensureChildrenIdIsMutable();
+ childrenId_.set(index, value);
bitField0_ |= 0x00000004;
onChanged();
return this;
}
/**
*
- * 区段类型
+ * 关联区段
*
*
- * .graphicData.Section.SectionType type = 3;
- * @return The type.
- */
- @java.lang.Override
- public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType getType() {
- club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType result = club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType.forNumber(type_);
- return result == null ? club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType.UNRECOGNIZED : result;
- }
- /**
- * - * 区段类型 - *- * - *
.graphicData.Section.SectionType type = 3;
- * @param value The type to set.
+ * repeated string childrenId = 3;
+ * @param value The childrenId to add.
* @return This builder for chaining.
*/
- public Builder setType(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.Section.SectionType value) {
- if (value == null) {
- throw new NullPointerException();
- }
+ public Builder addChildrenId(
+ java.lang.String value) {
+ if (value == null) { throw new NullPointerException(); }
+ ensureChildrenIdIsMutable();
+ childrenId_.add(value);
bitField0_ |= 0x00000004;
- type_ = value.getNumber();
onChanged();
return this;
}
/**
*
- * 区段类型
+ * 关联区段
*
*
- * .graphicData.Section.SectionType type = 3;
+ * repeated string childrenId = 3;
+ * @param values The childrenId to add.
* @return This builder for chaining.
*/
- public Builder clearType() {
- bitField0_ = (bitField0_ & ~0x00000004);
- type_ = 0;
+ public Builder addAllChildrenId(
+ java.lang.Iterable
* 关联区段
*
*
- * repeated .state.Section children = 4;
+ * repeated string childrenId = 3;
+ * @return This builder for chaining.
*/
- public java.util.List- * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public int getChildrenCount() {
- if (childrenBuilder_ == null) {
- return children_.size();
- } else {
- return childrenBuilder_.getCount();
- }
- }
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section getChildren(int index) {
- if (childrenBuilder_ == null) {
- return children_.get(index);
- } else {
- return childrenBuilder_.getMessage(index);
- }
- }
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public Builder setChildren(
- int index, club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section value) {
- if (childrenBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
- }
- ensureChildrenIsMutable();
- children_.set(index, value);
- onChanged();
- } else {
- childrenBuilder_.setMessage(index, value);
- }
+ public Builder clearChildrenId() {
+ childrenId_ =
+ com.google.protobuf.LazyStringArrayList.emptyList();
+ bitField0_ = (bitField0_ & ~0x00000004);;
+ onChanged();
return this;
}
/**
@@ -1367,244 +1331,27 @@ public final class DeviceInfoProto {
* 关联区段
*
*
- * repeated .state.Section children = 4;
+ * repeated string childrenId = 3;
+ * @param value The bytes of the childrenId to add.
+ * @return This builder for chaining.
*/
- public Builder setChildren(
- int index, club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section.Builder builderForValue) {
- if (childrenBuilder_ == null) {
- ensureChildrenIsMutable();
- children_.set(index, builderForValue.build());
- onChanged();
- } else {
- childrenBuilder_.setMessage(index, builderForValue.build());
- }
+ public Builder addChildrenIdBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) { throw new NullPointerException(); }
+ checkByteStringIsUtf8(value);
+ ensureChildrenIdIsMutable();
+ childrenId_.add(value);
+ bitField0_ |= 0x00000004;
+ onChanged();
return this;
}
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public Builder addChildren(club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section value) {
- if (childrenBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
- }
- ensureChildrenIsMutable();
- children_.add(value);
- onChanged();
- } else {
- childrenBuilder_.addMessage(value);
- }
- return this;
- }
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public Builder addChildren(
- int index, club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section value) {
- if (childrenBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
- }
- ensureChildrenIsMutable();
- children_.add(index, value);
- onChanged();
- } else {
- childrenBuilder_.addMessage(index, value);
- }
- return this;
- }
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public Builder addChildren(
- club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section.Builder builderForValue) {
- if (childrenBuilder_ == null) {
- ensureChildrenIsMutable();
- children_.add(builderForValue.build());
- onChanged();
- } else {
- childrenBuilder_.addMessage(builderForValue.build());
- }
- return this;
- }
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public Builder addChildren(
- int index, club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section.Builder builderForValue) {
- if (childrenBuilder_ == null) {
- ensureChildrenIsMutable();
- children_.add(index, builderForValue.build());
- onChanged();
- } else {
- childrenBuilder_.addMessage(index, builderForValue.build());
- }
- return this;
- }
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public Builder addAllChildren(
- java.lang.Iterable values) {
- if (childrenBuilder_ == null) {
- ensureChildrenIsMutable();
- com.google.protobuf.AbstractMessageLite.Builder.addAll(
- values, children_);
- onChanged();
- } else {
- childrenBuilder_.addAllMessages(values);
- }
- return this;
- }
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public Builder clearChildren() {
- if (childrenBuilder_ == null) {
- children_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000008);
- onChanged();
- } else {
- childrenBuilder_.clear();
- }
- return this;
- }
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public Builder removeChildren(int index) {
- if (childrenBuilder_ == null) {
- ensureChildrenIsMutable();
- children_.remove(index);
- onChanged();
- } else {
- childrenBuilder_.remove(index);
- }
- return this;
- }
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section.Builder getChildrenBuilder(
- int index) {
- return getChildrenFieldBuilder().getBuilder(index);
- }
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public club.joylink.xiannccda.dto.protos.DeviceInfoProto.SectionOrBuilder getChildrenOrBuilder(
- int index) {
- if (childrenBuilder_ == null) {
- return children_.get(index); } else {
- return childrenBuilder_.getMessageOrBuilder(index);
- }
- }
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public java.util.List
- getChildrenOrBuilderList() {
- if (childrenBuilder_ != null) {
- return childrenBuilder_.getMessageOrBuilderList();
- } else {
- return java.util.Collections.unmodifiableList(children_);
- }
- }
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section.Builder addChildrenBuilder() {
- return getChildrenFieldBuilder().addBuilder(
- club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section.getDefaultInstance());
- }
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section.Builder addChildrenBuilder(
- int index) {
- return getChildrenFieldBuilder().addBuilder(
- index, club.joylink.xiannccda.dto.protos.DeviceInfoProto.Section.getDefaultInstance());
- }
- /**
- * - * 关联区段 - *- * - *
repeated .state.Section children = 4;
- */
- public java.util.Listrepeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public java.util.Listrepeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public int getKilometerSystemCount() {
if (kilometerSystemBuilder_ == null) {
@@ -1644,7 +1391,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem getKilometerSystem(int index) {
if (kilometerSystemBuilder_ == null) {
@@ -1658,7 +1405,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public Builder setKilometerSystem(
int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem value) {
@@ -1679,7 +1426,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public Builder setKilometerSystem(
int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder builderForValue) {
@@ -1697,7 +1444,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public Builder addKilometerSystem(club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem value) {
if (kilometerSystemBuilder_ == null) {
@@ -1717,7 +1464,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public Builder addKilometerSystem(
int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem value) {
@@ -1738,7 +1485,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public Builder addKilometerSystem(
club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder builderForValue) {
@@ -1756,7 +1503,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public Builder addKilometerSystem(
int index, club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder builderForValue) {
@@ -1774,7 +1521,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public Builder addAllKilometerSystem(
java.lang.Iterable values) {
@@ -1793,12 +1540,12 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public Builder clearKilometerSystem() {
if (kilometerSystemBuilder_ == null) {
kilometerSystem_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000010);
+ bitField0_ = (bitField0_ & ~0x00000008);
onChanged();
} else {
kilometerSystemBuilder_.clear();
@@ -1810,7 +1557,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public Builder removeKilometerSystem(int index) {
if (kilometerSystemBuilder_ == null) {
@@ -1827,7 +1574,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder getKilometerSystemBuilder(
int index) {
@@ -1838,7 +1585,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystemOrBuilder getKilometerSystemOrBuilder(
int index) {
@@ -1852,7 +1599,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public java.util.List
getKilometerSystemOrBuilderList() {
@@ -1867,7 +1614,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder addKilometerSystemBuilder() {
return getKilometerSystemFieldBuilder().addBuilder(
@@ -1878,7 +1625,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public club.joylink.xiannccda.dto.protos.LayoutGraphicsProto.KilometerSystem.Builder addKilometerSystemBuilder(
int index) {
@@ -1890,7 +1637,7 @@ public final class DeviceInfoProto {
* 公里标
*
*
- * repeated .graphicData.KilometerSystem kilometerSystem = 5;
+ * repeated .graphicData.KilometerSystem kilometerSystem = 4;
*/
public java.util.Listrepeated int64 convertKilometer = 7;
+ * repeated int64 convertKilometer = 5;
* @return A list containing the convertKilometer.
*/
public java.util.Listrepeated int64 convertKilometer = 7;
+ * repeated int64 convertKilometer = 5;
* @return The count of convertKilometer.
*/
public int getConvertKilometerCount() {
@@ -1947,7 +1694,7 @@ public final class DeviceInfoProto {
* 转换后的公里标数字
*
*
- * repeated int64 convertKilometer = 7;
+ * repeated int64 convertKilometer = 5;
* @param index The index of the element to return.
* @return The convertKilometer at the given index.
*/
@@ -1959,7 +1706,7 @@ public final class DeviceInfoProto {
* 转换后的公里标数字
*
*
- * repeated int64 convertKilometer = 7;
+ * repeated int64 convertKilometer = 5;
* @param index The index to set the value at.
* @param value The convertKilometer to set.
* @return This builder for chaining.
@@ -1977,7 +1724,7 @@ public final class DeviceInfoProto {
* 转换后的公里标数字
*
*
- * repeated int64 convertKilometer = 7;
+ * repeated int64 convertKilometer = 5;
* @param value The convertKilometer to add.
* @return This builder for chaining.
*/
@@ -1993,7 +1740,7 @@ public final class DeviceInfoProto {
* 转换后的公里标数字
*
*
- * repeated int64 convertKilometer = 7;
+ * repeated int64 convertKilometer = 5;
* @param values The convertKilometer to add.
* @return This builder for chaining.
*/
@@ -2010,15 +1757,107 @@ public final class DeviceInfoProto {
* 转换后的公里标数字
*
*
- * repeated int64 convertKilometer = 7;
+ * repeated int64 convertKilometer = 5;
* @return This builder for chaining.
*/
public Builder clearConvertKilometer() {
convertKilometer_ = emptyLongList();
+ bitField0_ = (bitField0_ & ~0x00000010);
+ onChanged();
+ return this;
+ }
+
+ private java.lang.Object physicalSectionId_ = "";
+ /**
+ * + * 物理区段Id + *+ * + *
string physicalSectionId = 6;
+ * @return The physicalSectionId.
+ */
+ public java.lang.String getPhysicalSectionId() {
+ java.lang.Object ref = physicalSectionId_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs =
+ (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ physicalSectionId_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * + * 物理区段Id + *+ * + *
string physicalSectionId = 6;
+ * @return The bytes for physicalSectionId.
+ */
+ public com.google.protobuf.ByteString
+ getPhysicalSectionIdBytes() {
+ java.lang.Object ref = physicalSectionId_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ physicalSectionId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * + * 物理区段Id + *+ * + *
string physicalSectionId = 6;
+ * @param value The physicalSectionId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setPhysicalSectionId(
+ java.lang.String value) {
+ if (value == null) { throw new NullPointerException(); }
+ physicalSectionId_ = value;
+ bitField0_ |= 0x00000020;
+ onChanged();
+ return this;
+ }
+ /**
+ * + * 物理区段Id + *+ * + *
string physicalSectionId = 6;
+ * @return This builder for chaining.
+ */
+ public Builder clearPhysicalSectionId() {
+ physicalSectionId_ = getDefaultInstance().getPhysicalSectionId();
bitField0_ = (bitField0_ & ~0x00000020);
onChanged();
return this;
}
+ /**
+ * + * 物理区段Id + *+ * + *
string physicalSectionId = 6;
+ * @param value The bytes for physicalSectionId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setPhysicalSectionIdBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) { throw new NullPointerException(); }
+ checkByteStringIsUtf8(value);
+ physicalSectionId_ = value;
+ bitField0_ |= 0x00000020;
+ onChanged();
+ return this;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -3509,16 +3348,16 @@ public final class DeviceInfoProto {
static {
java.lang.String[] descriptorData = {
"\n\021device_info.proto\022\005state\032\033stationLayou" +
- "tGraphics.proto\"\306\001\n\007Section\022\n\n\002id\030\001 \001(\t\022" +
- "\014\n\004code\030\002 \001(\t\022.\n\004type\030\003 \001(\0162 .graphicDat" +
- "a.Section.SectionType\022 \n\010children\030\004 \003(\0132" +
- "\016.state.Section\0225\n\017kilometerSystem\030\005 \003(\013" +
- "2\034.graphicData.KilometerSystem\022\030\n\020conver" +
- "tKilometer\030\007 \003(\003\"t\n\007Turnout\022\n\n\002id\030\001 \001(\t\022" +
- "\014\n\004code\030\002 \001(\t\0225\n\017kilometerSystem\030\003 \003(\0132\034" +
- ".graphicData.KilometerSystem\022\030\n\020convertK" +
- "ilometer\030\004 \003(\003B4\n!club.joylink.xiannccda" +
- ".dto.protosB\017DeviceInfoProtob\006proto3"
+ "tGraphics.proto\"\243\001\n\007Section\022\n\n\002id\030\001 \001(\t\022" +
+ "\014\n\004code\030\002 \001(\t\022\022\n\nchildrenId\030\003 \003(\t\0225\n\017kil" +
+ "ometerSystem\030\004 \003(\0132\034.graphicData.Kilomet" +
+ "erSystem\022\030\n\020convertKilometer\030\005 \003(\003\022\031\n\021ph" +
+ "ysicalSectionId\030\006 \001(\t\"t\n\007Turnout\022\n\n\002id\030\001" +
+ " \001(\t\022\014\n\004code\030\002 \001(\t\0225\n\017kilometerSystem\030\003 " +
+ "\003(\0132\034.graphicData.KilometerSystem\022\030\n\020con" +
+ "vertKilometer\030\004 \003(\003B4\n!club.joylink.xian" +
+ "nccda.dto.protosB\017DeviceInfoProtob\006proto" +
+ "3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -3530,7 +3369,7 @@ public final class DeviceInfoProto {
internal_static_state_Section_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_state_Section_descriptor,
- new java.lang.String[] { "Id", "Code", "Type", "Children", "KilometerSystem", "ConvertKilometer", });
+ new java.lang.String[] { "Id", "Code", "ChildrenId", "KilometerSystem", "ConvertKilometer", "PhysicalSectionId", });
internal_static_state_Turnout_descriptor =
getDescriptor().getMessageTypes().get(1);
internal_static_state_Turnout_fieldAccessorTable = new
diff --git a/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java b/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java
index 77c4791..de9e470 100644
--- a/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java
+++ b/src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java
@@ -31811,7 +31811,7 @@ public final class LayoutGraphicsProto {
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -31821,7 +31821,7 @@ public final class LayoutGraphicsProto {
getChildrenList();
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -31830,7 +31830,7 @@ public final class LayoutGraphicsProto {
int getChildrenCount();
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -31840,7 +31840,7 @@ public final class LayoutGraphicsProto {
java.lang.String getChildren(int index);
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -32308,7 +32308,7 @@ public final class LayoutGraphicsProto {
com.google.protobuf.LazyStringArrayList.emptyList();
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -32320,7 +32320,7 @@ public final class LayoutGraphicsProto {
}
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -32331,7 +32331,7 @@ public final class LayoutGraphicsProto {
}
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -32343,7 +32343,7 @@ public final class LayoutGraphicsProto {
}
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -33975,7 +33975,7 @@ public final class LayoutGraphicsProto {
}
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -33988,7 +33988,7 @@ public final class LayoutGraphicsProto {
}
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -33999,7 +33999,7 @@ public final class LayoutGraphicsProto {
}
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -34011,7 +34011,7 @@ public final class LayoutGraphicsProto {
}
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -34024,7 +34024,7 @@ public final class LayoutGraphicsProto {
}
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -34043,7 +34043,7 @@ public final class LayoutGraphicsProto {
}
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -34061,7 +34061,7 @@ public final class LayoutGraphicsProto {
}
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -34079,7 +34079,7 @@ public final class LayoutGraphicsProto {
}
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
@@ -34094,7 +34094,7 @@ public final class LayoutGraphicsProto {
}
/**
*
- * 下属逻辑区段id(非岔区)
+ * 下属逻辑区段id(非岔区)/下属道岔id(岔区)
*
*
* repeated string children = 8;
diff --git a/xian-ncc-da-message b/xian-ncc-da-message
index f1dfb5e..90b6f46 160000
--- a/xian-ncc-da-message
+++ b/xian-ncc-da-message
@@ -1 +1 @@
-Subproject commit f1dfb5e4bdcce8df58c34c0c2cbce545db559a68
+Subproject commit 90b6f4600e531c496d849163653acb80c6e933ea