diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java index ea1b62527e..aaf81a9329 100644 --- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java +++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java @@ -19,8 +19,6 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.api.map.smp.IMogoSmallMapProvider; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.module.common.MogoApisHandler; -import com.mogo.service.adas.IMogoAdasOCHCallback; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -33,7 +31,9 @@ import java.util.List; * @date 2021/5/19 10:50 上午 */ @Route(path = MoGoFragmentPaths.PATH_FRAGMENT_SMP) -public class SmallMapFragment extends BaseFragment implements IMogoSmallMapProvider, IMoGoAutopilotPlanningListener, IMogoAdasOCHCallback , IMoGoAutopilotStatusListener { +public class SmallMapFragment extends BaseFragment + implements IMogoSmallMapProvider, IMoGoAutopilotPlanningListener, + IMoGoAutopilotStatusListener { private final String TAG = "SmallMapFragment"; protected SmallMapDirectionView mSmallMapDirectionView; @@ -63,7 +63,6 @@ public class SmallMapFragment extends BaseFragment implements IMogoSmallMapProvi mSmallMapDirectionView = mRootView.findViewById(R.id.smallMapDirectionView); mSmallMapDirectionView.onCreateView(savedInstanceState); CallerAutopilotPlanningListenerManager.INSTANCE.addListener(TAG, this); - MogoApisHandler.getInstance().getApis().getAdasControllerApi().addAdasOCHCallback(this); } @Override @@ -143,15 +142,6 @@ public class SmallMapFragment extends BaseFragment implements IMogoSmallMapProvi } } - @Override - public void onArriveAt(AutopilotStationInfo data) { - - } - - @Override - public void onStateChanged(int state, String reason) { - - } @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autoPilotStatusInfo) { diff --git a/core/mogo-core-res/src/main/res/raw/v2x_daolujiebing.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_daolujiebing.nt3d index 2e560d1169..f0f4fe28c7 100644 Binary files a/core/mogo-core-res/src/main/res/raw/v2x_daolujiebing.nt3d and b/core/mogo-core-res/src/main/res/raw/v2x_daolujiebing.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/v2x_daolujishui.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_daolujishui.nt3d index 9d35863567..f71dc4fc56 100644 Binary files a/core/mogo-core-res/src/main/res/raw/v2x_daolujishui.nt3d and b/core/mogo-core-res/src/main/res/raw/v2x_daolujishui.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/v2x_daolushigong.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_daolushigong.nt3d index f56cd6334f..6670606e5c 100644 Binary files a/core/mogo-core-res/src/main/res/raw/v2x_daolushigong.nt3d and b/core/mogo-core-res/src/main/res/raw/v2x_daolushigong.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/v2x_guzhangqiuzhu.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_guzhangqiuzhu.nt3d index a7eb5f45f1..fb6eae0020 100644 Binary files a/core/mogo-core-res/src/main/res/raw/v2x_guzhangqiuzhu.nt3d and b/core/mogo-core-res/src/main/res/raw/v2x_guzhangqiuzhu.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/v2x_jiaotongjiancha.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_jiaotongjiancha.nt3d index fd583da02f..1beac28c9b 100644 Binary files a/core/mogo-core-res/src/main/res/raw/v2x_jiaotongjiancha.nt3d and b/core/mogo-core-res/src/main/res/raw/v2x_jiaotongjiancha.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/v2x_nongwu.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_nongwu.nt3d index c238a2d106..80b156e5c4 100644 Binary files a/core/mogo-core-res/src/main/res/raw/v2x_nongwu.nt3d and b/core/mogo-core-res/src/main/res/raw/v2x_nongwu.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/v2x_shigu.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_shigu.nt3d index 59889f955e..a4a783371a 100644 Binary files a/core/mogo-core-res/src/main/res/raw/v2x_shigu.nt3d and b/core/mogo-core-res/src/main/res/raw/v2x_shigu.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/v2x_shishilukuang.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_shishilukuang.nt3d index 7485fe445e..cc82c26c2c 100644 Binary files a/core/mogo-core-res/src/main/res/raw/v2x_shishilukuang.nt3d and b/core/mogo-core-res/src/main/res/raw/v2x_shishilukuang.nt3d differ diff --git a/core/mogo-core-res/src/main/res/raw/v2x_yongdu.nt3d b/core/mogo-core-res/src/main/res/raw/v2x_yongdu.nt3d index b237c05a85..7d14c2c513 100644 Binary files a/core/mogo-core-res/src/main/res/raw/v2x_yongdu.nt3d and b/core/mogo-core-res/src/main/res/raw/v2x_yongdu.nt3d differ diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 13ccbc6611..b63e21728a 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -323,9 +323,6 @@ public class MainActivity extends MvpActivity implement super.onResume(); mMogoStatusManager.setMainPageResumeStatus(TAG, true); mMogoStatusManager.setMainPageIsBackgroundStatus(TAG, false); - if (mCoverUpLayout.getVisibility() != View.VISIBLE) { - mServiceApis.getAdasControllerApi().showADAS(); - } } @Override diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 4e654dfac2..fbb84ab24e 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -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 ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java index a250bf8601..e019bef3b6 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/StatusChangedAdapter.java @@ -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(() -> { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java deleted file mode 100644 index cff111ae31..0000000000 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/autopilot/AutoPilotRemoteController.java +++ /dev/null @@ -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 mParametersListener = new IMogoOnMessageListener() { - @Override - public Class 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; - } - -} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java index 4a4f5668fb..78302bbc04 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/DispatchAutoPilotManager.java @@ -35,8 +35,8 @@ import java.util.List; //负责监听自动驾驶状态并进行状态上报，自动驾驶路线上报，接收调度指令展示指令弹窗 public class DispatchAutoPilotManager implements IMogoOnMessageListener - , IDispatchRemindClickListener - , IMogoCarLocationChangedListener2, IMogoAdasOCHCallback, IMoGoCheckAutoPilotBtnListener, IMoGoAutopilotPlanningListener { + , IDispatchRemindClickListener, IMogoCarLocationChangedListener2, IMogoAdasOCHCallback, + IMoGoCheckAutoPilotBtnListener, IMoGoAutopilotPlanningListener { private static final String TAG = "DispatchAutoPilotManager"; private static volatile DispatchAutoPilotManager instance; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java index cd8397eb97..26ba340c36 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java @@ -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() diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java index 9693ff022e..fb24c2891d 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java @@ -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) { - - } } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java index e918ac671a..8d7b90667b 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java @@ -53,7 +53,6 @@ public interface IMogoADASController extends IProvider { */ void removeAdasOCHCallback(); - void onAutopilotArriveLike(int type); /** * 获取车辆自动驾驶状态 @@ -76,12 +75,6 @@ public interface IMogoADASController extends IProvider { */ double getLastLon(); - /** - * 获取车身定位经度 - * - * @return - */ - double getLastSpeed(); /** * 获取由工控机传回的GPS星历时间 @@ -90,9 +83,5 @@ public interface IMogoADASController extends IProvider { */ String getSatelliteTime(); - /** - * 结束自动驾驶 - */ - void cancelAutopilot(); } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index a597f5ac39..b23bb1ba54 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -1,8 +1,6 @@ package com.mogo.service.impl.adas; -import android.app.Application; import android.content.Context; -import android.content.Intent; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; @@ -36,7 +34,6 @@ public class MogoADASController implements IMogoADASController { private static final String TAG = "MogoADASController"; - private AdasProvider adasProvider; /** @@ -55,14 +52,8 @@ public class MogoADASController implements IMogoADASController { private double mLastLon; private double mLastLat; - private double mSpeed; private String satelliteTime; - @Override - public double getLastSpeed() { - return mSpeed; - } - @Override public double getLastLat() { return mLastLat; @@ -149,7 +140,6 @@ public class MogoADASController implements IMogoADASController { } mLastLon = stateInfo.getValues().getLon(); mLastLat = stateInfo.getValues().getLat(); - mSpeed = stateInfo.getValues().getGnss_speed(); satelliteTime = stateInfo.getValues().getSatelliteTime(); if (mMogoAdasCarDataCallback != null) { mMogoAdasCarDataCallback.onAdasCarDataCallback(stateInfo); @@ -171,16 +161,6 @@ public class MogoADASController implements IMogoADASController { } - private void sendBroadcast(Intent intent) { - Application app = AbsMogoApplication.getApp(); - if (app == null) { - Logger.e(TAG, "un handle Application instance."); - return; - } - app.sendBroadcast(intent); - } - - @Override public EnumMapUI getCurrentSkinMode() { return EnumMapUI.Type_VR; @@ -189,25 +169,18 @@ public class MogoADASController implements IMogoADASController { @Override public void aiCloudToAdasData(AutopilotControlParameters result) { try { - syncControlCmdToADAS("aiCloudToStartAutopilot", result); + AutopilotControlCmdParameter parameter = new AutopilotControlCmdParameter("aiCloudToStartAutopilot", result); + //位置信息 action是aiCloudToStartAutopilot + try { + adasProvider.sendWsMessage(GsonUtil.jsonFromObject(parameter)); + } catch (Exception e) { + e.printStackTrace(); + } } catch (Exception e) { Logger.e(TAG, e, "aiCloudToAdasData"); } } - /** - * @param action - * @param result - */ - private void syncControlCmdToADAS(String action, Object result) { - AutopilotControlCmdParameter parameter = new AutopilotControlCmdParameter(action, result); - //位置信息 action是aiCloudToStartAutopilot - try { - adasProvider.sendWsMessage(GsonUtil.jsonFromObject(parameter)); - } catch (Exception e) { - e.printStackTrace(); - } - } @Override public void release() { @@ -234,19 +207,6 @@ public class MogoADASController implements IMogoADASController { mAdasOCHCallback.clear(); } - @Override - public void onAutopilotArriveLike(int carType) { - if (!mAdasOCHCallback.isEmpty()) { - for (IMogoAdasOCHCallback cb : mAdasOCHCallback) { - cb.onArriveAt(new AutopilotStationInfo( - carType, - 116.09888888, - 39.999999) - ); - } - } - } - @Override public int getAutopilotStatus() { int status = IMogoAdasOCHCallback.STATUS_AUTOPILOT_DISABLE; @@ -258,11 +218,6 @@ public class MogoADASController implements IMogoADASController { return status; } - @Override - public void cancelAutopilot() { - adasProvider.cancelPilot(); - } - }