Преглед на файлове

20211115 base message update.
align 1.border min y; 2.border status;
3.incomplete cloud check

yct преди 3 години
родител
ревизия
63ba632bed
променени са 4 файла, в които са добавени 341 реда и са изтрити 159 реда
  1. 2 1
      .gitignore
  2. 208 129
      message/message_base.pb.cc
  3. 113 21
      message/message_base.pb.h
  4. 18 8
      message/message_base.proto

+ 2 - 1
.gitignore

@@ -142,4 +142,5 @@ CCCoreLibExport.h
 *.pb
 *ckpt*
 *.weights
-*.pb*
+*.pb*
+cmake-build-debug/

+ 208 - 129
message/message_base.pb.cc

@@ -224,14 +224,16 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUT
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Car_info, car_width_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Car_info, car_height_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Car_info, license_),
+  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Car_info, car_numberplate_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Car_info, car_wheel_base_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Car_info, car_wheel_width_),
-  1,
   2,
   3,
-  0,
   4,
+  0,
+  1,
   5,
+  6,
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Parkspace_info, _has_bits_),
   GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::message::Parkspace_info, _internal_metadata_),
   ~0u,  // no _extensions_
@@ -277,8 +279,8 @@ static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROT
   { 13, 19, sizeof(::message::Base_msg)},
   { 20, 28, sizeof(::message::Error_manager)},
   { 31, 48, sizeof(::message::Locate_information)},
