diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java index d082a86b6a..828280528e 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java @@ -73,13 +73,6 @@ public class MogoServicePaths { @Deprecated public static final String PATH_WINDOW_MANAGER = "/windowmanger/api"; - /** - * 卡片控制 - */ - @Keep - @Deprecated - public static final String PATH_CARD_MANAGER = "/cardmanager/api"; - /** * 管理 fragment */ diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasConstant.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasConstant.java index 63ac15833d..0f8a2d49d3 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasConstant.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasConstant.java @@ -1,29 +1,8 @@ package com.mogo.module.adas; -import com.mogo.commons.debug.DebugConfig; - /** * Created by XuYong on 2021/5/28 15:24 */ public class AdasConstant { - public static final String MODULE_TAG = "AdasConstant"; - - public static final String HOST_DEV = "http://dzt-test.zhidaohulian.com"; - public static final String HOST_TEST = "http://dzt-test.zhidaohulian.com"; - public static final String HOST_DEMO = "http://dzt-show.zhidaohulian.com"; - public static final String HOST_PRODUCT = "https://dzt.zhidaohulian.com"; - - public static String getBaseUrl() { - switch (DebugConfig.getNetMode()) { - case DebugConfig.NET_MODE_DEV: - return HOST_DEV; - case DebugConfig.NET_MODE_QA: - return HOST_TEST; - case DebugConfig.NET_MODE_DEMO: - return HOST_DEMO; - default: - return HOST_PRODUCT; - } - } } diff --git a/modules/mogo-module-common/consumer-rules.pro b/modules/mogo-module-common/consumer-rules.pro index e29fdda89f..4b4c8f6b97 100644 --- a/modules/mogo-module-common/consumer-rules.pro +++ b/modules/mogo-module-common/consumer-rules.pro @@ -3,7 +3,6 @@ -keep class com.mogo.module.common.constants.*{*;} -keep class com.mogo.module.common.drawer.marker.*{*;} -keep class com.mogo.module.common.entity.*{*;} --keep class com.mogo.module.common.utils.SPConst{*;} -keep class com.mogo.module.common.view.*{*;} -keep class com.mogo.module.common.widget.*{*;} -keep class com.mogo.module.common.wm.* {*;} diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java index 93481a4352..f3693aae58 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java @@ -131,26 +131,6 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL marker.setRotateAngle(rotate); } - /* - * 2D资源绘制marker底部的红色圆圈 - * */ - private IMogoMarker drawMarkerWith2Resource(MarkerShowEntity markerShowEntity) { - MogoLatLng mogoLatLng = new MogoLatLng(markerShowEntity.getMarkerLocation().getLat(), markerShowEntity.getMarkerLocation().getLon()); - MogoLatLng newLocation = Trigonometric.getNewLocation(mogoLatLng, 5, 180); - MogoMarkerOptions optionsRipple = new MogoMarkerOptions() - .latitude(newLocation.getLat()) - .longitude(newLocation.getLon()) - .anchor(1.0f, 1.0f) - .setGps(false) - .zIndex(MarkerDrawer.MARKER_Z_INDEX_HIGH); - optionsRipple - .icon(ViewUtils.fromView(new EmptyMarkerView(mContext))); - IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(markerShowEntity.getMarkerType(), optionsRipple); - - marker.setInfoWindowAdapter(new SimpleWindow3DAdapter(new MarkerBaseFloor(mContext))); - marker.showInfoWindow(); - return marker; - } /** * 绘制停止线 marker diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java deleted file mode 100644 index aae1a3f722..0000000000 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java +++ /dev/null @@ -1,317 +0,0 @@ -package com.mogo.module.common.map; - -import com.mogo.commons.debug.DebugConfig; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; -import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.map.uicontroller.IMogoMapUIController; -import com.mogo.module.common.MogoApisHandler; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author congtaowang - * @since 2020-04-10 - *

- * 地图中心点策略 - */ -public class MapCenterPointStrategy { - - private static final String TAG = "MapCenterPointStrategy"; - - private static Map< Integer, Map< String, MapCenterPoint > > sCommonStrategies = new HashMap<>(); - private static Map< Integer, Map< String, MapCenterPoint > > sVrStrategies = new HashMap<>(); - - public static final MapCenterPoint DEFAULT = new MapCenterPoint( 0.677734D, 0.5733333D ); - - public static void init() { - - { - // 选点场景，定位中心点 - Map< String, MapCenterPoint > choosePoint = new HashMap<>(); - final MapCenterPoint point = new MapCenterPoint( 0.5D, 0.5D ); - choosePoint.put( "d80x", point ); - choosePoint.put( "em4", point ); - choosePoint.put( "em3", point ); - choosePoint.put( "e8xx", point ); - choosePoint.put( "f80x", point ); - choosePoint.put( "f8xx", point ); - choosePoint.put( "f8Amap", point ); - sCommonStrategies.put( Scene.CHOOSE_POINT, choosePoint ); - } - - { - // 导航场景，定位视图右下角偏下 - Map< String, MapCenterPoint > navi = new HashMap<>(); - final MapCenterPoint em4 = new MapCenterPoint( 0.734375D, 0.573333333333D ); - navi.put( "em4", em4 ); - navi.put( "em3", em4 ); - navi.put( "e8xx", em4 ); - final MapCenterPoint f80x = new MapCenterPoint( 0.705208333D, 0.575D ); - navi.put( "f80x", f80x ); - navi.put( "f8xx", f80x ); - navi.put( "f8Amap", f80x ); - sCommonStrategies.put( Scene.NAVI, navi ); - } - - { - // 导航场景 vs 道路事件展示场景，定位视图右下角偏下 - Map< String, MapCenterPoint > naviWithRoadEvent = new HashMap<>(); - final MapCenterPoint em4 = new MapCenterPoint( 0.734375D, 0.73936170212766D ); - naviWithRoadEvent.put( "em4", em4 ); - naviWithRoadEvent.put( "em3", em4 ); - naviWithRoadEvent.put( "e8xx", em4 ); - final MapCenterPoint f80x = new MapCenterPoint( 0.705208333D, 0.683333333333D ); - naviWithRoadEvent.put( "f80x", f80x ); - naviWithRoadEvent.put( "f8xx", f80x ); - naviWithRoadEvent.put( "f8Amap", f80x ); - sCommonStrategies.put( Scene.NAVI_WITH_ROAD_EVENT, naviWithRoadEvent ); - } - - { - // 巡航场景 - Map< String, MapCenterPoint > aimless = new HashMap<>(); - final MapCenterPoint em4 = new MapCenterPoint( 0.734375D, 0.5D ); - aimless.put( "em4", em4 ); - aimless.put( "em3", em4 ); - aimless.put( "e8xx", em4 ); - final MapCenterPoint f80x = new MapCenterPoint( 0.705208333D, 0.5D ); - aimless.put( "f80x", f80x ); - aimless.put( "f8xx", f80x ); - aimless.put( "f8Amap", f80x ); - sCommonStrategies.put( Scene.AIMLESS, aimless ); - } - - { - // 巡航场景 vs 道路事件展示场景 - Map< String, MapCenterPoint > aimlessWithRoadEvent = new HashMap<>(); - final MapCenterPoint em4 = new MapCenterPoint( 0.734375D, 0.68617 ); - aimlessWithRoadEvent.put( "em4", em4 ); - aimlessWithRoadEvent.put( "em3", em4 ); - aimlessWithRoadEvent.put( "e8xx", em4 ); - final MapCenterPoint f80x = new MapCenterPoint( 0.705208333D, 0.599074074D ); - aimlessWithRoadEvent.put( "f80x", f80x ); - aimlessWithRoadEvent.put( "f8xx", f80x ); - aimlessWithRoadEvent.put( "f8Amap", f80x ); - sCommonStrategies.put( Scene.AIMLESS_WITH_ROAD_EVENT, aimlessWithRoadEvent ); - } - - { - // 规划路线，定位视图右边 - Map< String, MapCenterPoint > calculatePath = new HashMap<>(); - final MapCenterPoint d80x = new MapCenterPoint( 0.733398D, 0.610833D ); - calculatePath.put( "d80x", d80x ); - calculatePath.put( "em4", d80x ); - calculatePath.put( "em3", d80x ); - calculatePath.put( "e8xx", d80x ); - final MapCenterPoint f80x = new MapCenterPoint( 0.703125D, 0.6083333D ); - calculatePath.put( "f80x", f80x ); - calculatePath.put( "f8xx", f80x ); - calculatePath.put( "f8Amap", f80x ); - sCommonStrategies.put( Scene.CALCULATE_PATH, calculatePath ); - } - - { - // 分类搜索，定位视图右边 - Map< String, MapCenterPoint > categorySearch = new HashMap<>(); - final MapCenterPoint d80x = new MapCenterPoint( 0.733398D, 0.5D ); - categorySearch.put( "d80x", d80x ); - categorySearch.put( "em4", d80x ); - categorySearch.put( "em3", d80x ); - categorySearch.put( "e8xx", d80x ); - final MapCenterPoint f80x = new MapCenterPoint( 0.733594D, 0.5D ); - categorySearch.put( "f80x", f80x ); - categorySearch.put( "f8xx", f80x ); - categorySearch.put( "f8Amap", f80x ); - sCommonStrategies.put( Scene.CATEGORY_SEARCH, categorySearch ); - } - - { - // V2X，场景视图右边 - Map< String, MapCenterPoint > categoryV2XEvent = new HashMap<>(); - categoryV2XEvent.put( "d80x", new MapCenterPoint( 0.669444444444444, 0.7D ) ); - final MapCenterPoint em4 = new MapCenterPoint( 0.677734375D, 0.7D ); - categoryV2XEvent.put( "em4", em4 ); - categoryV2XEvent.put( "em3", em4 ); - categoryV2XEvent.put( "e8xx", em4 ); - final MapCenterPoint f80x = new MapCenterPoint( 0.6963541D, 0.65D ); - categoryV2XEvent.put( "f80x", f80x ); - categoryV2XEvent.put( "f8xx", f80x ); - categoryV2XEvent.put( "f8Amap", f80x ); - sCommonStrategies.put( Scene.CATEGORY_V2X_EVENT, categoryV2XEvent ); - } - - // --vr mode - - { - // 选点场景，定位中心点 - Map< String, MapCenterPoint > choosePoint = new HashMap<>(); - MapCenterPoint point = new MapCenterPoint( 0.5D, 0.5D ); - choosePoint.put( "d80x", point ); - choosePoint.put( "em4", point ); - choosePoint.put( "e8xx", point ); - choosePoint.put( "f80x", point ); - choosePoint.put( "f8xx", point ); - choosePoint.put( "f8Amap", point ); - sVrStrategies.put( Scene.CHOOSE_POINT, choosePoint ); - } - - { - // 导航场景，定位视图右下角偏下 - Map< String, MapCenterPoint > navi = new HashMap<>(); - MapCenterPoint point1 = new MapCenterPoint( 0.5D, 0.573333333333D ); - navi.put( "d80x", point1 ); - navi.put( "em4", point1 ); - navi.put( "e8xx", point1 ); - MapCenterPoint point2 = new MapCenterPoint( 0.5D, 0.575D ); - navi.put( "f80x", point2 ); - navi.put( "f8xx", point2 ); - navi.put( "f8Amap", point2 ); - sVrStrategies.put( Scene.NAVI, navi ); - } - - { - // 导航场景 vs 道路事件展示场景，定位视图右下角偏下 - Map< String, MapCenterPoint > naviWithRoadEvent = new HashMap<>(); - MapCenterPoint point1 = new MapCenterPoint( 0.5D, 0.73936170212766D ); - naviWithRoadEvent.put( "d80x", point1 ); - naviWithRoadEvent.put( "em4", point1 ); - naviWithRoadEvent.put( "e8xx", point1 ); - MapCenterPoint point2 = new MapCenterPoint( 0.5D, 0.683333333333D ); - naviWithRoadEvent.put( "f80x", point2 ); - naviWithRoadEvent.put( "f8xx", point2 ); - naviWithRoadEvent.put( "f8Amap", point2 ); - sVrStrategies.put( Scene.NAVI_WITH_ROAD_EVENT, naviWithRoadEvent ); - } - - { - // 巡航场景 - Map< String, MapCenterPoint > aimless = new HashMap<>(); - MapCenterPoint point1 = new MapCenterPoint( 0.5D, 0.575D ); - aimless.put( "d80x", point1 ); - aimless.put( "em4", point1 ); - aimless.put( "e8xx", point1 ); - MapCenterPoint point2 = new MapCenterPoint( 0.5D, 0.8D ); - aimless.put( "f80x", point2 ); - aimless.put( "f8xx", point2 ); - aimless.put( "f8Amap", point2 ); - sVrStrategies.put( Scene.AIMLESS, aimless ); - } - - { - // 巡航场景 vs 道路事件展示场景 - Map< String, MapCenterPoint > aimlessWithRoadEvent = new HashMap<>(); - MapCenterPoint point1 = new MapCenterPoint( 0.5D, 0.68617 ); - aimlessWithRoadEvent.put( "d80x", point1 ); - aimlessWithRoadEvent.put( "em4", point1 ); - aimlessWithRoadEvent.put( "e8xx", point1 ); - MapCenterPoint point2 = new MapCenterPoint( 0.5D, 0.599074074D ); - aimlessWithRoadEvent.put( "f80x", point2 ); - aimlessWithRoadEvent.put( "f8xx", point2 ); - aimlessWithRoadEvent.put( "f8Amap", point2 ); - sVrStrategies.put( Scene.AIMLESS_WITH_ROAD_EVENT, aimlessWithRoadEvent ); - } - - { - // 规划路线，定位视图右边 - Map< String, MapCenterPoint > calculatePath = new HashMap<>(); - MapCenterPoint point1 = new MapCenterPoint( 0.5D, 0.610833D ); - calculatePath.put( "d80x", point1 ); - calculatePath.put( "em4", point1 ); - calculatePath.put( "e8xx", point1 ); - MapCenterPoint point2 = new MapCenterPoint( 0.5D, 0.6083333D ); - calculatePath.put( "f80x", point2 ); - calculatePath.put( "f8xx", point2 ); - calculatePath.put( "f8Amap", point2 ); - sVrStrategies.put( Scene.CALCULATE_PATH, calculatePath ); - } - - { - // 分类搜索，定位视图右边 - Map< String, MapCenterPoint > categorySearch = new HashMap<>(); - MapCenterPoint point = new MapCenterPoint( 0.5D, 0.5D ); - categorySearch.put( "d80x", point ); - categorySearch.put( "em4", point ); - categorySearch.put( "e8xx", point ); - categorySearch.put( "f80x", point ); - categorySearch.put( "f8xx", point ); - categorySearch.put( "f8Amap", point ); - sVrStrategies.put( Scene.CATEGORY_SEARCH, categorySearch ); - } - - { - // V2X，场景视图右边 - Map< String, MapCenterPoint > categoryV2XEvent = new HashMap<>(); - MapCenterPoint point1 = new MapCenterPoint( 0.5, 0.7D ); - categoryV2XEvent.put( "d80x", point1 ); - categoryV2XEvent.put( "em4", point1 ); - categoryV2XEvent.put( "e8xx", point1 ); - MapCenterPoint point2 = new MapCenterPoint( 0.5, 0.65D ); - categoryV2XEvent.put( "f80x", point2 ); - categoryV2XEvent.put( "f8xx", point2 ); - categoryV2XEvent.put( "f8Amap", point2 ); - sVrStrategies.put( Scene.CATEGORY_V2X_EVENT, categoryV2XEvent ); - } - } - - public static void resetByChangeMode() { - setMapCenterPointByScene( MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController(), Scene.AIMLESS ); - } - - /** - * 根据场景触发地图视图改变 - * - * @param controller - * @param scene - */ - public static void setMapCenterPointByScene( IMogoMapUIController controller, int scene ) { - if ( controller == null ) { - return; - } - if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) { - //Logger.w( TAG, "vr 模式下忽略该设置" ); - return; - } - Map< Integer, Map< String, MapCenterPoint > > strategies = sCommonStrategies; - if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) { - strategies = sVrStrategies; - } - if ( !strategies.containsKey( scene ) ) { - Logger.w( TAG, "no strategy for scene: %s, use DEFAULT", scene ); - controller.setPointToCenter( DEFAULT.x, DEFAULT.y ); - return; - } - Map< String, MapCenterPoint > points = strategies.get( scene ); - String car = DebugConfig.getProductFlavor(); - if ( !points.containsKey( car ) ) { - Logger.w( TAG, "no strategy for series: %s, use DEFAULT", scene ); - controller.setPointToCenter( DEFAULT.x, DEFAULT.y ); - return; - } - MapCenterPoint point = points.get( car ); - if ( point == null ) { - Logger.w( TAG, "no strategy config for series: %s, use DEFAULT", scene ); - controller.setPointToCenter( DEFAULT.x, DEFAULT.y ); - return; - } - controller.setPointToCenter( point.x, point.y ); - } - - /** - * 根据场景触发地图视图改变 - * - * @param controller - * @param scene - */ - public static void setMapCenterPointBySceneAndDelay( final IMogoMapUIController controller, final int scene, long delay, final Interrupter interrupter ) { - UiThreadHandler.postDelayed( () -> { - if ( interrupter != null ) { - if ( interrupter.interrupt() ) { - return; - } - } - setMapCenterPointByScene( controller, scene ); - }, delay ); - } - -} diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java deleted file mode 100644 index 13c35edda2..0000000000 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.mogo.module.common.utils; - -/** - * 多模块之间SP状态公共类 - */ -public class SPConst { - - private static String SP_GUIDE = "SP_GUIDE_2020_09_09"; - - -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java index 8b4dd4045a..95bd6b4294 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewNoLinkageAnimHelper.java @@ -10,7 +10,6 @@ import androidx.constraintlayout.widget.ConstraintLayout; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; import com.mogo.module.extensions.ExtensionsModuleConst; import com.mogo.module.extensions.R; @@ -99,7 +98,6 @@ public class TopViewNoLinkageAnimHelper { topContainerNoLinkage.animate().translationY(child.getHeight()).setListener(mainAnimListener).start(); int scene = Scene.AIMLESS_WITH_ROAD_EVENT; Logger.d(TAG, "show top setMapCenterPointByScene: " + scene); - MapCenterPointStrategy.setMapCenterPointByScene(mogoMapUIController, scene); }); MogoApisHandler.getInstance().getApis().getStatusManagerApi().setTopViewShow(ExtensionsModuleConst.TYPE_ENTRANCE, true); @@ -136,7 +134,6 @@ public class TopViewNoLinkageAnimHelper { topContainerNoLinkage.animate().translationY(-topContainerNoLinkage.getTranslationY()).setListener(mainAnimListener).start(); int scene = Scene.AIMLESS; Logger.d(TAG, "hide top setMapCenterPointByScene: " + scene); - MapCenterPointStrategy.setMapCenterPointByScene(mogoMapUIController, scene); MogoApisHandler.getInstance().getApis().getStatusManagerApi().setTopViewShow(ExtensionsModuleConst.TYPE_ENTRANCE, false); } } @@ -160,7 +157,6 @@ public class TopViewNoLinkageAnimHelper { } topContainerNoLinkage.removeAllViews(); } - MapCenterPointStrategy.setMapCenterPointByScene(mogoMapUIController, Scene.AIMLESS); } public void clear() { 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 1cd2e9cc35..3f2733fa72 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 @@ -28,15 +28,12 @@ import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; 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.AppUtils; -import com.mogo.eagle.core.utilcode.util.ProcessUtils; import com.mogo.eagle.core.utilcode.util.NetworkUtils; +import com.mogo.eagle.core.utilcode.util.ProcessUtils; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.api.CallChatApi; -import com.mogo.module.common.map.MapCenterPointStrategy; -import com.mogo.module.common.map.Scene; import com.mogo.module.main.cards.MogoModulesManager; import com.mogo.module.main.service.MogoMainService; import com.mogo.module.main.utils.DisplayEffectsHelper; @@ -213,7 +210,6 @@ public class MainActivity extends MvpActivity implement if (DebugConfig.isMapBased()) { EventDispatchCenter.getInstance().setMapLoadedCallback(() -> { Logger.d(TAG, "map loaded." + Thread.currentThread().getName()); - resetMapCenterPoint(); resetMapUiStyle(); // 延时加载其他模块 getWindow().getDecorView().postDelayed(new Runnable() { @@ -252,12 +248,6 @@ public class MainActivity extends MvpActivity implement mServiceApis.getMapServiceApi().getMapUIController().changeMapMode(mapUI); } - private void resetMapCenterPoint() { - // 右移地图中心点 - MapCenterPointStrategy.init(); - MapCenterPointStrategy.setMapCenterPointByScene(mServiceApis.getMapServiceApi().getMapUIController(), Scene.AIMLESS); - } - /** * 加载其它模块 */ diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MogoCardManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MogoCardManager.java deleted file mode 100644 index c24803e02f..0000000000 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MogoCardManager.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.mogo.module.main; - -import android.content.Context; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.eagle.core.data.constants.MogoServicePaths; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; -import com.mogo.service.cardmanager.IMogoCardChangedListener; -import com.mogo.service.cardmanager.IMogoCardManager; - -/** - * @author congtaowang - * @since 2020-01-06 - *

- * 卡片控制 - */ -@Deprecated -@Route( path = MogoServicePaths.PATH_CARD_MANAGER ) -public class MogoCardManager implements IMogoCardManager { - - private static final String TAG = "MogoCardManager"; - - @Override - public void switch2( String cardType ) { - Logger.w( TAG, "Useless, do not invoke anymore." ); - } - - @Override - public void registerCardChangedListener( String tag, IMogoCardChangedListener listener ) { - Logger.w( TAG, "Useless, do not invoke anymore." ); - } - - @Override - public void unregisterCardChangedListener( String tag ) { - Logger.w( TAG, "Useless, do not invoke anymore." ); - } - - @Override - public void invoke( int position, String moduleName ) { - Logger.w( TAG, "Useless, do not invoke anymore." ); - } - - @Override - public void switch2( String cardType, boolean lockCar ) { - Logger.w( TAG, "Useless, do not invoke anymore." ); - } - - @Override - public void init( Context context ) { - - } -} 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 900f65db8e..ffb25d02f0 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 @@ -36,7 +36,6 @@ import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; import com.mogo.module.common.datacenter.SnapshotLocationDataCenter; import com.mogo.module.common.entity.MarkerResponse; -import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; import com.mogo.module.service.autopilot.AutoPilotRemoteController; import com.mogo.module.service.handler.MainLooperHandler; @@ -842,7 +841,6 @@ public class MogoServices implements IMogoMapListener, if ( mStatusManager.isSearchUIShow() ) { mStatusManager.setSearchUIShow( TAG, false ); } - MapCenterPointStrategy.setMapCenterPointByScene( mUiController, Scene.AIMLESS ); mUiController.recoverLockMode(); mADASController.showADAS(); } else { @@ -905,7 +903,6 @@ public class MogoServices implements IMogoMapListener, if ( ui == EnumMapUI.Type_VR ) { if ( !mLastStatusIsVr ) { MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, true ); - MapCenterPointStrategy.resetByChangeMode(); MapMarkerManager.getInstance().redrawMarkerByStyleChanged(); if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) { AIAssist.getInstance( mContext ).speakTTSVoice( "已开启鹰眼模式" ); @@ -916,7 +913,6 @@ public class MogoServices implements IMogoMapListener, if ( mLastStatusIsVr ) { mLastStatusIsVr = false; MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, false ); - MapCenterPointStrategy.resetByChangeMode(); MapMarkerManager.getInstance().redrawMarkerByStyleChanged(); if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) { AIAssist.getInstance( mContext ).speakTTSVoice( "已退出鹰眼模式" ); diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java index ceded47068..646c9f2577 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java @@ -5,7 +5,6 @@ import android.content.Context; import com.alibaba.android.arouter.facade.template.IProvider; import com.mogo.service.adas.IMogoADASController; import com.mogo.service.analytics.IMogoAnalytics; -import com.mogo.service.cardmanager.IMogoCardManager; import com.mogo.service.cloud.location.IMogoLocationInfoService; import com.mogo.service.cloud.passport.IMogoPassportManager; import com.mogo.service.cloud.socket.IMogoSocketManager; @@ -48,14 +47,6 @@ public interface IMogoServiceApis extends IProvider { */ IMogoAnalytics getAnalyticsApi(); - /** - * 卡片控制 - * - * @return - */ - @Deprecated - IMogoCardManager getCardManagerApi(); - /** * 获取socket操作api * diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/CarModelListInfo.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/CarModelListInfo.java deleted file mode 100644 index 850bd0b741..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/CarModelListInfo.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.mogo.service.adas.entity; - -import java.util.List; - -public class CarModelListInfo { - private String sn; - /** - * 热心指数 eg: 1 1.5 2 2.5 - */ - private float enthusiasmIndex; - private List< OwnCarModelEntity > imageData; - - public String getSn() { - return sn; - } - - public void setSn(String sn) { - this.sn = sn; - } - - public float getEnthusiasmIndex() { - return enthusiasmIndex; - } - - public void setEnthusiasmIndex(float enthusiasmIndex) { - this.enthusiasmIndex = enthusiasmIndex; - } - - public List getImageData() { - return imageData; - } - - public void setImageData(List imageData) { - this.imageData = imageData; - } - - @Override - public String toString() { - return "CarModelListInfo{" + - "sn='" + sn + '\'' + - ", enthusiasmIndex=" + enthusiasmIndex + - ", imageData=" + imageData + - '}'; - } -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/CarModelListResponse.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/CarModelListResponse.java deleted file mode 100644 index 9c026b44b4..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/CarModelListResponse.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.mogo.service.adas.entity; - - -import java.io.Serializable; - -/** - * 请求根据热心指数获取自车图标列表的响应类 - * - * @author tongchenfei - */ -public class CarModelListResponse implements Serializable, Cloneable { - - public int code = -1; - public String msg; - private CarModelListInfo result; - - public CarModelListInfo getResult() { - return result; - } - - public void setResult(CarModelListInfo result) { - this.result = result; - } - - @Override - public String toString() { - return "CarModelListResponse{" + - "result=" + result + - ", code=" + code + - ", msg='" + msg + '\'' + - '}'; - } -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/OwnCarModelEntity.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/OwnCarModelEntity.java deleted file mode 100644 index fa04bb961d..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/OwnCarModelEntity.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.mogo.service.adas.entity; - -/** - * 自车模型实体，用于从服务端获取不同等级的自车模型信息以及将此信息传递给adas - * - * @author tongchenfei - */ -public class OwnCarModelEntity { - /** - * 图片锁定 1-是 0-否 - */ - private int isLock; - private String imageUrl; - private String imageName; - private int imageLevel; - - public int getIsLock() { - return isLock; - } - - public void setIsLock(int isLock) { - this.isLock = isLock; - } - - public String getImageUrl() { - return imageUrl; - } - - public void setImageUrl(String imageUrl) { - this.imageUrl = imageUrl; - } - - public String getImageName() { - return imageName; - } - - public void setImageName(String imageName) { - this.imageName = imageName; - } - - public int getImageLevel() { - return imageLevel; - } - - public void setImageLevel(int imageLevel) { - this.imageLevel = imageLevel; - } - - @Override - public String toString() { - return "OwnCarModelEntity{" + - "isLock=" + isLock + - ", imageUrl='" + imageUrl + '\'' + - ", imageName='" + imageName + '\'' + - ", imageLevel=" + imageLevel + - '}'; - } -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/auth/IMogoAuthManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/auth/IMogoAuthManager.java deleted file mode 100644 index 0c22c0bd45..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/auth/IMogoAuthManager.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.mogo.service.auth; - -import android.content.Context; - -import com.mogo.service.module.IMogoModuleProvider; - -public interface IMogoAuthManager extends IMogoModuleProvider { - - /** - * 弹起授权页面 展示View Context - */ - void showAuth(Context context); - - /** - * 关闭授权页面 - */ - void dismiss(); -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/cardmanager/IMogoCardChangedListener.java b/services/mogo-service-api/src/main/java/com/mogo/service/cardmanager/IMogoCardChangedListener.java deleted file mode 100644 index acc829f05d..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/cardmanager/IMogoCardChangedListener.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.mogo.service.cardmanager; - -/** - * @author congtaowang - * @since 2020-01-14 - *

- * 卡片切换监听 - */ -public interface IMogoCardChangedListener { - - void onSwitched( int position, String moduleName ); -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/cardmanager/IMogoCardManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/cardmanager/IMogoCardManager.java deleted file mode 100644 index 74ccb18ef6..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/cardmanager/IMogoCardManager.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.mogo.service.cardmanager; - -import com.alibaba.android.arouter.facade.template.IProvider; - -/** - * @author congtaowang - * @since 2020-01-06 - *

- * 卡片管理 - */ -@Deprecated -public interface IMogoCardManager extends IProvider { - - /** - * 切换卡片 - *

- * 实际调用 switch2(cardType, false) - * - * @param cardType - */ - void switch2( String cardType ); - - /** - * 切换卡片 - * - * @param cardType 卡片类型 - * @param lockCar 是否锁车[将视图拉回车位] - */ - void switch2( String cardType, boolean lockCar ); - - /** - * 注册卡片切换监听 - */ - void registerCardChangedListener( String tag, IMogoCardChangedListener listener ); - - /** - * 注销卡片监听 - */ - void unregisterCardChangedListener( String tag ); - - /** - * 回调 - * - * @param position 卡片位置 - * @param moduleName 卡片名称 - */ - void invoke( int position, String moduleName ); -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/imageloader/IMogoImageLoaderListener.java b/services/mogo-service-api/src/main/java/com/mogo/service/imageloader/IMogoImageLoaderListener.java index 3841dab2f3..ead28da3fb 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/imageloader/IMogoImageLoaderListener.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/imageloader/IMogoImageLoaderListener.java @@ -19,8 +19,6 @@ public interface IMogoImageLoaderListener { @Keep void onStart(); - // void onProcess( int completedSize, int totalSize ); - /** * 加载完成 */ diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoAddressManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoAddressManager.java deleted file mode 100644 index 08c8f103e5..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoAddressManager.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.mogo.service.module; - -import com.alibaba.android.arouter.facade.template.IProvider; -import com.mogo.eagle.core.data.map.MogoLatLng; - -/** - * @author zyz - * 2020-01-12. - *

- * Deprecated, use {@link IMogoSearchManager} instead." - */ -@Deprecated -public interface IMogoAddressManager extends IProvider { - - /** - * 回家 - */ - @Deprecated - void goHome(); - - /** - * 去公司 - */ - @Deprecated - void goCompany(); - - /** - * 打开搜索 - */ - @Deprecated - void goSearch(); - - /** - * 规划路线 - * - * @param destination 目的地 - */ - @Deprecated - void calculatePath( MogoLatLng destination ); - - /** - * 分类搜索 - */ - @Deprecated - void categorySearch( String category ); - - @Deprecated - void goSettings(); -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/obu/IMogoCrashWarnProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/obu/IMogoCrashWarnProvider.java deleted file mode 100644 index b09de9723e..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/obu/IMogoCrashWarnProvider.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mogo.service.obu; - -import com.alibaba.android.arouter.facade.template.IProvider; -import com.zhidao.manager.ts.TsThreshold; - -/** - * 碰撞报警相关接口 - * @author tongchenfei - */ -public interface IMogoCrashWarnProvider extends IProvider { - /** - * 设置碰撞碰撞报警阈值 - * @param threshold - */ - void setCrashThreshold(TsThreshold threshold); - - /** - * 获取当前碰撞报警阈值 - * @return - */ - TsThreshold getCurrentCrashThreshold(); -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java index 57725a5a56..f2cab0e570 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusChangedListener.java @@ -1,10 +1,5 @@ package com.mogo.service.statusmanager; -import org.jetbrains.annotations.NotNull; - -import kotlin.Unit; -import kotlin.jvm.functions.Function0; - /** * @author congtaowang * @since 2020-01-04 diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/voice/IMogoVoiceListener.java b/services/mogo-service-api/src/main/java/com/mogo/service/voice/IMogoVoiceListener.java deleted file mode 100644 index af8ebc6e3e..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/voice/IMogoVoiceListener.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mogo.service.voice; - -import com.mogo.service.intent.IMogoIntentListener; - -/** - * @author congtaowang - * @since 2020-01-09 - *

- * 免唤醒语音监听 - * use {@link IMogoIntentListener} instead. - */ -@Deprecated -public interface IMogoVoiceListener extends IMogoIntentListener { -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/voice/IMogoVoiceManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/voice/IMogoVoiceManager.java deleted file mode 100644 index 4a7538d320..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/voice/IMogoVoiceManager.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mogo.service.voice; - -import com.mogo.service.intent.IMogoIntentManager; - -/** - * @author congtaowang - * @since 2020-01-09 - *

- * 免唤醒语音控制 - *

- * use {@link IMogoIntentManager} instead. - */ -@Deprecated -public interface IMogoVoiceManager extends IMogoIntentManager { -} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java index 675a711814..1193f9d751 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java @@ -10,7 +10,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.service.IMogoServiceApis; import com.mogo.service.adas.IMogoADASController; import com.mogo.service.analytics.IMogoAnalytics; -import com.mogo.service.cardmanager.IMogoCardManager; import com.mogo.service.cloud.location.IMogoLocationInfoService; import com.mogo.service.cloud.passport.IMogoPassportManager; import com.mogo.service.cloud.socket.IMogoSocketManager; @@ -105,12 +104,6 @@ public class MogoServiceApis implements IMogoServiceApis { } - @Override - @Deprecated - public synchronized IMogoCardManager getCardManagerApi() { - return getApiInstance(IMogoCardManager.class, MogoServicePaths.PATH_CARD_MANAGER); - } - @Override public IMogoDataManager getDataManagerApi() { return getApiInstance(IMogoDataManager.class, MogoServicePaths.PATH_DATA_MANAGER); diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelInfoNetApiServices.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelInfoNetApiServices.java deleted file mode 100644 index 17f345bd21..0000000000 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelInfoNetApiServices.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.mogo.service.impl.adas; - -import com.mogo.commons.debug.DebugConfig; -import com.mogo.service.adas.entity.CarModelListResponse; - -import java.util.Map; - -import io.reactivex.Observable; -import retrofit2.http.GET; -import retrofit2.http.QueryMap; - -interface CarModelInfoNetApiServices { - String HOST_DEV = "http://dzt-test.zhidaozhixing.com"; - String HOST_TEST = "http://dzt-test.zhidaozhixing.com"; - String HOST_DEMO = "http://dzt-show.zhidaozhixing.com"; - String HOST_PRODUCT = "http://dzt.zhidaozhixing.com"; - - static String getBaseUrl(){ - switch ( DebugConfig.getNetMode() ) { - case DebugConfig.NET_MODE_DEV: - return HOST_DEV; - case DebugConfig.NET_MODE_QA: - return HOST_TEST; - case DebugConfig.NET_MODE_DEMO: - return HOST_DEMO; - default: - return HOST_PRODUCT; - } - } - - @GET("yycp-userDataService/app/enthusiasm/getEnthusiasmInfo/v1") - Observable< CarModelListResponse > requestCarModelList( @QueryMap Map params); - - -} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/SubscribeImplTemporary.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/SubscribeImplTemporary.java deleted file mode 100644 index 7652ca010c..0000000000 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/SubscribeImplTemporary.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.mogo.service.impl.adas; - -import com.mogo.eagle.core.network.RequestOptions; -import com.mogo.eagle.core.network.utils.Util; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; -import com.mogo.service.adas.entity.CarModelListResponse; - - -import io.reactivex.Observer; -import io.reactivex.disposables.Disposable; - - -/** - * Created by congtaowang on 2018/10/14. //todo 后续干掉！！！ 优化adas模块 - */ -public abstract class SubscribeImplTemporary implements Observer { - - protected final RequestOptions mRequestOptions; - - private static final String TAG = "SubscribeImpl"; - private boolean mAutoTipMsg = true; - - public SubscribeImplTemporary(RequestOptions requestOptions) { - mRequestOptions = requestOptions; - } - - public SubscribeImplTemporary(RequestOptions requestOptions, boolean autoTipMsg) { - this(requestOptions); - mAutoTipMsg = autoTipMsg; - } - - private void onFinish() { - if (!Util.checkAlive(mRequestOptions.getCaller())) { - } - } - - @Override - public void onError(Throwable e) { - onFinish(); - Logger.e(TAG, e, "occur when net request."); - } - - @Override - public void onNext(T o) { - if (o != null) { - if (o instanceof CarModelListResponse) { - CarModelListResponse response = (CarModelListResponse) o; - if (response.code != 0 && response.code != 200) { - onError(response.msg, response.code); - } else { - onSuccess(o); - } - } else { - onError("", -1); - } - } else { - onError("", -1); - } - } - - - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onComplete() { - onFinish(); - } - - public void onSuccess(T o) { - } - - public void onError(String message, int code) { - Logger.e(TAG, "%d - %s", code, message); - } - - private static boolean isTicketUpdated = false; - - private void onUpdateTicket() { - - } -} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/passport/MogoPassportManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/passport/MogoPassportManager.java index 4df71c106c..8e587ce8c4 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/passport/MogoPassportManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/passport/MogoPassportManager.java @@ -11,7 +11,7 @@ import com.mogo.service.cloud.passport.IMogoTicketCallback; import java.lang.reflect.Method; public -/* +/** * @author congtaowang * @since 2020/7/16 * diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/FragmentStack.java b/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/FragmentStack.java index d19d1c9116..9558ad5ce9 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/FragmentStack.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/FragmentStack.java @@ -26,7 +26,6 @@ public class FragmentStack { private Stack< FragmentDescriptor > mFragmentStack = new Stack<>(); private FragmentManager mFragmentManager; - //private FragmentTransaction mFragmentTransaction; private int mContainerId; private FragmentDescriptor mCurrentFragment; @@ -92,7 +91,6 @@ public class FragmentStack { mFragmentTransaction.setTransition( FragmentTransaction.TRANSIT_FRAGMENT_OPEN ); } mFragmentTransaction.show(descriptor.getFragment()); - //mFragmentTransaction.addToBackStack( null ); mFragmentTransaction.commitNowAllowingStateLoss(); if ( descriptor.hasTransition() ) { mFragmentManager.executePendingTransactions();