20200629, 重定义message消息

message/measure_message.pb.cc

@@ -47,6 +47,7 @@ void InitDefaultsLocate_status_msgImpl() {
 #endif  // GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS
   protobuf_message_5fbase_2eproto::InitDefaultsBase_msg();
   protobuf_message_5fbase_2eproto::InitDefaultsLocate_information();
+  protobuf_message_5fbase_2eproto::InitDefaultsError_manager();
   {
     void* ptr = &::message::_Locate_status_msg_default_instance_;
     new (ptr) ::message::Locate_status_msg();
@@ -120,11 +121,13 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUT
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Locate_status_msg, laser_statu_vector_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Locate_status_msg, locate_manager_status_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Locate_status_msg, locate_information_realtime_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Locate_status_msg, error_manager_),
   0,
-  2,
-  ~0u,
   3,
+  ~0u,
+  4,
   1,
+  2,
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Locate_request_msg, _has_bits_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Locate_request_msg, _internal_metadata_),
   ~0u,  // no _extensions_
@@ -153,9 +156,9 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUT
   2,
 };
 static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 10, sizeof(::message::Locate_status_msg)},
-  { 15, 23, sizeof(::message::Locate_request_msg)},
-  { 26, 36, sizeof(::message::Locate_response_msg)},
+  { 0, 11, sizeof(::message::Locate_status_msg)},
+  { 17, 25, sizeof(::message::Locate_request_msg)},
+  { 28, 38, sizeof(::message::Locate_response_msg)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
@@ -187,36 +190,37 @@ void AddDescriptorsImpl() {
   InitDefaults();
   static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
       "\n\025measure_message.proto\022\007message\032\022messag"
-      "e_base.proto\"\250\002\n\021Locate_status_msg\022#\n\010ms"
+      "e_base.proto\"\327\002\n\021Locate_status_msg\022#\n\010ms"
       "g_type\030\001 \002(\0132\021.message.Base_msg\022;\n\024laser"
       "_manager_status\030\002 \002(\0162\035.message.Laser_ma"
       "nager_status\0220\n\022laser_statu_vector\030\003 \003(\016"
       "2\024.message.Laser_statu\022=\n\025locate_manager"
       "_status\030\004 \002(\0162\036.message.Locate_manager_s"
-      "tatus\022@\n\033locate_information_realtime\030\005 \002"
-      "(\0132\033.message.Locate_information\"b\n\022Locat"
-      "e_request_msg\022#\n\010msg_base\030\001 \002(\0132\021.messag"
-      "e.Base_msg\022\022\n\ncommand_id\030\002 \002(\005\022\023\n\013termin"
-      "al_id\030\003 \002(\005\"\313\001\n\023Locate_response_msg\022#\n\010m"
-      "sg_base\030\001 \002(\0132\021.message.Base_msg\022\022\n\ncomm"
-      "and_id\030\002 \002(\005\022\023\n\013terminal_id\030\003 \002(\005\0227\n\022loc"
-      "ate_information\030\004 \002(\0132\033.message.Locate_i"
-      "nformation\022-\n\rerror_manager\030\005 \002(\0132\026.mess"
-      "age.Error_manager*\237\001\n\024Laser_manager_stat"
-      "us\022\030\n\024LASER_MANAGER_UNKNOW\020\000\022\027\n\023LASER_MA"
-      "NAGER_READY\020\001\022\035\n\031LASER_MANAGER_ISSUED_TA"
-      "SK\020\002\022\034\n\030LASER_MANAGER_WAIT_REPLY\020\003\022\027\n\023LA"
-      "SER_MANAGER_FAULT\020\004*U\n\013Laser_statu\022\024\n\020LA"
-      "SER_DISCONNECT\020\000\022\017\n\013LASER_READY\020\001\022\016\n\nLAS"
-      "ER_BUSY\020\002\022\017\n\013LASER_FAULT\020\003*\261\001\n\025Locate_ma"
-      "nager_status\022\031\n\025LOCATE_MANAGER_UNKNOW\020\000\022"
-      "\030\n\024LOCATE_MANAGER_READY\020\001\022\027\n\023LOCATE_MANA"
-      "GER_SIFT\020\002\022\026\n\022LOCATE_MANAGER_CAR\020\003\022\030\n\024LO"
-      "CATE_MANAGER_WHEEL\020\004\022\030\n\024LOCATE_MANAGER_F"
-      "AULT\020\005"
+      "tatus\022@\n\033locate_information_realtime\030\005 \001"
+      "(\0132\033.message.Locate_information\022-\n\rerror"
+      "_manager\030\006 \002(\0132\026.message.Error_manager\"b"
+      "\n\022Locate_request_msg\022#\n\010msg_base\030\001 \002(\0132\021"
+      ".message.Base_msg\022\022\n\ncommand_id\030\002 \002(\005\022\023\n"
+      "\013terminal_id\030\003 \002(\005\"\313\001\n\023Locate_response_m"
+      "sg\022#\n\010msg_base\030\001 \002(\0132\021.message.Base_msg\022"
+      "\022\n\ncommand_id\030\002 \002(\005\022\023\n\013terminal_id\030\003 \002(\005"
+      "\0227\n\022locate_information\030\004 \001(\0132\033.message.L"
+      "ocate_information\022-\n\rerror_manager\030\005 \002(\013"
+      "2\026.message.Error_manager*\237\001\n\024Laser_manag"
+      "er_status\022\030\n\024LASER_MANAGER_UNKNOW\020\000\022\027\n\023L"
+      "ASER_MANAGER_READY\020\001\022\035\n\031LASER_MANAGER_IS"
+      "SUED_TASK\020\002\022\034\n\030LASER_MANAGER_WAIT_REPLY\020"
+      "\003\022\027\n\023LASER_MANAGER_FAULT\020\004*U\n\013Laser_stat"
+      "u\022\024\n\020LASER_DISCONNECT\020\000\022\017\n\013LASER_READY\020\001"
+      "\022\016\n\nLASER_BUSY\020\002\022\017\n\013LASER_FAULT\020\003*\261\001\n\025Lo"
+      "cate_manager_status\022\031\n\025LOCATE_MANAGER_UN"
+      "KNOW\020\000\022\030\n\024LOCATE_MANAGER_READY\020\001\022\027\n\023LOCA"
+      "TE_MANAGER_SIFT\020\002\022\026\n\022LOCATE_MANAGER_CAR\020"
+      "\003\022\030\n\024LOCATE_MANAGER_WHEEL\020\004\022\030\n\024LOCATE_MA"
+      "NAGER_FAULT\020\005"
   };
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 1086);
+      descriptor, 1133);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "measure_message.proto", &protobuf_RegisterTypes);
   ::protobuf_message_5fbase_2eproto::AddDescriptors();
