Pārlūkot izejas kodu

解决崩溃bug,message二次析构,导致崩溃

zx 5 gadi atpakaļ
vecāks
revīzija
741b00f7e6

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 292 - 292
message/hardware_message.pb.cc


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 265 - 265
message/hardware_message.pb.h


+ 5 - 5
message/hardware_message.proto

@@ -2,7 +2,7 @@ syntax = "proto2";
 package message;
 import "message_base.proto";
 
-enum Hardware_statu        //硬件状态
+enum Robot_statu        //硬件状态
 {
     eNormal=0;             //正常且空闲
     eBusy=1;               //工作中
@@ -23,7 +23,7 @@ message Position
 //搬运器状态
 message Carrier_status
 {
-    required Hardware_statu             statu=1;                   //状态
+    required Robot_statu             statu=1;                   //状态
     optional int32                      command_id=2;                   //指令唯一标识符id
     optional string                     error_description=3;       //搬运器错误信息(可无)
     required Position                   position=4;                //搬运器位置(z表示电梯位置)
@@ -31,7 +31,7 @@ message Carrier_status
 }
 
 //搬运机构各个零部件状态
-message Harware_statu_msg
+message Robot_statu_msg
 {
     required Message_type               msg_type=1;                 //消息类型
     required Carrier_status             carrier1_statu=2;           //搬运器1状态
@@ -46,7 +46,7 @@ enum Action_type
 }
 
 //执行搬运请求
-message Execute_request_msg
+message Robot_carry_request_msg
 {
     required Base_info                   msg_info=1;         //消息类型                         //消息类型
     required int32                      command_id=2;                   //指令唯一标识符id
@@ -57,7 +57,7 @@ message Execute_request_msg
 }
 
 //搬运动作执行完成后反馈结果
-message Execute_response_msg
+message Robot_carry_response_msg
 {
     required Base_info                   msg_info=1;                    //消息类型
     required int32                      command_id=2;                   //指令唯一标识符id

+ 1 - 1
proto.sh

@@ -1,6 +1,6 @@
 protoc -I=./message message_base.proto --cpp_out=./message
 protoc -I=./message measure_message.proto --cpp_out=./message
-protoc -I=./message hardware_message.proto --cpp_out=./message
+protoc -I=./message robot_message.proto --cpp_out=./message
 protoc -I=./message parkspace_allocation_message.proto --cpp_out=./message
 protoc -I=./message terminal_message.proto --cpp_out=./message
 protoc -I=./message process_message.proto --cpp_out=./message

+ 3 - 2
test/Terminal_communication.cpp

@@ -245,8 +245,9 @@ Error_manager Terminal_communication::pickup_request(message::Pickup_command_req
                 return Error_manager(PARKSPACE_RELEASE_RESPONSE_INFO_ERROR, MAJOR_ERROR,
                                      "parkspace release response msg info error");
             }
-            response=m_pickup_response_msg;
-            m_pickup_response_msg=message::Pickup_command_response_msg();
+            response.CopyFrom(m_pickup_response_msg);
+            m_pickup_response_msg.clear_base_info();
+            //m_pickup_response_msg=message::Pickup_command_response_msg();
             return SUCCESS;
 
         }