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

[Upload]

Browse Source 
整理ADAS模块
替换3D模型

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2022-01-27 11:26:23 +08:00
parent 3d0c86e323
commit 4b7ded6036
19 changed files with 15 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
View File

@@ -796,7 +796,6 @@ public class MogoServices implements IMogoMapListener,
mStatusManager.setSearchUIShow( TAG, false );
}
mUiController.recoverLockMode();
mADASController.showADAS();
} else {
mUiController.showMyLocation( false );
AIAssist.getInstance( mContext ).registerUnWakeupCommand( ServiceConst.CMD_BACK, ServiceConst.CMD_BACK_WORDS, this );

1
modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java
View File

@@ -140,7 +140,6 @@ abstract class StatusChangedAdapter implements IMogoStatusChangedListener {
mIsFirstAccOn = false;
return;
}
MogoApisHandler.getInstance().getApis().getAdasControllerApi().showADAS();
MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient(AbsMogoApplication.getApp()).start();
MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager(AbsMogoApplication.getApp()).removeMarkers();
UiThreadHandler.postDelayed(() -> {

82
modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java
View File

@@ -1,82 +0,0 @@
package com.mogo.module.service.autopilot;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
import com.mogo.service.cloud.socket.IMogoSocketManager;
public
/**
* @author congtaowang
* @since 2020/10/16
*
* 远端控制自动驾驶
*/
class AutoPilotRemoteController {
private static final String TAG = "AutoPilotRemoteController";
private static volatile AutoPilotRemoteController sInstance;
private IMogoSocketManager mMogoSocketManager;
private IMogoOnMessageListener<AutopilotControlParameters> mParametersListener = new IMogoOnMessageListener<AutopilotControlParameters>() {
@Override
public Class<AutopilotControlParameters> target() {
return AutopilotControlParameters.class;
}
@Override
public void onMsgReceived( AutopilotControlParameters obj ) {
if ( obj == null ) {
Logger.e( TAG, "远端控制参数为null", new NullPointerException() );
return;
}
String json = GsonUtil.jsonFromObject( obj );
Logger.d( TAG, json );
MogoApisHandler.getInstance().getApis().getAdasControllerApi().aiCloudToAdasData( obj );
}
};
/**
* 远端控制自动驾驶的消息类型
*/
public static final int MSG_TYPE_REMOTE_CONTROL_AUTOPILOT = 401014;
private AutoPilotRemoteController() {
mMogoSocketManager = MogoApisHandler.getInstance().getApis().getSocketManagerApi( AbsMogoApplication.getApp() );
}
public static AutoPilotRemoteController getInstance() {
if ( sInstance == null ) {
synchronized ( AutoPilotRemoteController.class ) {
if ( sInstance == null ) {
sInstance = new AutoPilotRemoteController();
}
}
}
return sInstance;
}
public void start() {
mMogoSocketManager.registerOnMessageListener( MSG_TYPE_REMOTE_CONTROL_AUTOPILOT, mParametersListener );
}
public synchronized void release() {
sInstance = null;
if ( mMogoSocketManager != null ) {
mMogoSocketManager.unregisterOnMessageListener( MSG_TYPE_REMOTE_CONTROL_AUTOPILOT, mParametersListener );
}
mMogoSocketManager = null;
mParametersListener = null;
}
private Object readResolve() {
// 阻止反序列化，必须实现 Serializable 接口
return sInstance;
}
}

4
modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java
View File

@@ -35,8 +35,8 @@ import java.util.List;
//负责监听自动驾驶状态并进行状态上报，自动驾驶路线上报，接收调度指令展示指令弹窗
public class DispatchAutoPilotManager implements IMogoOnMessageListener<DispatchAdasAutoPilotLocReceiverBean>
, IDispatchRemindClickListener
, IMogoCarLocationChangedListener2, IMogoAdasOCHCallback, IMoGoCheckAutoPilotBtnListener, IMoGoAutopilotPlanningListener {
, IDispatchRemindClickListener, IMogoCarLocationChangedListener2, IMogoAdasOCHCallback,
IMoGoCheckAutoPilotBtnListener, IMoGoAutopilotPlanningListener {
private static final String TAG = "DispatchAutoPilotManager";
private static volatile DispatchAutoPilotManager instance;

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

@@ -411,22 +411,6 @@ public class MockIntentHandler implements IntentHandler {
}
});
break;
case 43://
MogoApisHandler.getInstance()
.getApis()
.getAdasControllerApi()
.onAutopilotArriveLike(intent.getIntExtra("type", 8));
break;
case 44:// 控制自动驾驶
AutopilotControlParameters parameters = new AutopilotControlParameters();
parameters.vehicleType = 9;
parameters.startLatLon = new AutopilotControlParameters.AutoPilotLonLat(40.1690522746, 116.567374558);
parameters.endLatLon = new AutopilotControlParameters.AutoPilotLonLat(40.1651999405, 116.567217441);
MogoApisHandler.getInstance()
.getApis()
.getAdasControllerApi()
.aiCloudToAdasData(parameters);
break;
case 45:// 测试开启鹰眼模式
MogoApisHandler.getInstance()
.getApis()

19
modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
View File

@@ -1,11 +1,8 @@
package com.mogo.module.service.routeoverlay;
import android.content.Context;
import android.location.Location;
import android.os.SystemClock;
import android.util.Log;
import com.mogo.cloud.commons.utils.CoordinateUtils;
import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
@@ -21,9 +18,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager;
import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.map.navi.IMogoCarLocationChangedListener2;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.service.adas.IMogoAdasOCHCallback;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -31,7 +26,9 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener, IMoGoAutopilotStatusListener, IMoGoMapLocationListener, IMogoAdasOCHCallback {
public class MogoRouteOverlayManager implements
IMoGoAutopilotPlanningListener, IMoGoAutopilotStatusListener,
IMoGoMapLocationListener {
private static volatile MogoRouteOverlayManager sInstance;
private Context mContext;
private String TAG = "MogoRouteOverlayManager";
@@ -47,7 +44,6 @@ public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener,
CallerAutopilotPlanningListenerManager.INSTANCE.addListener(TAG, this);
CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, this);
CallerMapLocationListenerManager.INSTANCE.addListener(TAG,this);
MogoApisHandler.getInstance().getApis().getAdasControllerApi().addAdasOCHCallback(this);
// intiDrawer();
}
@@ -154,13 +150,4 @@ public class MogoRouteOverlayManager implements IMoGoAutopilotPlanningListener,
mLocation = location;
}
@Override
public void onArriveAt(AutopilotStationInfo data) {
}
@Override
public void onStateChanged(int state, String reason) {
}
}