@@ -293,6 +297,8 @@ void Locate_status_msg::InitAsDefaultInstance() {
       ::message::Base_msg::internal_default_instance());
   ::message::_Locate_status_msg_default_instance_._instance.get_mutable()->locate_information_realtime_ = const_cast< ::message::Locate_information*>(
       ::message::Locate_information::internal_default_instance());
+  ::message::_Locate_status_msg_default_instance_._instance.get_mutable()->error_manager_ = const_cast< ::message::Error_manager*>(
+      ::message::Error_manager::internal_default_instance());
 }
 void Locate_status_msg::clear_msg_type() {
   if (msg_type_ != NULL) msg_type_->Clear();
@@ -302,12 +308,17 @@ void Locate_status_msg::clear_locate_information_realtime() {
   if (locate_information_realtime_ != NULL) locate_information_realtime_->Clear();
   clear_has_locate_information_realtime();
 }
+void Locate_status_msg::clear_error_manager() {
+  if (error_manager_ != NULL) error_manager_->Clear();
+  clear_has_error_manager();
+}
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Locate_status_msg::kMsgTypeFieldNumber;
 const int Locate_status_msg::kLaserManagerStatusFieldNumber;
 const int Locate_status_msg::kLaserStatuVectorFieldNumber;
 const int Locate_status_msg::kLocateManagerStatusFieldNumber;
 const int Locate_status_msg::kLocateInformationRealtimeFieldNumber;
+const int Locate_status_msg::kErrorManagerFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Locate_status_msg::Locate_status_msg()
@@ -335,6 +346,11 @@ Locate_status_msg::Locate_status_msg(const Locate_status_msg& from)
   } else {
     locate_information_realtime_ = NULL;
   }
