zhangjia преди 3 години
родител
ревизия
e71cf8428f
променени са 1 файла, в които са добавени 5 реда и са изтрити 1 реда
  1. 5 1
      src/decition/decition_brain_sf/decition/decide_gps_00.cpp

+ 5 - 1
src/decition/decition_brain_sf/decition/decide_gps_00.cpp

@@ -244,7 +244,11 @@ iv::decition::Decition iv::decition::DecideGps00::getDecideFromGPS(GPS_INS now_g
        }
        if(xgroupgrpcinfo.mutable_mvehinfo(front_car_id)->has_mcarstate()){
            front_car.vehState=xgroupgrpcinfo.mutable_mvehinfo(front_car_id)->mcarstate().mstate();
-           front_car.avoidX=xgroupgrpcinfo.mutable_mvehinfo(front_car_id)->mcarstate().mavoidx();
+           int avoidX_record=xgroupgrpcinfo.mutable_mvehinfo(front_car_id)->mcarstate().mavoidx();
+           if(front_car.vehState!=0&&avoidX_record!=0)
+                 front_car.avoidX=avoidX_record;
+           else
+                 front_car.avoidX=0;
            front_car.obs_distance=xgroupgrpcinfo.mutable_mvehinfo(front_car_id)->mcarstate().mobsdistance();
            front_car.obs_speed=xgroupgrpcinfo.mutable_mvehinfo(front_car_id)->mcarstate().mobsspeed();
        }