yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt

Browse Source
This commit is contained in:
wangcongtao
2021-04-07 16:39:23 +08:00
parent 93c3b76380
commit ef0c0e1bba
5 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
View File

@@ -197,7 +197,6 @@ public class AMapWrapper implements IMogoMap {
@Override
public void showIndoorMap(boolean enable) {
if (checkAMap()) {
// TODO: 2020/5/27 显示室内地图
// mAMap.showIndoorMap( enable );
}
}
@@ -212,7 +211,6 @@ public class AMapWrapper implements IMogoMap {
@Override
public void stopAnimation() {
if (checkAMap()) {
// TODO: 2020/5/27 停止当前执行的改变地图状态的动画。
// mAMap.stopAnimation();
}
}

2
modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
View File

@@ -290,7 +290,6 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
marker.setPosition( cloudRoadData.getWgslat(), cloudRoadData.getWgslon() );
}
// TODO: 2021/3/23 后端算法提供显示颜色
marker.setAnchorColor( getModelRenderColor( cloudRoadData.getType(), cloudRoadData.getSpeed(), cloudRoadData.getWgslon(), cloudRoadData.getWgslat(), cloudRoadData.getHeading() ) );
if ( shouldShowSpeed( cloudRoadData.getType() ) ) {
@@ -371,7 +370,6 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
String resIdVal = null;
if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) {
options.set3DMode( true );
// TODO: 2021/3/23 后端算法提供显示颜色
options.anchorColor( getModelRenderColor( data.getType(), data.getSpeed(), data.getWgslon(), data.getWgslat(), data.getHeading() ) );
int resId = getModelRes( data.getType() );
resIdVal = resId + "";

19
modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
View File

@@ -48,6 +48,7 @@ import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.utils.GsonUtil;
import com.mogo.utils.storage.SharedPrefsMgr;
import org.json.JSONArray;
import org.json.JSONObject;
import java.io.BufferedReader;
@@ -840,16 +841,22 @@ public class MockIntentHandler implements IntentHandler {
}
}
List< ADASRecognizedResult > allList = new ArrayList<>();
// List< ADASRecognizedResult > allList = new ArrayList<>();
JSONArray jsonArray = new JSONArray( );
for ( BufferedReader reader : readers ) {
String line = reader.readLine();
ADASRecognizedResult adasRecognizedResult = GsonUtil.objectFromJson( line, ADASRecognizedResult.class );
if ( adasRecognizedResult != null ) {
allList.add( adasRecognizedResult );
}
// ADASRecognizedResult adasRecognizedResult = GsonUtil.objectFromJson( line, ADASRecognizedResult.class );
jsonArray.put( line );
// if ( adasRecognizedResult != null ) {
// allList.add( adasRecognizedResult );
// }
}
AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult( allList );
JSONObject object = new JSONObject();
object.put( "action", "view" );
object.put( "models", jsonArray );
MogoApisHandler.getInstance().getApis().getAdasControllerApi().mockAdasRecognized( object.toString() );
Log.i( "mock-timer-adas", "cost " + ( System.currentTimeMillis() - start ) + "ms" );
return true;
}

14
services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
View File

@@ -113,12 +113,11 @@ public interface IMogoADASController extends IProvider {
*
* @return
*/
List<ADASRecognizedResult> getLastADASRecognizedResult();
List< ADASRecognizedResult > getLastADASRecognizedResult();
/**
* 添加adas识别物体回调
*
*
* @param callback
*/
void addAdasRecognizedDataCallback( IMogoAdasRecognizedDataCallback callback );
@@ -139,6 +138,7 @@ public interface IMogoADASController extends IProvider {
/**
* 自动驾驶状态通知
*
* @param callback
*/
void addAdasOCHCallback( IMogoAdasOCHCallback callback );
@@ -152,6 +152,7 @@ public interface IMogoADASController extends IProvider {
/**
* 获取车辆自动驾驶状态
*
* @return
*/
int getAutopilotStatus();
@@ -160,18 +161,21 @@ public interface IMogoADASController extends IProvider {
/**
* 获取车身的定位纬度
*
* @return
*/
double getLastLat();
/**
* 获取车身定位经度
*
* @return
*/
double getLastLon();
/**
* 获取车身定位经度
*
* @return
*/
double getLastSpeed();
@@ -181,5 +185,9 @@ public interface IMogoADASController extends IProvider {
*/
void cancelAutopilot();
void mockAdasLoc(String json);
void mockAdasLoc( String json );
void mockAdasRecognized( List< ADASRecognizedResult > recognizedResults );
void mockAdasRecognized( String json );
}

19
services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
View File

@@ -185,6 +185,8 @@ public class MogoADASController implements IMogoADASController {
model.setDataAccuracy( bean.getDataAccuracy() );
model.setDistance( bean.getDistance() );
data.add( model );
Logger.d( TAG, "识别距离：x = %s, y = %s", model.getDistance_x(), model.getDistance_y() );
}
}
@@ -819,4 +821,21 @@ public class MogoADASController implements IMogoADASController {
mMogoAdasCarDataCallback.onAdasCarDataCallback( stateInf );
}
}
@Override
public void mockAdasRecognized( List< ADASRecognizedResult > recognizedResults ) {
if ( !mMogoAdasRecognizedDataCallbacks.isEmpty() ) {
for ( IMogoAdasRecognizedDataCallback callback : mMogoAdasRecognizedDataCallbacks ) {
if ( callback == null ) {
continue;
}
callback.onAdasDataCallback( recognizedResults );
}
}
}
@Override
public void mockAdasRecognized( String json ) {
mAutopolitDataCallBack.cameraEyeDetectResult( json );
}
}