+  if (from.has_error_manager()) {
+    error_manager_ = new ::message::Error_manager(*from.error_manager_);
+  } else {
+    error_manager_ = NULL;
+  }
   ::memcpy(&laser_manager_status_, &from.laser_manager_status_,
     static_cast<size_t>(reinterpret_cast<char*>(&locate_manager_status_) -
     reinterpret_cast<char*>(&laser_manager_status_)) + sizeof(locate_manager_status_));
@@ -356,6 +372,7 @@ Locate_status_msg::~Locate_status_msg() {
 void Locate_status_msg::SharedDtor() {
   if (this != internal_default_instance()) delete msg_type_;
   if (this != internal_default_instance()) delete locate_information_realtime_;
+  if (this != internal_default_instance()) delete error_manager_;
 }
 
 void Locate_status_msg::SetCachedSize(int size) const {
@@ -389,7 +406,7 @@ void Locate_status_msg::Clear() {
 
   laser_statu_vector_.Clear();
   cached_has_bits = _has_bits_[0];
-  if (cached_has_bits & 3u) {
+  if (cached_has_bits & 7u) {
     if (cached_has_bits & 0x00000001u) {
       GOOGLE_DCHECK(msg_type_ != NULL);
       msg_type_->Clear();
@@ -398,8 +415,12 @@ void Locate_status_msg::Clear() {
       GOOGLE_DCHECK(locate_information_realtime_ != NULL);
       locate_information_realtime_->Clear();
     }
+    if (cached_has_bits & 0x00000004u) {
+      GOOGLE_DCHECK(error_manager_ != NULL);
+      error_manager_->Clear();
+    }
   }
-  if (cached_has_bits & 12u) {
+  if (cached_has_bits & 24u) {
     ::memset(&laser_manager_status_, 0, static_cast<size_t>(
         reinterpret_cast<char*>(&locate_manager_status_) -
         reinterpret_cast<char*>(&laser_manager_status_)) + sizeof(locate_manager_status_));
@@ -499,7 +520,7 @@ bool Locate_status_msg::MergePartialFromCodedStream(
         break;
       }
 
-      // required .message.Locate_information locate_information_realtime = 5;
+      // optional .message.Locate_information locate_information_realtime = 5;
       case 5: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(42u /* 42 & 0xFF */)) {
@@ -511,6 +532,18 @@ bool Locate_status_msg::MergePartialFromCodedStream(
         break;
       }
 
+      // required .message.Error_manager error_manager = 6;
+      case 6: {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(50u /* 50 & 0xFF */)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
+               input, mutable_error_manager()));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
       default: {
       handle_unusual:
         if (tag == 0) {
@@ -545,7 +578,7 @@ void Locate_status_msg::SerializeWithCachedSizes(
   }
 
   // required .message.Laser_manager_status laser_manager_status = 2;
-  if (cached_has_bits & 0x00000004u) {
+  if (cached_has_bits & 0x00000008u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       2, this->laser_manager_status(), output);
   }
@@ -557,17 +590,23 @@ void Locate_status_msg::SerializeWithCachedSizes(
   }
 
   // required .message.Locate_manager_status locate_manager_status = 4;
-  if (cached_has_bits & 0x00000008u) {
+  if (cached_has_bits & 0x00000010u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       4, this->locate_manager_status(), output);
   }
 
-  // required .message.Locate_information locate_information_realtime = 5;
+  // optional .message.Locate_information locate_information_realtime = 5;
   if (cached_has_bits & 0x00000002u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       5, *this->locate_information_realtime_, output);
   }
 
+  // required .message.Error_manager error_manager = 6;
+  if (cached_has_bits & 0x00000004u) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, *this->error_manager_, output);
+  }
+
   if (_internal_metadata_.have_unknown_fields()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
@@ -591,7 +630,7 @@ void Locate_status_msg::SerializeWithCachedSizes(
   }
 
   // required .message.Laser_manager_status laser_manager_status = 2;
-  if (cached_has_bits & 0x00000004u) {
+  if (cached_has_bits & 0x00000008u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       2, this->laser_manager_status(), target);
   }
@@ -601,18 +640,25 @@ void Locate_status_msg::SerializeWithCachedSizes(
     3, this->laser_statu_vector_, target);
 
   // required .message.Locate_manager_status locate_manager_status = 4;
-  if (cached_has_bits & 0x00000008u) {
+  if (cached_has_bits & 0x00000010u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       4, this->locate_manager_status(), target);
   }
 
-  // required .message.Locate_information locate_information_realtime = 5;
+  // optional .message.Locate_information locate_information_realtime = 5;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
         5, *this->locate_information_realtime_, deterministic, target);
   }
 
+  // required .message.Error_manager error_manager = 6;
+  if (cached_has_bits & 0x00000004u) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      InternalWriteMessageToArray(
+        6, *this->error_manager_, deterministic, target);
+  }
+
   if (_internal_metadata_.have_unknown_fields()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
@@ -632,11 +678,11 @@ size_t Locate_status_msg::RequiredFieldsByteSizeFallback() const {
         *this->msg_type_);
   }
 
-  if (has_locate_information_realtime()) {
-    // required .message.Locate_information locate_information_realtime = 5;
+  if (has_error_manager()) {
+    // required .message.Error_manager error_manager = 6;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
-        *this->locate_information_realtime_);
+        *this->error_manager_);
   }
 
   if (has_laser_manager_status()) {
@@ -662,16 +708,16 @@ size_t Locate_status_msg::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
         _internal_metadata_.unknown_fields());
   }
-  if (((_has_bits_[0] & 0x0000000f) ^ 0x0000000f) == 0) {  // All required fields are present.
+  if (((_has_bits_[0] & 0x0000001d) ^ 0x0000001d) == 0) {  // All required fields are present.
     // required .message.Base_msg msg_type = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
         *this->msg_type_);
 
-    // required .message.Locate_information locate_information_realtime = 5;
+    // required .message.Error_manager error_manager = 6;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
-        *this->locate_information_realtime_);
+        *this->error_manager_);
 
     // required .message.Laser_manager_status laser_manager_status = 2;
     total_size += 1 +