-  { 60, 71, sizeof(::message::Car_info)},
-  { 77, 99, sizeof(::message::Parkspace_info)},
+  { 60, 72, sizeof(::message::Car_info)},
+  { 79, 101, sizeof(::message::Parkspace_info)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
@@ -329,102 +331,109 @@ void AddDescriptorsImpl() {
       "idth\030\010 \001(\002:\0010\022\035\n\016locate_correct\030\t \001(\010:\005f"
       "alse\022\035\n\022locate_front_theta\030\n \001(\002:\0010\022\027\n\017u"
       "niformed_car_x\030\013 \001(\002\022\027\n\017uniformed_car_y\030"
-      "\014 \001(\002\"\230\001\n\010Car_info\022\025\n\ncar_length\030\001 \001(\002:\001"
+      "\014 \001(\002\"\263\001\n\010Car_info\022\025\n\ncar_length\030\001 \001(\002:\001"
       "0\022\024\n\tcar_width\030\002 \001(\002:\0010\022\025\n\ncar_height\030\003 "
-      "\001(\002:\0010\022\021\n\007license\030\004 \001(\t:\000\022\031\n\016car_wheel_b"
-      "ase\030\005 \001(\002:\0010\022\032\n\017car_wheel_width\030\006 \001(\002:\0010"
-      "\"\375\004\n\016Parkspace_info\022\035\n\025parkingspace_inde"
-      "x_id\030\001 \001(\005\0222\n\021parkingspace_type\030\002 \001(\0162\027."
-      "message.Parkspace_type\022\034\n\024parkingspace_u"
-      "nit_id\030\003 \001(\005\022\035\n\025parkingspace_label_id\030\004 "
-      "\001(\005\022\034\n\024parkingspace_room_id\030\005 \001(\005\0222\n\026par"
-      "kingspace_direction\030\006 \001(\0162\022.message.Dire"
-      "ction\022\035\n\025parkingspace_floor_id\030\007 \001(\005\022\032\n\022"
-      "parkingspace_width\030\010 \001(\002\022\033\n\023parkingspace"
-      "_height\030\t \001(\002\0226\n\023parkingspace_status\030\n \001"
-      "(\0162\031.message.Parkspace_status\022#\n\010car_inf"
-      "o\030\013 \001(\0132\021.message.Car_info\022\022\n\nentry_time"
-      "\030\014 \001(\t\022\022\n\nleave_time\030\r \001(\t\022/\n\016parkspace_"
-      "path\030\016 \001(\0162\027.message.Parkspace_path\022\032\n\022p"
-      "ath_estimate_time\030\017 \001(\002\022:\n\027parkspace_sta"
-      "tus_target\030\020 \001(\0162\031.message.Parkspace_sta"
-      "tus\022#\n\010car_type\030\021 \001(\0162\021.message.Car_type"
-      "*\345\n\n\014Message_type\022\r\n\teBase_msg\020\000\022\020\n\014eCom"
-      "mand_msg\020\001\022\026\n\022eLocate_status_msg\020\021\022\027\n\023eL"
-      "ocate_request_msg\020\022\022\030\n\024eLocate_response_"
-      "msg\020\023\022\034\n\030eLocate_sift_request_msg\020\024\022\035\n\031e"
-      "Locate_sift_response_msg\020\025\022\030\n\024eDispatch_"
-      "status_msg\020!\022\031\n\025eDispatch_request_msg\020\"\022"
-      "\032\n\026eDispatch_response_msg\020#\022$\n eParkspac"
-      "e_allocation_status_msg\0201\022%\n!eParkspace_"
-      "allocation_request_msg\0202\022&\n\"eParkspace_a"
-      "llocation_response_msg\0203\022!\n\035eParkspace_s"
-      "earch_request_msg\0204\022\"\n\036eParkspace_search"
-      "_response_msg\0205\022\"\n\036eParkspace_release_re"
-      "quest_msg\0206\022#\n\037eParkspace_release_respon"
-      "se_msg\0207\022\'\n#eParkspace_force_update_requ"
-      "est_msg\0208\022(\n$eParkspace_force_update_res"
-      "ponse_msg\0209\022(\n$eParkspace_confirm_alloc_"
-      "request_msg\020:\022)\n%eParkspace_confirm_allo"
-      "c_response_msg\020;\022\"\n\036eParkspace_allocatio"
-      "n_data_msg\020<\022+\n\'eParkspace_allocation_da"
-      "ta_response_msg\020=\022\036\n\032eStore_command_requ"
-      "est_msg\020A\022\037\n\033eStore_command_response_msg"
-      "\020B\022\037\n\033ePickup_command_request_msg\020C\022 \n\034e"
-      "Pickup_command_response_msg\020D\022\037\n\032eStorin"
-      "g_process_statu_msg\020\220\001\022\037\n\032ePicking_proce"
-      "ss_statu_msg\020\221\001\022\"\n\035eCentral_controller_s"
-      "tatu_msg\020\240\001\022#\n\036eEntrance_manual_operatio"
-      "n_msg\020\260\001\022\"\n\035eProcess_manual_operation_ms"
-      "g\020\261\001\022\037\n\032eDispatch_plan_request_msg\020\340\001\022 \n"
-      "\033eDispatch_plan_response_msg\020\341\001\022\"\n\035eDisp"
-      "atch_control_request_msg\020\342\001\022#\n\036eDispatch"
-      "_control_response_msg\020\343\001\022!\n\034eDispatch_ma"
-      "nager_status_msg\020\352\001\022\037\n\032eDispatch_manager"
-      "_data_msg\020\353\001\022\037\n\032eGround_detect_request_m"
-      "sg\020\360\001\022 \n\033eGround_detect_response_msg\020\361\001\022"
-      "\027\n\022eGround_status_msg\020\362\001*\271\001\n\014Communicato"
-      "r\022\n\n\006eEmpty\020\000\022\t\n\005eMain\020\001\022\016\n\teTerminor\020\200\002"
-      "\022\017\n\neParkspace\020\200\004\022\016\n\teMeasurer\020\200\006\022\032\n\025eMe"
-      "asurer_sift_server\020\201\006\022\026\n\021eDispatch_manag"
-      "er\020\200\010\022\026\n\021eDispatch_control\020\201\010\022\025\n\020eGround"
-      "_measurer\020\200\036**\n\014Process_type\022\014\n\010eStoring"
-      "\020\001\022\014\n\010ePicking\020\002*e\n\013Error_level\022\n\n\006NORMA"
-      "L\020\000\022\024\n\020NEGLIGIBLE_ERROR\020\001\022\017\n\013MINOR_ERROR"
-      "\020\002\022\017\n\013MAJOR_ERROR\020\003\022\022\n\016CRITICAL_ERROR\020\004*"
-      "\245\001\n\020Parkspace_status\022\034\n\030eParkspace_statu"
-      "s_unknow\020\000\022\024\n\020eParkspace_empty\020\001\022\027\n\023ePar"
-      "kspace_occupied\020\002\022\027\n\023eParkspace_reserved"
-      "\020\003\022\025\n\021eParkspace_locked\020\004\022\024\n\020eParkspace_"
-      "error\020\005*\?\n\tDirection\022\025\n\021eDirection_unkno"
-      "w\020\000\022\014\n\010eForward\020\001\022\r\n\teBackward\020\002*l\n\016Park"
-      "space_path\022\017\n\013UNKNOW_PATH\020\000\022\020\n\014OPTIMAL_P"
-      "ATH\020\001\022\r\n\tLEFT_PATH\020\002\022\016\n\nRIGHT_PATH\020\003\022\030\n\024"
-      "TEMPORARY_CACHE_PATH\020\004*m\n\016Parkspace_type"
-      "\022\031\n\025UNKNOW_PARKSPACE_TYPE\020\000\022\024\n\020MIN_PARKI"
-      "NGSPACE\020\001\022\024\n\020MID_PARKINGSPACE\020\002\022\024\n\020BIG_P"
-      "ARKINGSPACE\020\003*F\n\010Car_type\022\023\n\017UNKNOW_CAR_"
-      "TYPE\020\000\022\013\n\007MIN_CAR\020\001\022\013\n\007MID_CAR\020\002\022\013\n\007BIG_"
-      "CAR\020\003*\335\002\n\tStep_type\022\017\n\013eAlloc_step\020\000\022\021\n\r"
-      "eMeasure_step\020\001\022\021\n\reCompare_step\020\002\022\022\n\016eD"
-      "ispatch_step\020\003\022\021\n\reConfirm_step\020\004\022\020\n\014eSe"
-      "arch_step\020\005\022\016\n\neWait_step\020\006\022\021\n\reRelease_"
-      "step\020\007\022\r\n\teComplete\020\010\022\025\n\021eBackConfirm_st"
-      "ep\020\t\022\026\n\022eBack_compare_step\020\n\022\025\n\021eBackMea"
-      "sure_step\020\013\022\023\n\017eBackAlloc_step\020\014\022\022\n\016eBac"
-      "kWait_step\020\r\022\026\n\022eBackDispatch_step\020\016\022\024\n\020"
-      "eBackSearch_step\020\017\022\021\n\reBackComplete\020\020*C\n"
-      "\nStep_statu\022\014\n\010eWaiting\020\000\022\014\n\010eWorking\020\001\022"
-      "\n\n\006eError\020\002\022\r\n\teFinished\020\003*\370\001\n\024Dispatch_"
-      "device_type\022\013\n\007ROBOT_1\020e\022\013\n\007ROBOT_2\020f\022\016\n"
-      "\tCARRIER_1\020\310\001\022\016\n\tCARRIER_2\020\317\001\022\016\n\tCARRIER"
-      "_3\020\313\001\022\021\n\014PASSAGEWAY_0\020\254\002\022\021\n\014PASSAGEWAY_1"
-      "\020\255\002\022\021\n\014PASSAGEWAY_2\020\256\002\022\021\n\014PASSAGEWAY_3\020\257"
-      "\002\022\021\n\014PASSAGEWAY_4\020\260\002\022\021\n\014PASSAGEWAY_5\020\261\002\022"
-      "\021\n\014PASSAGEWAY_6\020\262\002\022\021\n\014PASSAGEWAY_7\020\263\002"
+      "\001(\002:\0010\022\021\n\007license\030\004 \001(\t:\000\022\031\n\017car_numberP"
+      "late\030\005 \001(\t:\000\022\031\n\016car_wheel_base\030\006 \001(\002:\0010\022"
+      "\032\n\017car_wheel_width\030\007 \001(\002:\0010\"\375\004\n\016Parkspac"
+      "e_info\022\035\n\025parkingspace_index_id\030\001 \001(\005\0222\n"
+      "\021parkingspace_type\030\002 \001(\0162\027.message.Parks"
+      "pace_type\022\034\n\024parkingspace_unit_id\030\003 \001(\005\022"
+      "\035\n\025parkingspace_label_id\030\004 \001(\005\022\034\n\024parkin"
+      "gspace_room_id\030\005 \001(\005\0222\n\026parkingspace_dir"
+      "ection\030\006 \001(\0162\022.message.Direction\022\035\n\025park"
+      "ingspace_floor_id\030\007 \001(\005\022\032\n\022parkingspace_"
+      "width\030\010 \001(\002\022\033\n\023parkingspace_height\030\t \001(\002"
+      "\0226\n\023parkingspace_status\030\n \001(\0162\031.message."
+      "Parkspace_status\022#\n\010car_info\030\013 \001(\0132\021.mes"
+      "sage.Car_info\022\022\n\nentry_time\030\014 \001(\t\022\022\n\nlea"
+      "ve_time\030\r \001(\t\022/\n\016parkspace_path\030\016 \001(\0162\027."
+      "message.Parkspace_path\022\032\n\022path_estimate_"
+      "time\030\017 \001(\002\022:\n\027parkspace_status_target\030\020 "
+      "\001(\0162\031.message.Parkspace_status\022#\n\010car_ty"
+      "pe\030\021 \001(\0162\021.message.Car_type*\307\014\n\014Message_"
+      "type\022\r\n\teBase_msg\020\000\022\020\n\014eCommand_msg\020\001\022\026\n"
+      "\022eLocate_status_msg\020\021\022\027\n\023eLocate_request"
+      "_msg\020\022\022\030\n\024eLocate_response_msg\020\023\022\034\n\030eLoc"
+      "ate_sift_request_msg\020\024\022\035\n\031eLocate_sift_r"
+      "esponse_msg\020\025\022\030\n\024eDispatch_status_msg\020!\022"
+      "\031\n\025eDispatch_request_msg\020\"\022\032\n\026eDispatch_"
+      "response_msg\020#\022$\n eParkspace_allocation_"
+      "status_msg\0201\022%\n!eParkspace_allocation_re"
+      "quest_msg\0202\022&\n\"eParkspace_allocation_res"
+      "ponse_msg\0203\022!\n\035eParkspace_search_request"
+      "_msg\0204\022\"\n\036eParkspace_search_response_msg"
+      "\0205\022\"\n\036eParkspace_release_request_msg\0206\022#"
+      "\n\037eParkspace_release_response_msg\0207\022\'\n#e"
+      "Parkspace_force_update_request_msg\0208\022(\n$"
+      "eParkspace_force_update_response_msg\0209\022("
+      "\n$eParkspace_confirm_alloc_request_msg\020:"
+      "\022)\n%eParkspace_confirm_alloc_response_ms"
+      "g\020;\022\"\n\036eParkspace_allocation_data_msg\020<\022"
+      "+\n\'eParkspace_allocation_data_response_m"
+      "sg\020=\022(\n$eParkspace_manual_search_request"
+      "_msg\020>\022)\n%eParkspace_manual_search_respo"
+      "nse_msg\020\?\022\036\n\032eStore_command_request_msg\020"
+      "A\022\037\n\033eStore_command_response_msg\020B\022\037\n\033eP"
+      "ickup_command_request_msg\020C\022 \n\034ePickup_c"
+      "ommand_response_msg\020D\022\030\n\024eTerminal_statu"
+      "s_msg\020P\022\037\n\032eStoring_process_statu_msg\020\220\001"
+      "\022\037\n\032ePicking_process_statu_msg\020\221\001\022\"\n\035eCe"
+      "ntral_controller_statu_msg\020\240\001\022#\n\036eEntran"
+      "ce_manual_operation_msg\020\260\001\022\"\n\035eProcess_m"
+      "anual_operation_msg\020\261\001\022\030\n\023eNotify_reques"
+      "t_msg\020\300\001\022\031\n\024eNotify_response_msg\020\301\001\022\027\n\022e"
+      "Notify_status_msg\020\302\001\022#\n\036eUnNormalized_mo"
+      "dule_statu_msg\020\320\001\022\037\n\032eDispatch_plan_requ"
+      "est_msg\020\340\001\022 \n\033eDispatch_plan_response_ms"
+      "g\020\341\001\022\"\n\035eDispatch_control_request_msg\020\342\001"
+      "\022#\n\036eDispatch_control_response_msg\020\343\001\022!\n"
+      "\034eDispatch_manager_status_msg\020\352\001\022\037\n\032eDis"
+      "patch_manager_data_msg\020\353\001\022\037\n\032eGround_det"
+      "ect_request_msg\020\360\001\022 \n\033eGround_detect_res"
+      "ponse_msg\020\361\001\022\027\n\022eGround_status_msg\020\362\001*\307\001"
+      "\n\014Communicator\022\n\n\006eEmpty\020\000\022\t\n\005eMain\020\001\022\016\n"
+      "\teTerminor\020\200\002\022\017\n\neParkspace\020\200\004\022\016\n\teMeasu"
+      "rer\020\200\006\022\032\n\025eMeasurer_sift_server\020\201\006\022\026\n\021eD"
+      "ispatch_manager\020\200\010\022\026\n\021eDispatch_control\020"
+      "\201\010\022\014\n\007eNotify\020\201\n\022\025\n\020eGround_measurer\020\200\036*"
+      "*\n\014Process_type\022\014\n\010eStoring\020\001\022\014\n\010ePickin"
+      "g\020\002*e\n\013Error_level\022\n\n\006NORMAL\020\000\022\024\n\020NEGLIG"
+      "IBLE_ERROR\020\001\022\017\n\013MINOR_ERROR\020\002\022\017\n\013MAJOR_E"
+      "RROR\020\003\022\022\n\016CRITICAL_ERROR\020\004*\245\001\n\020Parkspace"
+      "_status\022\034\n\030eParkspace_status_unknow\020\000\022\024\n"
+      "\020eParkspace_empty\020\001\022\027\n\023eParkspace_occupi"
+      "ed\020\002\022\027\n\023eParkspace_reserved\020\003\022\025\n\021eParksp"
+      "ace_locked\020\004\022\024\n\020eParkspace_error\020\005*\?\n\tDi"
+      "rection\022\025\n\021eDirection_unknow\020\000\022\014\n\010eForwa"
+      "rd\020\001\022\r\n\teBackward\020\002*l\n\016Parkspace_path\022\017\n"
+      "\013UNKNOW_PATH\020\000\022\020\n\014OPTIMAL_PATH\020\001\022\r\n\tLEFT"
+      "_PATH\020\002\022\016\n\nRIGHT_PATH\020\003\022\030\n\024TEMPORARY_CAC"
+      "HE_PATH\020\004*m\n\016Parkspace_type\022\031\n\025UNKNOW_PA"
+      "RKSPACE_TYPE\020\000\022\024\n\020MIN_PARKINGSPACE\020\001\022\024\n\020"
+      "MID_PARKINGSPACE\020\002\022\024\n\020BIG_PARKINGSPACE\020\003"
+      "*F\n\010Car_type\022\023\n\017UNKNOW_CAR_TYPE\020\000\022\013\n\007MIN"
+      "_CAR\020\001\022\013\n\007MID_CAR\020\002\022\013\n\007BIG_CAR\020\003*\335\002\n\tSte"
+      "p_type\022\017\n\013eAlloc_step\020\000\022\021\n\reMeasure_step"
+      "\020\001\022\021\n\reCompare_step\020\002\022\022\n\016eDispatch_step\020"
+      "\003\022\021\n\reConfirm_step\020\004\022\020\n\014eSearch_step\020\005\022\016"
+      "\n\neWait_step\020\006\022\021\n\reRelease_step\020\007\022\r\n\teCo"
+      "mplete\020\010\022\025\n\021eBackConfirm_step\020\t\022\026\n\022eBack"
+      "_compare_step\020\n\022\025\n\021eBackMeasure_step\020\013\022\023"
+      "\n\017eBackAlloc_step\020\014\022\022\n\016eBackWait_step\020\r\022"
+      "\026\n\022eBackDispatch_step\020\016\022\024\n\020eBackSearch_s"
+      "tep\020\017\022\021\n\reBackComplete\020\020*C\n\nStep_statu\022\014"
+      "\n\010eWaiting\020\000\022\014\n\010eWorking\020\001\022\n\n\006eError\020\002\022\r"
+      "\n\teFinished\020\003*\370\001\n\024Dispatch_device_type\022\013"
+      "\n\007ROBOT_1\020e\022\013\n\007ROBOT_2\020f\022\016\n\tCARRIER_1\020\310\001"
+      "\022\016\n\tCARRIER_2\020\317\001\022\016\n\tCARRIER_3\020\313\001\022\021\n\014PASS"
+      "AGEWAY_0\020\254\002\022\021\n\014PASSAGEWAY_1\020\255\002\022\021\n\014PASSAG"
+      "EWAY_2\020\256\002\022\021\n\014PASSAGEWAY_3\020\257\002\022\021\n\014PASSAGEW"
+      "AY_4\020\260\002\022\021\n\014PASSAGEWAY_5\020\261\002\022\021\n\014PASSAGEWAY"
+      "_6\020\262\002\022\021\n\014PASSAGEWAY_7\020\263\002"
   };
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 4437);
+      descriptor, 4704);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "message_base.proto", &protobuf_RegisterTypes);
 }
