diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index 0b635857b4..c148a7926f 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -69,11 +69,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis } } - @Override - protected boolean shouldCloseADASPanelWhenPause() { - return !mIsHomeKeyDown; - } - @Override protected void loadOthersModules() { super.loadOthersModules(); diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java index 1e30942b5e..68332600f8 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java @@ -92,14 +92,6 @@ public class AdasProvider implements IProvider { } } - public void hideAdas() { - - } - - public void killAdas() { - - } - public AdasAIDLAutopilotStateModel autopilotStateCall() { return adasEventManager.autopilotStateCall(); } 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 7584df6db5..13ccbc6611 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 @@ -332,17 +332,8 @@ public class MainActivity extends MvpActivity implement protected void onPause() { super.onPause(); mMogoStatusManager.setMainPageResumeStatus(TAG, false); - if (shouldCloseADASPanelWhenPause()) { - mServiceApis.getAdasControllerApi().closeADAS(); - } } - protected boolean shouldCloseADASPanelWhenPause() { - // m4 系列因为按home键会造成页面pause后resume，造成adas panel 闪烁 - // f 系列加上上滑返回桌面后会走 mIsHomeKeyDown = true，但是不会造成页面pause - // 独立 app 任何情况下都需要隐藏 adas - return true; - } @Override protected void onStop() { @@ -350,9 +341,6 @@ public class MainActivity extends MvpActivity implement if (mMogoStatusManager != null) { mMogoStatusManager.setMainPageIsBackgroundStatus(TAG, true); } - if (shouldCloseADASPanelWhenPause()) { - mServiceApis.getAdasControllerApi().closeADAS(); - } } @Override 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 4a803a2d79..cd8397eb97 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 @@ -123,15 +123,6 @@ public class MockIntentHandler implements IntentHandler { query.setRadius(1000); geoSearch.getFromLocationAsyn(query); break; - case 12: {// 控制ADAS显示隐藏 - boolean status2 = intent.getBooleanExtra("status", false); - if (status2) { - MarkerServiceHandler.getADASController().showADAS(); - } else { - MarkerServiceHandler.getADASController().closeADAS(); - } - break; - } case 14: {//测试点的动画移动，模拟周边车辆移动 List mogoLatLngs = new ArrayList<>(); mogoLatLngs.add(new MogoLatLng(39.615986, 116.396716)); 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 2eb78460e6..e918ac671a 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 @@ -12,31 +12,13 @@ import com.mogo.map.uicontroller.EnumMapUI; */ public interface IMogoADASController extends IProvider { - - /** - * 隐藏adas - */ - void closeADAS(); - /** * 显示 */ void showADAS(); - /** - * 关闭 - */ - void killADAS(); - void release(); - /** - * 反向设置 adas 导航车头/正北朝向、黑夜白天模式 - *

- * 导航车头仅支持 NorthUP_2D 和 车头朝上2D - */ - void changeAdasControlMode(EnumMapUI ui); - /** * 获取当前皮肤状态 * @@ -51,38 +33,6 @@ public interface IMogoADASController extends IProvider { */ void aiCloudToAdasData(AutopilotControlParameters result); - /** - * 添加adas数据回调接口 - * - * @param callback 回调接口 - */ - void addAdasDataCallback(IMogoAdasDataCallback callback); - - /** - * 移除adas数据回调接口 - * - * @param callback 待移除的callback - */ - void removeAdasDataCallback(IMogoAdasDataCallback callback); - - /** - * 添加adas报警数据回调接口 - * - * @param callback 回调接口 - */ - void addAdasWarnMessageCallback(IMogoAdasWarnMessageCallback callback); - - /** - * 移除adas报警数据回调接口 - * - * @param callback 待移除的callback - */ - void removeAdasWarnMessageCallback(IMogoAdasWarnMessageCallback callback); - - /** - * 查询自动驾驶路线 - */ - void queryAutopilotRoute(); /** * 自车定位数据 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 27113f4841..a597f5ac39 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 @@ -21,21 +21,13 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.adas.AdasProvider; import com.mogo.module.adas.IAdasDataListener; -import com.mogo.module.adas.IAdasStatusListener; import com.mogo.service.adas.IMogoADASController; import com.mogo.service.adas.IMogoAdasCarDataCallback; import com.mogo.service.adas.IMogoAdasDataCallback; import com.mogo.service.adas.IMogoAdasOCHCallback; import com.mogo.service.adas.IMogoAdasWarnMessageCallback; -import com.mogo.service.impl.singleton.SingletonsHolder; -import com.mogo.service.statusmanager.IMogoStatusManager; -import com.zhidao.adasconfig.api.AdasConfigApiController; -import com.zhidao.adasconfig.common.config.EnumCarHeading; -import com.zhidao.adasconfig.common.config.EnumSkinStyle; import com.zhidao.autopilot.support.api.AutopilotServiceManage; -import org.json.JSONObject; - import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -44,15 +36,6 @@ public class MogoADASController implements IMogoADASController { private static final String TAG = "MogoADASController"; - public static final String ACTION = "com.zhidao.autopilot.ACTION_BOOT"; - public static final String PARAM_COMMAND = "command"; - public static final String VAL_COMMAND = "system.application.operation"; - public static final String PARAM_DATA = "data"; - public static final String PARAM_OBJECT = "object"; - public static final String VAL_OBJECT = "辅助驾驶"; - public static final String PARAM_OPERATION = "operation"; - public static final String VAL_OPEN = "打开"; - public static final String VAL_CLOSE = "关闭"; private AdasProvider adasProvider; @@ -102,15 +85,6 @@ public class MogoADASController implements IMogoADASController { adasProvider = ARouter.getInstance().navigation(AdasProvider.class); } - @Override - public void killADAS() { - try { - adasProvider.killAdas(); - } catch (Exception e) { - e.printStackTrace(); - } - } - @Override public void showADAS() { Logger.d(TAG, "showADAS()"); @@ -196,27 +170,6 @@ public class MogoADASController implements IMogoADASController { } } - @Override - public void closeADAS() { - - Logger.d(TAG, "close adas"); - - try { - adasProvider.hideAdas(); - } catch (Exception e) { - Intent intent = new Intent(ACTION); - intent.putExtra(PARAM_COMMAND, VAL_COMMAND); - JSONObject object = new JSONObject(); - try { - object.put(PARAM_OBJECT, VAL_OBJECT); - object.put(PARAM_OPERATION, VAL_CLOSE); - intent.putExtra(PARAM_DATA, object.toString()); - sendBroadcast(intent); - } catch (Exception e1) { - Logger.e(TAG, e1, "error."); - } - } - } private void sendBroadcast(Intent intent) { Application app = AbsMogoApplication.getApp(); @@ -228,38 +181,6 @@ public class MogoADASController implements IMogoADASController { } - @Override - public void changeAdasControlMode(EnumMapUI ui) { - if (ui == null ) { - return; - } - Logger.d(TAG, "new Mode: " + ui.name()); - switch (ui) { - case CarUp_2D: - case CarUp_3D: - AdasConfigApiController.getInstance().setUserCarHeading(EnumCarHeading.CAR_HEADING_UP); - break; - case NorthUP_2D: - AdasConfigApiController.getInstance().setUserCarHeading(EnumCarHeading.NORTH_UP); - break; - case Type_Light: - if (getCurrentSkinMode() == EnumMapUI.Type_Light) { - return; - } - AdasConfigApiController.getInstance().setUserSkinModel(EnumSkinStyle.WHITE); - break; - case Type_Night: - if (getCurrentSkinMode() == EnumMapUI.Type_Night) { - return; - } - AdasConfigApiController.getInstance().setUserSkinModel(EnumSkinStyle.BLACK); - break; - case Type_AUTO_LIGHT_Night: - AdasConfigApiController.getInstance().setUserSkinModel(EnumSkinStyle.AUTO); - break; - } - } - @Override public EnumMapUI getCurrentSkinMode() { return EnumMapUI.Type_VR; @@ -295,47 +216,6 @@ public class MogoADASController implements IMogoADASController { AutopilotServiceManage.getInstance().release(); } - @Override - public void addAdasDataCallback(IMogoAdasDataCallback callback) { - if (callback == null) { - return; - } - if (!mAdasDataCallbackList.contains(callback)) { - mAdasDataCallbackList.add(callback); - } - } - - @Override - public void removeAdasDataCallback(IMogoAdasDataCallback callback) { - if (callback == null) { - return; - } - mAdasDataCallbackList.remove(callback); - } - - @Override - public void addAdasWarnMessageCallback(IMogoAdasWarnMessageCallback callback) { - if (callback == null) { - return; - } - if (!mMogoAdasWarnMessageCallbackList.contains(callback)) { - mMogoAdasWarnMessageCallbackList.add(callback); - } - } - - @Override - public void removeAdasWarnMessageCallback(IMogoAdasWarnMessageCallback callback) { - if (callback == null) { - return; - } - mMogoAdasWarnMessageCallbackList.remove(callback); - } - - @Override - public void queryAutopilotRoute() { - adasProvider.queryAutopilotRoute(); - } - @Override public void setAdasCarDataCallback(IMogoAdasCarDataCallback carDataCallback) { mMogoAdasCarDataCallback = carDataCallback;