@@ -694,6 +740,13 @@ size_t Locate_status_msg::ByteSizeLong() const {
     total_size += (1UL * count) + data_size;
   }
 
+  // optional .message.Locate_information locate_information_realtime = 5;
+  if (has_locate_information_realtime()) {
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::MessageSize(
+        *this->locate_information_realtime_);
+  }
+
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = cached_size;
@@ -725,7 +778,7 @@ void Locate_status_msg::MergeFrom(const Locate_status_msg& from) {
 
   laser_statu_vector_.MergeFrom(from.laser_statu_vector_);
   cached_has_bits = from._has_bits_[0];
-  if (cached_has_bits & 15u) {
+  if (cached_has_bits & 31u) {
     if (cached_has_bits & 0x00000001u) {
       mutable_msg_type()->::message::Base_msg::MergeFrom(from.msg_type());
     }
@@ -733,9 +786,12 @@ void Locate_status_msg::MergeFrom(const Locate_status_msg& from) {
       mutable_locate_information_realtime()->::message::Locate_information::MergeFrom(from.locate_information_realtime());
     }
     if (cached_has_bits & 0x00000004u) {
-      laser_manager_status_ = from.laser_manager_status_;
+      mutable_error_manager()->::message::Error_manager::MergeFrom(from.error_manager());
     }
     if (cached_has_bits & 0x00000008u) {
+      laser_manager_status_ = from.laser_manager_status_;
+    }
+    if (cached_has_bits & 0x00000010u) {
       locate_manager_status_ = from.locate_manager_status_;
     }
     _has_bits_[0] |= cached_has_bits;
@@ -757,10 +813,13 @@ void Locate_status_msg::CopyFrom(const Locate_status_msg& from) {
 }
 
 bool Locate_status_msg::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+  if ((_has_bits_[0] & 0x0000001d) != 0x0000001d) return false;
   if (has_msg_type()) {
     if (!this->msg_type_->IsInitialized()) return false;
   }
+  if (has_error_manager()) {
+    if (!this->error_manager_->IsInitialized()) return false;
+  }
   return true;
 }
 
@@ -773,6 +832,7 @@ void Locate_status_msg::InternalSwap(Locate_status_msg* other) {
   laser_statu_vector_.InternalSwap(&other->laser_statu_vector_);
   swap(msg_type_, other->msg_type_);
   swap(locate_information_realtime_, other->locate_information_realtime_);
+  swap(error_manager_, other->error_manager_);
   swap(laser_manager_status_, other->laser_manager_status_);
   swap(locate_manager_status_, other->locate_manager_status_);
   swap(_has_bits_[0], other->_has_bits_[0]);
@@ -1346,7 +1406,7 @@ bool Locate_response_msg::MergePartialFromCodedStream(
         break;
       }
 
-      // required .message.Locate_information locate_information = 4;
+      // optional .message.Locate_information locate_information = 4;
       case 4: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
             static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) {
@@ -1413,7 +1473,7 @@ void Locate_response_msg::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->terminal_id(), output);
   }
 
-  // required .message.Locate_information locate_information = 4;
+  // optional .message.Locate_information locate_information = 4;
   if (cached_has_bits & 0x00000002u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       4, *this->locate_information_, output);
@@ -1457,7 +1517,7 @@ void Locate_response_msg::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->terminal_id(), target);
   }
 