@@ -470,15 +479,22 @@ bool Message_type_IsValid(int value) {
     case 59:
     case 60:
     case 61:
+    case 62:
+    case 63:
     case 65:
     case 66:
     case 67:
     case 68:
+    case 80:
     case 144:
     case 145:
     case 160:
     case 176:
     case 177:
+    case 192:
+    case 193:
+    case 194:
+    case 208:
     case 224:
     case 225:
     case 226:
@@ -508,6 +524,7 @@ bool Communicator_IsValid(int value) {
     case 769:
     case 1024:
     case 1025:
+    case 1281:
     case 3840:
       return true;
     default:
@@ -2313,6 +2330,7 @@ const int Car_info::kCarLengthFieldNumber;
 const int Car_info::kCarWidthFieldNumber;
 const int Car_info::kCarHeightFieldNumber;
 const int Car_info::kLicenseFieldNumber;
+const int Car_info::kCarNumberPlateFieldNumber;
 const int Car_info::kCarWheelBaseFieldNumber;
 const int Car_info::kCarWheelWidthFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
@@ -2333,6 +2351,10 @@ Car_info::Car_info(const Car_info& from)
   if (from.has_license()) {
     license_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.license_);
   }
+  car_numberplate_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  if (from.has_car_numberplate()) {
+    car_numberplate_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.car_numberplate_);
+  }
   ::memcpy(&car_length_, &from.car_length_,
     static_cast<size_t>(reinterpret_cast<char*>(&car_wheel_width_) -
     reinterpret_cast<char*>(&car_length_)) + sizeof(car_wheel_width_));
