fix conflict

This commit is contained in:
lixiaopeng
2021-04-23 18:43:32 +08:00
parent cc08ef6a14
commit 390da88ced
13 changed files with 356 additions and 7 deletions

View File

@@ -169,6 +169,7 @@ public class MogoADASController implements IMogoADASController {
if ( bean == null ) {
continue;
}
//liyz
AdasAIDLOwnerCarRectModel model = new AdasAIDLOwnerCarRectModel();
model.setId( bean.getId() );
model.setXl( bean.getXl() );
@@ -190,6 +191,8 @@ public class MogoADASController implements IMogoADASController {
model.setSpeed( bean.getSpeed() );
model.setDataAccuracy( bean.getDataAccuracy() );
model.setDistance( bean.getDistance() );
data.add( model );
Logger.d( TAG, "识别距离x = %s, y = %s", model.getDistance_x(), model.getDistance_y() );