fix conflict
This commit is contained in:
@@ -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() );
|
||||
|
||||
Reference in New Issue
Block a user