-  // required .message.Locate_information locate_information = 4;
+  // optional .message.Locate_information locate_information = 4;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
@@ -1490,13 +1550,6 @@ size_t Locate_response_msg::RequiredFieldsByteSizeFallback() const {
         *this->msg_base_);
   }
 
-  if (has_locate_information()) {
-    // required .message.Locate_information locate_information = 4;
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSize(
-        *this->locate_information_);
-  }
-
   if (has_error_manager()) {
     // required .message.Error_manager error_manager = 5;
     total_size += 1 +
@@ -1529,17 +1582,12 @@ size_t Locate_response_msg::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
         _internal_metadata_.unknown_fields());
   }
-  if (((_has_bits_[0] & 0x0000001f) ^ 0x0000001f) == 0) {  // All required fields are present.
+  if (((_has_bits_[0] & 0x0000001d) ^ 0x0000001d) == 0) {  // All required fields are present.
     // required .message.Base_msg msg_base = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
         *this->msg_base_);
 
-    // required .message.Locate_information locate_information = 4;
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSize(
-        *this->locate_information_);
-
     // required .message.Error_manager error_manager = 5;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::MessageSize(
@@ -1558,6 +1606,13 @@ size_t Locate_response_msg::ByteSizeLong() const {
   } else {
     total_size += RequiredFieldsByteSizeFallback();
   }
+  // optional .message.Locate_information locate_information = 4;
+  if (has_locate_information()) {
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::MessageSize(
+        *this->locate_information_);
+  }
+
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = cached_size;
@@ -1623,7 +1678,7 @@ void Locate_response_msg::CopyFrom(const Locate_response_msg& from) {
 }
 
 bool Locate_response_msg::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
+  if ((_has_bits_[0] & 0x0000001d) != 0x0000001d) return false;
   if (has_msg_base()) {
     if (!this->msg_base_->IsInitialized()) return false;
   }

message/measure_message.pb.h

@@ -245,7 +245,7 @@ class Locate_status_msg : public ::google::protobuf::Message /* @@protoc_inserti
   ::message::Base_msg* mutable_msg_type();
   void set_allocated_msg_type(::message::Base_msg* msg_type);
 
-  // required .message.Locate_information locate_information_realtime = 5;
+  // optional .message.Locate_information locate_information_realtime = 5;
   bool has_locate_information_realtime() const;
   void clear_locate_information_realtime();
   static const int kLocateInformationRealtimeFieldNumber = 5;
@@ -254,6 +254,15 @@ class Locate_status_msg : public ::google::protobuf::Message /* @@protoc_inserti
   ::message::Locate_information* mutable_locate_information_realtime();
   void set_allocated_locate_information_realtime(::message::Locate_information* locate_information_realtime);
 
+  // required .message.Error_manager error_manager = 6;
+  bool has_error_manager() const;
+  void clear_error_manager();
+  static const int kErrorManagerFieldNumber = 6;
+  const ::message::Error_manager& error_manager() const;
+  ::message::Error_manager* release_error_manager();
+  ::message::Error_manager* mutable_error_manager();
+  void set_allocated_error_manager(::message::Error_manager* error_manager);
+
   // required .message.Laser_manager_status laser_manager_status = 2;
   bool has_laser_manager_status() const;
   void clear_laser_manager_status();
@@ -278,6 +287,8 @@ class Locate_status_msg : public ::google::protobuf::Message /* @@protoc_inserti
   void clear_has_locate_manager_status();
   void set_has_locate_information_realtime();
   void clear_has_locate_information_realtime();
+  void set_has_error_manager();
+  void clear_has_error_manager();
 
   // helper for ByteSizeLong()
   size_t RequiredFieldsByteSizeFallback() const;
@@ -288,6 +299,7 @@ class Locate_status_msg : public ::google::protobuf::Message /* @@protoc_inserti
   ::google::protobuf::RepeatedField<int> laser_statu_vector_;
   ::message::Base_msg* msg_type_;
   ::message::Locate_information* locate_information_realtime_;
+  ::message::Error_manager* error_manager_;
   int laser_manager_status_;
   int locate_manager_status_;
   friend struct ::protobuf_measure_5fmessage_2eproto::TableStruct;
@@ -528,7 +540,7 @@ class Locate_response_msg : public ::google::protobuf::Message /* @@protoc_inser
   ::message::Base_msg* mutable_msg_base();
   void set_allocated_msg_base(::message::Base_msg* msg_base);
 
-  // required .message.Locate_information locate_information = 4;
+  // optional .message.Locate_information locate_information = 4;
   bool has_locate_information() const;
   void clear_locate_information();
   static const int kLocateInformationFieldNumber = 4;
@@ -650,13 +662,13 @@ inline void Locate_status_msg::set_allocated_msg_type(::message::Base_msg* msg_t
 
 // required .message.Laser_manager_status laser_manager_status = 2;
 inline bool Locate_status_msg::has_laser_manager_status() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
+  return (_has_bits_[0] & 0x00000008u) != 0;
 }
 inline void Locate_status_msg::set_has_laser_manager_status() {
-  _has_bits_[0] |= 0x00000004u;
+  _has_bits_[0] |= 0x00000008u;
 }
 inline void Locate_status_msg::clear_has_laser_manager_status() {
-  _has_bits_[0] &= ~0x00000004u;
+  _has_bits_[0] &= ~0x00000008u;
 }
 inline void Locate_status_msg::clear_laser_manager_status() {
   laser_manager_status_ = 0;
@@ -707,13 +719,13 @@ Locate_status_msg::mutable_laser_statu_vector() {
 
 // required .message.Locate_manager_status locate_manager_status = 4;
 inline bool Locate_status_msg::has_locate_manager_status() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+  return (_has_bits_[0] & 0x00000010u) != 0;
 }
 inline void Locate_status_msg::set_has_locate_manager_status() {
-  _has_bits_[0] |= 0x00000008u;
+  _has_bits_[0] |= 0x00000010u;
 }
 inline void Locate_status_msg::clear_has_locate_manager_status() {
-  _has_bits_[0] &= ~0x00000008u;
+  _has_bits_[0] &= ~0x00000010u;
 }
 inline void Locate_status_msg::clear_locate_manager_status() {
   locate_manager_status_ = 0;
@@ -730,7 +742,7 @@ inline void Locate_status_msg::set_locate_manager_status(::message::Locate_manag
   // @@protoc_insertion_point(field_set:message.Locate_status_msg.locate_manager_status)
 }
 
-// required .message.Locate_information locate_information_realtime = 5;
+// optional .message.Locate_information locate_information_realtime = 5;
 inline bool Locate_status_msg::has_locate_information_realtime() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
@@ -780,6 +792,56 @@ inline void Locate_status_msg::set_allocated_locate_information_realtime(::messa
   // @@protoc_insertion_point(field_set_allocated:message.Locate_status_msg.locate_information_realtime)
 }
 
+// required .message.Error_manager error_manager = 6;
+inline bool Locate_status_msg::has_error_manager() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void Locate_status_msg::set_has_error_manager() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void Locate_status_msg::clear_has_error_manager() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline const ::message::Error_manager& Locate_status_msg::error_manager() const {
+  const ::message::Error_manager* p = error_manager_;
+  // @@protoc_insertion_point(field_get:message.Locate_status_msg.error_manager)
+  return p != NULL ? *p : *reinterpret_cast<const ::message::Error_manager*>(
+      &::message::_Error_manager_default_instance_);
+}
+inline ::message::Error_manager* Locate_status_msg::release_error_manager() {
+  // @@protoc_insertion_point(field_release:message.Locate_status_msg.error_manager)
+  clear_has_error_manager();
+  ::message::Error_manager* temp = error_manager_;
+  error_manager_ = NULL;
+  return temp;
+}
+inline ::message::Error_manager* Locate_status_msg::mutable_error_manager() {
+  set_has_error_manager();
+  if (error_manager_ == NULL) {
+    error_manager_ = new ::message::Error_manager;
+  }
+  // @@protoc_insertion_point(field_mutable:message.Locate_status_msg.error_manager)
+  return error_manager_;
+}
+inline void Locate_status_msg::set_allocated_error_manager(::message::Error_manager* error_manager) {
+  ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
+  if (message_arena == NULL) {
+    delete reinterpret_cast< ::google::protobuf::MessageLite*>(error_manager_);
+  }
+  if (error_manager) {
+    ::google::protobuf::Arena* submessage_arena = NULL;
+    if (message_arena != submessage_arena) {
+      error_manager = ::google::protobuf::internal::GetOwnedMessage(
+          message_arena, error_manager, submessage_arena);
+    }
+    set_has_error_manager();
+  } else {
+    clear_has_error_manager();
+  }
+  error_manager_ = error_manager;
+  // @@protoc_insertion_point(field_set_allocated:message.Locate_status_msg.error_manager)
+}
+
 // -------------------------------------------------------------------
 
 // Locate_request_msg
@@ -984,7 +1046,7 @@ inline void Locate_response_msg::set_terminal_id(::google::protobuf::int32 value
   // @@protoc_insertion_point(field_set:message.Locate_response_msg.terminal_id)
 }
 
-// required .message.Locate_information locate_information = 4;
+// optional .message.Locate_information locate_information = 4;
 inline bool Locate_response_msg::has_locate_information() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }

message/measure_message.proto

@@ -42,7 +42,8 @@ message Locate_status_msg
     repeated Laser_statu                laser_statu_vector = 3;
     required Locate_manager_status      locate_manager_status = 4;
 
-    required Locate_information         locate_information_realtime=5;  //地面雷达的 实时定位信息
+    optional Locate_information         locate_information_realtime=5;  //地面雷达的 实时定位信息
+    required Error_manager              error_manager = 6;
 }
 
 
@@ -60,7 +61,7 @@ message Locate_response_msg
     required Base_msg                   msg_base=1;                          //消息类型
     required int32                      command_id=2;                   //指令唯一标识符id
     required int32                      terminal_id=3;
-    required Locate_information         locate_information=4;
+    optional Locate_information         locate_information=4;
     required Error_manager              error_manager = 5;
 }