From 1fa89774017a04c7404b32ce902f336bcaf64378 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Fri, 25 Mar 2022 15:39:02 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?adas=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- app/build.gradle | 2 - .../mogo-core-function-main/build.gradle | 3 - .../function/main/EventDispatchCenter.java | 138 +++--------------- .../core/function/main/MainActivity.java | 18 +-- .../service/adas/IMogoADASController.java | 2 - services/mogo-service/build.gradle | 2 - .../service/impl/adas/MogoADASController.java | 6 - 7 files changed, 24 insertions(+), 147 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 97f2c4cbc1..5145b95f1a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -233,8 +233,6 @@ dependencies { implementation rootProject.ext.dependencies.arouter implementation rootProject.ext.dependencies.boostmultidex - compileOnly rootProject.ext.dependencies.adasapi - compileOnly rootProject.ext.dependencies.adasconfigapi debugImplementation rootProject.ext.dependencies.debugleakcanary releaseImplementation rootProject.ext.dependencies.releaseleakcanary diff --git a/core/function-impl/mogo-core-function-main/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle index 58076f0352..72babe725b 100644 --- a/core/function-impl/mogo-core-function-main/build.gradle +++ b/core/function-impl/mogo-core-function-main/build.gradle @@ -48,9 +48,6 @@ dependencies { implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.boostmultidex - compileOnly rootProject.ext.dependencies.adasapi - compileOnly rootProject.ext.dependencies.adasconfigapi - debugImplementation rootProject.ext.dependencies.debugleakcanary releaseImplementation rootProject.ext.dependencies.releaseleakcanary diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java index 22af3e7933..b1a07c2242 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java @@ -20,10 +20,6 @@ import com.mogo.map.navi.IMogoNaviListener; import com.mogo.map.navi.MogoNaviInfo; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.VisualAngleMode; -import com.mogo.service.adas.IMogoADASControlStatusChangedListener; -import com.zhidao.adasconfig.common.config.EnumCarChatIncognitoMode; -import com.zhidao.adasconfig.listener.IAdasSettingUIListener; -import com.zhidao.adasconfig.listener.IAdasSkinStyleListener; import java.util.ArrayList; import java.util.Iterator; @@ -39,9 +35,7 @@ public class EventDispatchCenter implements IMogoMarkerClickListener, IMogoCarLocationChangedListener2, IMogoMapListener, - IMogoLocationListener, - IAdasSettingUIListener, - IAdasSkinStyleListener { + IMogoLocationListener { private static volatile EventDispatchCenter sInstance; @@ -70,7 +64,7 @@ public class EventDispatchCenter implements try { return listener.onMarkerClicked(marker); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMarkerClicked error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMarkerClicked error : " + e); } } return false; @@ -87,7 +81,7 @@ public class EventDispatchCenter implements return listener.onStaticMarkerClicked(marker); } } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onStaticMarkerClicked error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onStaticMarkerClicked error : " + e); } return false; } @@ -138,7 +132,7 @@ public class EventDispatchCenter implements try { listener.onMapLoaded(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapLoaded error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapLoaded error : " + e); } } } @@ -156,7 +150,7 @@ public class EventDispatchCenter implements try { listener.onTouch(motionEvent); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onTouch error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onTouch error : " + e); } } } @@ -174,7 +168,7 @@ public class EventDispatchCenter implements try { listener.onPOIClick(poi); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onPOIClick error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onPOIClick error : " + e); } } } @@ -192,7 +186,7 @@ public class EventDispatchCenter implements try { listener.onMapClick(latLng); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapClick error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapClick error : " + e); } } } @@ -210,7 +204,7 @@ public class EventDispatchCenter implements try { listener.onLockMap(isLock); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onLockMap error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onLockMap error : " + e); } } } @@ -228,7 +222,7 @@ public class EventDispatchCenter implements try { listener.onMapModeChanged(ui); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapModeChanged error :" + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapModeChanged error :" + e); } } } @@ -246,7 +240,7 @@ public class EventDispatchCenter implements try { listener.onMapVisualAngleChanged(visualAngleMode); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapVisualAngleChanged error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapVisualAngleChanged error : " + e); } } } @@ -266,7 +260,7 @@ public class EventDispatchCenter implements try { listener.onMapChanged(location, zoom, tilt, bearing); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapChanged error :" + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapChanged error :" + e); } } } @@ -284,7 +278,7 @@ public class EventDispatchCenter implements try { listener.onInitNaviFailure(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onInitNaviFailure error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onInitNaviFailure error : " + e); } } } @@ -302,7 +296,7 @@ public class EventDispatchCenter implements try { listener.onInitNaviSuccess(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onInitNaviSuccess error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onInitNaviSuccess error : " + e); } } } @@ -321,7 +315,7 @@ public class EventDispatchCenter implements try { listener.onNaviInfoUpdate(naviinfo); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onNaviInfoUpdate error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onNaviInfoUpdate error : " + e); } } } @@ -340,7 +334,7 @@ public class EventDispatchCenter implements try { listener.onStartNavi(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onStartNavi error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onStartNavi error : " + e); } } } @@ -358,7 +352,7 @@ public class EventDispatchCenter implements try { listener.onStopNavi(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onStopNavi error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onStopNavi error : " + e); } } } @@ -376,7 +370,7 @@ public class EventDispatchCenter implements try { listener.onCalculateSuccess(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onCalculateSuccess error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onCalculateSuccess error : " + e); } } } @@ -394,7 +388,7 @@ public class EventDispatchCenter implements try { listener.onoCalculateFailed(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onoCalculateFailed error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onoCalculateFailed error : " + e); } } } @@ -414,104 +408,10 @@ public class EventDispatchCenter implements try { listener.onLocationChanged(location); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onLocationChanged error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onLocationChanged error : " + e); } } } } - @Override - public void northModel() { - Iterator iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners(); - if (iterator == null) { - return; - } - while (iterator.hasNext()) { - IMogoADASControlStatusChangedListener listener = iterator.next(); - if (listener == null) { - continue; - } - try { - listener.onMapUiModeChanged(EnumMapUI.NorthUP_2D); - } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "northModel error : " + e); - } - } - } - - @Override - public void carHeadUp() { - Iterator iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners(); - if (iterator == null) { - return; - } - while (iterator.hasNext()) { - IMogoADASControlStatusChangedListener listener = iterator.next(); - if (listener == null) { - continue; - } - try { - listener.onMapUiModeChanged(EnumMapUI.CarUp_2D); - } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "carHeadUp error : " + e); - } - } - } - - @Override - public void switchCarChat(EnumCarChatIncognitoMode enumCarChatIncognitoMode) { - Iterator iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners(); - if (iterator == null) { - return; - } - while (iterator.hasNext()) { - IMogoADASControlStatusChangedListener listener = iterator.next(); - if (listener == null) { - continue; - } - try { - listener.onCarStatusChanged(enumCarChatIncognitoMode == EnumCarChatIncognitoMode.OPEN); - } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "switchCarChat error : " + e); - } - } - } - - @Override - public void whiteModel() { - Iterator iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners(); - if (iterator == null) { - return; - } - while (iterator.hasNext()) { - IMogoADASControlStatusChangedListener listener = iterator.next(); - if (listener == null) { - continue; - } - try { - listener.onMapUiModeChanged(EnumMapUI.Type_Light); - } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "whiteModel error : " + e); - } - } - } - - @Override - public void blackModel() { - Iterator iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners(); - if (iterator == null) { - return; - } - while (iterator.hasNext()) { - IMogoADASControlStatusChangedListener listener = iterator.next(); - if (listener == null) { - continue; - } - try { - listener.onMapUiModeChanged(EnumMapUI.Type_Night); - } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "blackModel error : " + e); - } - } - } } diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java index cf554a11b5..0858fe21b9 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java @@ -1,7 +1,7 @@ package com.mogo.eagle.core.function.main; -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAIN; import static com.mogo.eagle.core.function.main.MainPresenter.MOGO_PERMISSION_REQUEST_CODE; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAIN; import android.content.Intent; import android.content.pm.PackageManager; @@ -24,13 +24,13 @@ import com.mogo.commons.mvp.MvpActivity; import com.mogo.commons.mvp.MvpFragment; import com.mogo.eagle.core.data.constants.MoGoFragmentPaths; import com.mogo.eagle.core.data.map.MogoLocation; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.function.main.cards.MogoModulesManager; import com.mogo.eagle.core.function.main.service.MogoMainService; import com.mogo.eagle.core.function.main.utils.DisplayEffectsHelper; import com.mogo.eagle.core.function.main.windowview.FloatingViewHandler; import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.permissions.PermissionsDialogUtils; import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; import com.mogo.eagle.core.utilcode.util.NetworkUtils; @@ -48,9 +48,6 @@ import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.statusmanager.StatusDescriptor; -import com.zhidao.adasconfig.api.AdasConfigApiController; -import com.zhidao.adasconfig.common.log.LoggerController; -import com.zhidao.autopilot.support.api.AutopilotServiceManage; import java.util.HashMap; import java.util.Map; @@ -183,7 +180,6 @@ public class MainActivity extends MvpActivity implement } mMogoStatusManager = mServiceApis.getStatusManagerApi(); mMogoStatusManager.setMainPageLaunchedStatus(TAG, true); - AutopilotServiceManage.getInstance().init(getContext()); } @Override @@ -253,10 +249,6 @@ public class MainActivity extends MvpActivity implement private void initAdasControlStatusListener() { mServiceApis.getRegisterCenterApi().registerADASControlStatusChangedListener(TAG, this); - AdasConfigApiController.getInstance().registerAdasSettingUiListener(EventDispatchCenter.getInstance()); - AdasConfigApiController.getInstance().registerAdasSettingSkinModelListener(EventDispatchCenter.getInstance()); - AdasConfigApiController.getInstance().init(getApplicationContext()); - LoggerController.setPrinterLog(DebugConfig.isDebug()); } private void startBaseService() { @@ -394,9 +386,9 @@ public class MainActivity extends MvpActivity implement mMogoFragmentManager = null; } IMogoMapUIController mapUIController = CallerMapUIServiceManager.INSTANCE.getMapUIController(); - if (mapUIController != null) mapUIController.destroy(); - AdasConfigApiController.getInstance().release(); - mServiceApis.getAdasControllerApi().release(); + if (mapUIController != null) { + mapUIController.destroy(); + } CallerLogger.INSTANCE.d(M_MAIN + TAG, "destroy."); ContextHolderUtil.releaseContext(); MogoModulesManager.getInstance().onDestroy(); 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 79661e5e81..a73e21ca1d 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 @@ -10,8 +10,6 @@ import com.alibaba.android.arouter.facade.template.IProvider; */ public interface IMogoADASController extends IProvider { - void release(); - /** * 获取车身的定位纬度 * diff --git a/services/mogo-service/build.gradle b/services/mogo-service/build.gradle index f6c6e92e28..fce6dd6a98 100644 --- a/services/mogo-service/build.gradle +++ b/services/mogo-service/build.gradle @@ -48,8 +48,6 @@ dependencies { implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler - implementation rootProject.ext.dependencies.adasapi - implementation rootProject.ext.dependencies.adasconfigapi if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { api rootProject.ext.dependencies.mogomap implementation rootProject.ext.dependencies.mogomapapi 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 2862da2fa0..6a079a3c2a 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 @@ -5,7 +5,6 @@ import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.adas.IMogoADASController; -import com.zhidao.autopilot.support.api.AutopilotServiceManage; @Route(path = MogoServicePaths.PATH_ADAS_CONTROLLER) public class MogoADASController implements IMogoADASController { @@ -51,11 +50,6 @@ public class MogoADASController implements IMogoADASController { } - @Override - public void release() { - AutopilotServiceManage.getInstance().release(); - } - }