@@ -2341,6 +2363,7 @@ Car_info::Car_info(const Car_info& from)
 
 void Car_info::SharedCtor() {
   license_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  car_numberplate_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(&car_length_, 0, static_cast<size_t>(
       reinterpret_cast<char*>(&car_wheel_width_) -
       reinterpret_cast<char*>(&car_length_)) + sizeof(car_wheel_width_));
@@ -2353,6 +2376,7 @@ Car_info::~Car_info() {
 
 void Car_info::SharedDtor() {
   license_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  car_numberplate_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 
 void Car_info::SetCachedSize(int size) const {
@@ -2376,10 +2400,15 @@ void Car_info::Clear() {
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    license_.ClearNonDefaultToEmptyNoArena();
+  if (cached_has_bits & 3u) {
+    if (cached_has_bits & 0x00000001u) {
+      license_.ClearNonDefaultToEmptyNoArena();
+    }
+    if (cached_has_bits & 0x00000002u) {
+      car_numberplate_.ClearNonDefaultToEmptyNoArena();
+    }
   }
-  if (cached_has_bits & 62u) {
+  if (cached_has_bits & 124u) {
     ::memset(&car_length_, 0, static_cast<size_t>(
         reinterpret_cast<char*>(&car_wheel_width_) -
         reinterpret_cast<char*>(&car_length_)) + sizeof(car_wheel_width_));
@@ -2456,10 +2485,26 @@ bool Car_info::MergePartialFromCodedStream(
         break;
       }
 
-      // optional float car_wheel_base = 5 [default = 0];
+      // optional string car_numberPlate = 5 [default = ""];
       case 5: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(45u /* 45 & 0xFF */)) {
+            static_cast< ::google::protobuf::uint8>(42u /* 42 & 0xFF */)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_car_numberplate()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+            this->car_numberplate().data(), static_cast<int>(this->car_numberplate().length()),
+            ::google::protobuf::internal::WireFormat::PARSE,
+            "message.Car_info.car_numberPlate");
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
+      // optional float car_wheel_base = 6 [default = 0];
+      case 6: {
+        if (static_cast< ::google::protobuf::uint8>(tag) ==
+            static_cast< ::google::protobuf::uint8>(53u /* 53 & 0xFF */)) {
           set_has_car_wheel_base();
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
@@ -2470,10 +2515,10 @@ bool Car_info::MergePartialFromCodedStream(
         break;
       }
 
-      // optional float car_wheel_width = 6 [default = 0];
-      case 6: {
+      // optional float car_wheel_width = 7 [default = 0];
+      case 7: {
         if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(53u /* 53 & 0xFF */)) {
+            static_cast< ::google::protobuf::uint8>(61u /* 61 & 0xFF */)) {
           set_has_car_wheel_width();
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
@@ -2512,17 +2557,17 @@ void Car_info::SerializeWithCachedSizes(
 
   cached_has_bits = _has_bits_[0];
   // optional float car_length = 1 [default = 0];
-  if (cached_has_bits & 0x00000002u) {
+  if (cached_has_bits & 0x00000004u) {
     ::google::protobuf::internal::WireFormatLite::WriteFloat(1, this->car_length(), output);
   }
 
   // optional float car_width = 2 [default = 0];
-  if (cached_has_bits & 0x00000004u) {
+  if (cached_has_bits & 0x00000008u) {
     ::google::protobuf::internal::WireFormatLite::WriteFloat(2, this->car_width(), output);
   }
 
   // optional float car_height = 3 [default = 0];
-  if (cached_has_bits & 0x00000008u) {
+  if (cached_has_bits & 0x00000010u) {
     ::google::protobuf::internal::WireFormatLite::WriteFloat(3, this->car_height(), output);
   }
 
@@ -2536,14 +2581,24 @@ void Car_info::SerializeWithCachedSizes(
       4, this->license(), output);
   }
 
-  // optional float car_wheel_base = 5 [default = 0];
-  if (cached_has_bits & 0x00000010u) {
-    ::google::protobuf::internal::WireFormatLite::WriteFloat(5, this->car_wheel_base(), output);
+  // optional string car_numberPlate = 5 [default = ""];
+  if (cached_has_bits & 0x00000002u) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->car_numberplate().data(), static_cast<int>(this->car_numberplate().length()),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "message.Car_info.car_numberPlate");
+    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
+      5, this->car_numberplate(), output);
   }
 
-  // optional float car_wheel_width = 6 [default = 0];
+  // optional float car_wheel_base = 6 [default = 0];
   if (cached_has_bits & 0x00000020u) {
-    ::google::protobuf::internal::WireFormatLite::WriteFloat(6, this->car_wheel_width(), output);
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(6, this->car_wheel_base(), output);
+  }
+
+  // optional float car_wheel_width = 7 [default = 0];
+  if (cached_has_bits & 0x00000040u) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(7, this->car_wheel_width(), output);
   }
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -2562,17 +2617,17 @@ void Car_info::SerializeWithCachedSizes(
 
   cached_has_bits = _has_bits_[0];
   // optional float car_length = 1 [default = 0];
-  if (cached_has_bits & 0x00000002u) {
+  if (cached_has_bits & 0x00000004u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(1, this->car_length(), target);
   }
 
   // optional float car_width = 2 [default = 0];
-  if (cached_has_bits & 0x00000004u) {
+  if (cached_has_bits & 0x00000008u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(2, this->car_width(), target);
   }
 
   // optional float car_height = 3 [default = 0];
-  if (cached_has_bits & 0x00000008u) {
+  if (cached_has_bits & 0x00000010u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(3, this->car_height(), target);
   }
 
@@ -2587,14 +2642,25 @@ void Car_info::SerializeWithCachedSizes(
         4, this->license(), target);
   }
 
-  // optional float car_wheel_base = 5 [default = 0];
-  if (cached_has_bits & 0x00000010u) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(5, this->car_wheel_base(), target);
+  // optional string car_numberPlate = 5 [default = ""];
+  if (cached_has_bits & 0x00000002u) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
+      this->car_numberplate().data(), static_cast<int>(this->car_numberplate().length()),
+      ::google::protobuf::internal::WireFormat::SERIALIZE,
+      "message.Car_info.car_numberPlate");
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        5, this->car_numberplate(), target);
   }
 
-  // optional float car_wheel_width = 6 [default = 0];
+  // optional float car_wheel_base = 6 [default = 0];
   if (cached_has_bits & 0x00000020u) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(6, this->car_wheel_width(), target);
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(6, this->car_wheel_base(), target);
+  }
+
+  // optional float car_wheel_width = 7 [default = 0];
+  if (cached_has_bits & 0x00000040u) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(7, this->car_wheel_width(), target);
   }
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -2614,7 +2680,7 @@ size_t Car_info::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
         _internal_metadata_.unknown_fields());
   }
-  if (_has_bits_[0 / 32] & 63u) {
+  if (_has_bits_[0 / 32] & 127u) {
     // optional string license = 4 [default = ""];
     if (has_license()) {
       total_size += 1 +
@@ -2622,6 +2688,13 @@ size_t Car_info::ByteSizeLong() const {
           this->license());
     }
 
+    // optional string car_numberPlate = 5 [default = ""];
+    if (has_car_numberplate()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->car_numberplate());
+    }
+
     // optional float car_length = 1 [default = 0];
     if (has_car_length()) {
       total_size += 1 + 4;
@@ -2637,12 +2710,12 @@ size_t Car_info::ByteSizeLong() const {
       total_size += 1 + 4;
     }
 
-    // optional float car_wheel_base = 5 [default = 0];
+    // optional float car_wheel_base = 6 [default = 0];
     if (has_car_wheel_base()) {
       total_size += 1 + 4;
     }
 
-    // optional float car_wheel_width = 6 [default = 0];
+    // optional float car_wheel_width = 7 [default = 0];
     if (has_car_wheel_width()) {
       total_size += 1 + 4;
     }
@@ -2676,24 +2749,28 @@ void Car_info::MergeFrom(const Car_info& from) {
   (void) cached_has_bits;
 
   cached_has_bits = from._has_bits_[0];
-  if (cached_has_bits & 63u) {
+  if (cached_has_bits & 127u) {
     if (cached_has_bits & 0x00000001u) {
       set_has_license();
       license_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.license_);
     }
     if (cached_has_bits & 0x00000002u) {
-      car_length_ = from.car_length_;
+      set_has_car_numberplate();
+      car_numberplate_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.car_numberplate_);
     }
     if (cached_has_bits & 0x00000004u) {
-      car_width_ = from.car_width_;
+      car_length_ = from.car_length_;
     }
     if (cached_has_bits & 0x00000008u) {
-      car_height_ = from.car_height_;
+      car_width_ = from.car_width_;
     }
     if (cached_has_bits & 0x00000010u) {
-      car_wheel_base_ = from.car_wheel_base_;
+      car_height_ = from.car_height_;
     }
     if (cached_has_bits & 0x00000020u) {
+      car_wheel_base_ = from.car_wheel_base_;
+    }
+    if (cached_has_bits & 0x00000040u) {
       car_wheel_width_ = from.car_wheel_width_;
     }
     _has_bits_[0] |= cached_has_bits;
@@ -2726,6 +2803,8 @@ void Car_info::InternalSwap(Car_info* other) {
   using std::swap;
   license_.Swap(&other->license_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
+  car_numberplate_.Swap(&other->car_numberplate_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
+    GetArenaNoVirtual());
   swap(car_length_, other->car_length_);
   swap(car_width_, other->car_width_);
   swap(car_height_, other->car_height_);

+ 113 - 21
message/message_base.pb.h

@@ -102,15 +102,22 @@ enum Message_type {
   eParkspace_confirm_alloc_response_msg = 59,
   eParkspace_allocation_data_msg = 60,
   eParkspace_allocation_data_response_msg = 61,
+  eParkspace_manual_search_request_msg = 62,
+  eParkspace_manual_search_response_msg = 63,
   eStore_command_request_msg = 65,
   eStore_command_response_msg = 66,
   ePickup_command_request_msg = 67,
   ePickup_command_response_msg = 68,
+  eTerminal_status_msg = 80,
   eStoring_process_statu_msg = 144,
   ePicking_process_statu_msg = 145,
   eCentral_controller_statu_msg = 160,
   eEntrance_manual_operation_msg = 176,
   eProcess_manual_operation_msg = 177,
+  eNotify_request_msg = 192,
+  eNotify_response_msg = 193,
+  eNotify_status_msg = 194,
+  eUnNormalized_module_statu_msg = 208,
   eDispatch_plan_request_msg = 224,
   eDispatch_plan_response_msg = 225,
   eDispatch_control_request_msg = 226,
@@ -145,6 +152,7 @@ enum Communicator {
   eMeasurer_sift_server = 769,
   eDispatch_manager = 1024,
   eDispatch_control = 1025,
+  eNotify = 1281,
   eGround_measurer = 3840
 };
 bool Communicator_IsValid(int value);
@@ -1138,6 +1146,21 @@ class Car_info : public ::google::protobuf::Message /* @@protoc_insertion_point(
   ::std::string* release_license();
   void set_allocated_license(::std::string* license);
 
+  // optional string car_numberPlate = 5 [default = ""];
+  bool has_car_numberplate() const;
+  void clear_car_numberplate();
+  static const int kCarNumberPlateFieldNumber = 5;
+  const ::std::string& car_numberplate() const;
+  void set_car_numberplate(const ::std::string& value);
+  #if LANG_CXX11
+  void set_car_numberplate(::std::string&& value);
+  #endif
+  void set_car_numberplate(const char* value);
+  void set_car_numberplate(const char* value, size_t size);
+  ::std::string* mutable_car_numberplate();
+  ::std::string* release_car_numberplate();
+  void set_allocated_car_numberplate(::std::string* car_numberplate);
+
   // optional float car_length = 1 [default = 0];
   bool has_car_length() const;
   void clear_car_length();
@@ -1159,17 +1182,17 @@ class Car_info : public ::google::protobuf::Message /* @@protoc_insertion_point(
   float car_height() const;
   void set_car_height(float value);
 
-  // optional float car_wheel_base = 5 [default = 0];
+  // optional float car_wheel_base = 6 [default = 0];
   bool has_car_wheel_base() const;
   void clear_car_wheel_base();
-  static const int kCarWheelBaseFieldNumber = 5;
+  static const int kCarWheelBaseFieldNumber = 6;
   float car_wheel_base() const;
   void set_car_wheel_base(float value);
 
-  // optional float car_wheel_width = 6 [default = 0];
+  // optional float car_wheel_width = 7 [default = 0];
   bool has_car_wheel_width() const;
   void clear_car_wheel_width();
-  static const int kCarWheelWidthFieldNumber = 6;
+  static const int kCarWheelWidthFieldNumber = 7;
   float car_wheel_width() const;
   void set_car_wheel_width(float value);
 
@@ -1183,6 +1206,8 @@ class Car_info : public ::google::protobuf::Message /* @@protoc_insertion_point(
   void clear_has_car_height();
   void set_has_license();
   void clear_has_license();
+  void set_has_car_numberplate();
+  void clear_has_car_numberplate();
   void set_has_car_wheel_base();
   void clear_has_car_wheel_base();
   void set_has_car_wheel_width();
@@ -1192,6 +1217,7 @@ class Car_info : public ::google::protobuf::Message /* @@protoc_insertion_point(
   ::google::protobuf::internal::HasBits<1> _has_bits_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
   ::google::protobuf::internal::ArenaStringPtr license_;
+  ::google::protobuf::internal::ArenaStringPtr car_numberplate_;
   float car_length_;
   float car_width_;
   float car_height_;
@@ -2083,13 +2109,13 @@ inline void Locate_information::set_uniformed_car_y(float value) {
 
 // optional float car_length = 1 [default = 0];
 inline bool Car_info::has_car_length() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
 inline void Car_info::set_has_car_length() {
-  _has_bits_[0] |= 0x00000002u;
+  _has_bits_[0] |= 0x00000004u;
 }
 inline void Car_info::clear_has_car_length() {
-  _has_bits_[0] &= ~0x00000002u;
+  _has_bits_[0] &= ~0x00000004u;
 }
 inline void Car_info::clear_car_length() {
   car_length_ = 0;
@@ -2107,13 +2133,13 @@ inline void Car_info::set_car_length(float value) {
 
 // optional float car_width = 2 [default = 0];
 inline bool Car_info::has_car_width() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
+  return (_has_bits_[0] & 0x00000008u) != 0;
 }
 inline void Car_info::set_has_car_width() {
-  _has_bits_[0] |= 0x00000004u;
+  _has_bits_[0] |= 0x00000008u;
 }
 inline void Car_info::clear_has_car_width() {
-  _has_bits_[0] &= ~0x00000004u;
+  _has_bits_[0] &= ~0x00000008u;
 }
 inline void Car_info::clear_car_width() {
   car_width_ = 0;
@@ -2131,13 +2157,13 @@ inline void Car_info::set_car_width(float value) {
 
 // optional float car_height = 3 [default = 0];
 inline bool Car_info::has_car_height() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+  return (_has_bits_[0] & 0x00000010u) != 0;
 }
 inline void Car_info::set_has_car_height() {
-  _has_bits_[0] |= 0x00000008u;
+  _has_bits_[0] |= 0x00000010u;
 }
 inline void Car_info::clear_has_car_height() {
-  _has_bits_[0] &= ~0x00000008u;
+  _has_bits_[0] &= ~0x00000010u;
 }
 inline void Car_info::clear_car_height() {
   car_height_ = 0;
@@ -2219,15 +2245,81 @@ inline void Car_info::set_allocated_license(::std::string* license) {
   // @@protoc_insertion_point(field_set_allocated:message.Car_info.license)
 }
 
-// optional float car_wheel_base = 5 [default = 0];
+// optional string car_numberPlate = 5 [default = ""];
+inline bool Car_info::has_car_numberplate() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void Car_info::set_has_car_numberplate() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void Car_info::clear_has_car_numberplate() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void Car_info::clear_car_numberplate() {
+  car_numberplate_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+  clear_has_car_numberplate();
+}
+inline const ::std::string& Car_info::car_numberplate() const {
+  // @@protoc_insertion_point(field_get:message.Car_info.car_numberPlate)
+  return car_numberplate_.GetNoArena();
+}
+inline void Car_info::set_car_numberplate(const ::std::string& value) {
+  set_has_car_numberplate();
+  car_numberplate_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
+  // @@protoc_insertion_point(field_set:message.Car_info.car_numberPlate)
+}
+#if LANG_CXX11
+inline void Car_info::set_car_numberplate(::std::string&& value) {
+  set_has_car_numberplate();
+  car_numberplate_.SetNoArena(
+    &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
+  // @@protoc_insertion_point(field_set_rvalue:message.Car_info.car_numberPlate)
+}
+#endif
+inline void Car_info::set_car_numberplate(const char* value) {
+  GOOGLE_DCHECK(value != NULL);
+  set_has_car_numberplate();
+  car_numberplate_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
+  // @@protoc_insertion_point(field_set_char:message.Car_info.car_numberPlate)
+}
+inline void Car_info::set_car_numberplate(const char* value, size_t size) {
+  set_has_car_numberplate();
+  car_numberplate_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
+      ::std::string(reinterpret_cast<const char*>(value), size));
+  // @@protoc_insertion_point(field_set_pointer:message.Car_info.car_numberPlate)
+}
+inline ::std::string* Car_info::mutable_car_numberplate() {
+  set_has_car_numberplate();
+  // @@protoc_insertion_point(field_mutable:message.Car_info.car_numberPlate)
+  return car_numberplate_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+}
+inline ::std::string* Car_info::release_car_numberplate() {
+  // @@protoc_insertion_point(field_release:message.Car_info.car_numberPlate)
+  if (!has_car_numberplate()) {
+    return NULL;
+  }
+  clear_has_car_numberplate();
+  return car_numberplate_.ReleaseNonDefaultNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
+}
+inline void Car_info::set_allocated_car_numberplate(::std::string* car_numberplate) {
+  if (car_numberplate != NULL) {
+    set_has_car_numberplate();
+  } else {
+    clear_has_car_numberplate();
+  }
+  car_numberplate_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), car_numberplate);
+  // @@protoc_insertion_point(field_set_allocated:message.Car_info.car_numberPlate)
+}
+
+// optional float car_wheel_base = 6 [default = 0];
 inline bool Car_info::has_car_wheel_base() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+  return (_has_bits_[0] & 0x00000020u) != 0;
 }
 inline void Car_info::set_has_car_wheel_base() {
-  _has_bits_[0] |= 0x00000010u;
+  _has_bits_[0] |= 0x00000020u;
 }
 inline void Car_info::clear_has_car_wheel_base() {
-  _has_bits_[0] &= ~0x00000010u;
+  _has_bits_[0] &= ~0x00000020u;
 }
 inline void Car_info::clear_car_wheel_base() {
   car_wheel_base_ = 0;
@@ -2243,15 +2335,15 @@ inline void Car_info::set_car_wheel_base(float value) {
   // @@protoc_insertion_point(field_set:message.Car_info.car_wheel_base)
 }
 
-// optional float car_wheel_width = 6 [default = 0];
+// optional float car_wheel_width = 7 [default = 0];
 inline bool Car_info::has_car_wheel_width() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
+  return (_has_bits_[0] & 0x00000040u) != 0;
 }
 inline void Car_info::set_has_car_wheel_width() {
-  _has_bits_[0] |= 0x00000020u;
+  _has_bits_[0] |= 0x00000040u;
 }
 inline void Car_info::clear_has_car_wheel_width() {
-  _has_bits_[0] &= ~0x00000020u;
+  _has_bits_[0] &= ~0x00000040u;
 }
 inline void Car_info::clear_car_wheel_width() {
   car_wheel_width_ = 0;

+ 18 - 8
message/message_base.proto

@@ -32,13 +32,15 @@ enum Message_type
     eParkspace_confirm_alloc_response_msg = 0x3B;//确认分配车位反馈消息
     eParkspace_allocation_data_msg = 0x3C;     //车位分配模块车位数据消息
     eParkspace_allocation_data_response_msg =0x3D;//车位数据反馈消息
+    eParkspace_manual_search_request_msg = 0x3E;	//手动查询车位请求消息
+    eParkspace_manual_search_response_msg = 0x3F;//手动查询车位反馈消息
 
     eStore_command_request_msg=0x41;        //终端停车请求消息
     eStore_command_response_msg=0x42;       //停车请求反馈消息
     ePickup_command_request_msg=0x43;       //取车请求消息
     ePickup_command_response_msg=0x44;       //取车请求反馈消息
 
-
+    eTerminal_status_msg = 0x50;	 //终端状态消息
 
     eStoring_process_statu_msg=0x90;        //停车指令进度条消息
     ePicking_process_statu_msg=0x91;        //取车指令进度消息
@@ -50,6 +52,12 @@ enum Message_type
     eEntrance_manual_operation_msg=0xb0;            //针对出入口状态操作的手动消息
     eProcess_manual_operation_msg=0xb1;             //针对流程的手动消息
 
+    eNotify_request_msg=0xc0;               //取车等候区通知请求
+    eNotify_response_msg=0xc1;              //等候区反馈
+    eNotify_status_msg=0xc2;                //等候区通知节点状态
+
+    eUnNormalized_module_statu_msg = 0xd0; //非标节点状态
+;
     eDispatch_plan_request_msg          = 0xe0;     //调度总规划的请求(用于启动整个调度算法)(调度管理->调度算法)
     eDispatch_plan_response_msg         = 0xe1;     //调度总规划的答复(调度算法->调度管理)
     eDispatch_control_request_msg       = 0xe2;     //调度控制的任务请求(调度算法->调度管理)
@@ -82,7 +90,8 @@ enum Communicator
     //调度机构
     eDispatch_control=0x0401;
     //...
-
+  //取车等候区通知节点
+    eNotify=0x0501;
 
     //地面测量单元
 	eGround_measurer=0x0f00;
@@ -145,9 +154,9 @@ message Locate_information
     optional bool locate_correct = 9[default = false];		    //整车的校准标记位
 
     optional float locate_front_theta = 10[default = 0];	    //整车的前轮的旋转角
-    
-    optional float uniformed_car_x = 11;        //转角复位后,车辆中心点x
-    optional float uniformed_car_y = 12;        //转角复位后,车辆中心点y
+    optional float uniformed_car_x = 11;
+    optional float uniformed_car_y = 12;
+
 }
 
 //车辆基本信息
@@ -156,9 +165,10 @@ message Car_info
     optional float                      car_length=1[default = 0];           //车长
     optional float                      car_width=2[default = 0];            //车宽
     optional float                      car_height=3[default = 0];           //车高
-    optional string                     license=4[default = ""];              //车辆凭证号
-    optional float                      car_wheel_base = 5[default = 0];	    //整车的轮距; 前后轮的距离; 用于机器人或agv的抓车
-    optional float                      car_wheel_width = 6[default = 0];	//整车的轮距; 左右轮的距离; 用于机器人或agv的抓车
+    optional string                     license=4[default = ""];             //车辆凭证号(车牌号+唯一码)
+    optional string                     car_numberPlate = 5[default = ""];   //车牌号
+    optional float                      car_wheel_base = 6[default = 0];	 //整车的轮距; 前后轮的距离; 用于机器人或agv的抓车
+    optional float                      car_wheel_width = 7[default = 0];	 //整车的轮距; 左右轮的距离; 用于机器人或agv的抓车
 }
 
 //车位状态枚举