diff --git a/app/build.gradle b/app/build.gradle index f7e1fb318a..c505195521 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -425,7 +425,7 @@ dependencies { apply from: "./functions/perform.gradle" apply from: "./functions/baseservices.gradle" apply from: "./functions/socketpush.gradle" - apply from: "./functions/gpssimulator.gradle" +// apply from: "./functions/gpssimulator.gradle" apply from: "./functions/leftpanel.gradle" apply from: "./functions/skin.gradle" apply from: "./functions/crashreport.gradle" diff --git a/app/functions/gpssimulator.gradle b/app/functions/gpssimulator.gradle index c33febbc07..c957d2300b 100644 --- a/app/functions/gpssimulator.gradle +++ b/app/functions/gpssimulator.gradle @@ -2,10 +2,10 @@ project.dependencies { if (Boolean.valueOf(RELEASE)) { - debugImplementation rootProject.ext.dependencies.gpssimulatordebug + debugImplementation rootProject.ext.dependencies.gpssimulatornoop releaseImplementation rootProject.ext.dependencies.gpssimulatornoop } else { - debugImplementation project(':modules:mogo-module-gps-simulator-debug') + debugImplementation project(':modules:mogo-module-gps-simulator-noop') releaseImplementation project(':modules:mogo-module-gps-simulator-noop') } } \ No newline at end of file diff --git a/modules/mogo-module-search/build.gradle b/modules/mogo-module-search/build.gradle index b5b990719a..8470868a53 100644 --- a/modules/mogo-module-search/build.gradle +++ b/modules/mogo-module-search/build.gradle @@ -58,14 +58,14 @@ dependencies { implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon - implementation rootProject.ext.dependencies.gpssimulator +// implementation rootProject.ext.dependencies.gpssimulator } else { implementation project(":libraries:mogo-map-api") implementation project(":foudations:mogo-utils") implementation project(":foudations:mogo-commons") implementation project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') - implementation project(':modules:mogo-module-gps-simulator') +// implementation project(':modules:mogo-module-gps-simulator') } implementation 'com.zhidaoauto.voice.controller:api:1.0.2' diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java index 6584886e78..138f55905e 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java @@ -1,13 +1,11 @@ package com.mogo.module.navi.constants; -import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.AbsMogoApplication; import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.navi.IMogoNavi; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.gps.simulator.IMogoGpsSimulatorManager; import com.mogo.module.navi.cp.PersonalInfoManagerImpl; import com.mogo.service.IMogoServiceApis; import com.mogo.service.analytics.IMogoAnalytics; @@ -31,7 +29,7 @@ public class SearchApisHolder { private static final String TAG = "SearchApisHolder"; private static IMogoServiceApis sApis; - private static IMogoGpsSimulatorManager sGpsSimulatorManager; +// private static IMogoGpsSimulatorManager sGpsSimulatorManager; private static PersonalInfoManagerImpl mPersonalInfoManager; @@ -86,12 +84,12 @@ public class SearchApisHolder { return getApis().getSettingManagerApi(); } - public static IMogoGpsSimulatorManager getGpsSimulatorManager() { - if ( sGpsSimulatorManager == null ) { - sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class ); - } - return sGpsSimulatorManager; - } +// public static IMogoGpsSimulatorManager getGpsSimulatorManager() { +// if ( sGpsSimulatorManager == null ) { +// sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class ); +// } +// return sGpsSimulatorManager; +// } public static IMogoSearchManager getSearchManager() { return getApis().getSearchManagerApi(); diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt index 1ae8d81d6c..3b272bd6bc 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt @@ -221,11 +221,11 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener { SettingManager.setGpsSimulator(isChecked) - if (isChecked) { - SearchApisHolder.getGpsSimulatorManager().open() - } else { - SearchApisHolder.getGpsSimulatorManager().close() - } +// if (isChecked) { +// SearchApisHolder.getGpsSimulatorManager().open() +// } else { +// SearchApisHolder.getGpsSimulatorManager().close() +// } } tb_navi.isChecked = SettingManager.isMonitor() tb_gps.isChecked = SettingManager.isGpsSimulator() diff --git a/modules/mogo-module-service/build.gradle b/modules/mogo-module-service/build.gradle index 41ad5573e9..ef590bb3e9 100644 --- a/modules/mogo-module-service/build.gradle +++ b/modules/mogo-module-service/build.gradle @@ -60,7 +60,7 @@ dependencies { api rootProject.ext.dependencies.mogocommons api rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon - implementation rootProject.ext.dependencies.gpssimulator +// implementation rootProject.ext.dependencies.gpssimulator } else { api project(":libraries:mogo-map") api project(":libraries:mogo-map-api") @@ -68,7 +68,7 @@ dependencies { api project(":foudations:mogo-commons") api project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') - implementation project(':modules:mogo-module-gps-simulator') +// implementation project(':modules:mogo-module-gps-simulator') } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index 6e4d0bfb59..6452f73baa 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -11,7 +11,6 @@ import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.entity.MarkerResponse; import com.mogo.module.common.entity.MarkerShowEntity; -import com.mogo.module.gps.simulator.IMogoGpsSimulatorManager; import com.mogo.module.service.marker.MapMarkerManager; import com.mogo.service.IMogoServiceApis; import com.mogo.service.adas.IMogoADASController; @@ -59,11 +58,11 @@ public class MarkerServiceHandler { private static IMogoLauncher sLauncher; private static IMogoFragmentManager sFragmentManager; private static ICarsChattingProvider sCarChatting; - private static IMogoGpsSimulatorManager sGpsSimulatorManager; +// private static IMogoGpsSimulatorManager sGpsSimulatorManager; public static synchronized void init( final Context context ) { - if ( sGpsSimulatorManager != null ) { + if ( sCarChatting != null ) { return; } @@ -89,7 +88,7 @@ public class MarkerServiceHandler { MapMarkerManager.getInstance().init( context ); - sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class ); +// sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class ); } public static IMogoServiceApis getApis() { @@ -168,9 +167,9 @@ public class MarkerServiceHandler { return sCarChatting; } - public static IMogoGpsSimulatorManager getGpsSimulatorManager() { - return sGpsSimulatorManager; - } +// public static IMogoGpsSimulatorManager getGpsSimulatorManager() { +// return sGpsSimulatorManager; +// } //TODO -------------以下方法是临时过度使用的，后面统一使用，getMapMarkerManager进行调用 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 a7a19b4131..1bbd2b895a 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 @@ -2,7 +2,6 @@ package com.mogo.module.service.intent; import android.content.Context; import android.content.Intent; -import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Color; import android.net.Uri; @@ -26,7 +25,6 @@ import com.mogo.map.search.geo.MogoRegeocodeResult; import com.mogo.map.search.geo.query.MogoRegeocodeQuery; import com.mogo.module.common.dialog.WMDialog; import com.mogo.module.service.MarkerServiceHandler; -import com.mogo.module.service.MogoServiceProvider; import com.mogo.module.service.R; import com.mogo.service.entrance.ButtonIndex; import com.mogo.utils.TipToast; @@ -327,12 +325,12 @@ public class MockIntentHandler implements IntentHandler { } ); } break; - case 15: - MarkerServiceHandler.getGpsSimulatorManager().open(); - break; - case 16: - MarkerServiceHandler.getGpsSimulatorManager().close(); - break; +// case 15: +// MarkerServiceHandler.getGpsSimulatorManager().open(); +// break; +// case 16: +// MarkerServiceHandler.getGpsSimulatorManager().close(); +// break; case 17: DebugConfig.setRequestOnlineCarData( intent.getBooleanExtra( "status", true ) ); break; diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt index 13782a98fe..ab742b4709 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt @@ -47,8 +47,9 @@ class StrategyShareProvider : IProvider { if (action == 0) { // adas返回前车距离，单位是米 val frontDistanceItem = GsonUtil.objectFromJson(it, AdasFrontCarDistanceY::class.java) - val distance = frontDistanceItem.result.distanceY.toDouble().toInt() - blockStrategy.refreshFrontDistance(distance) + frontDistanceItem.result.distanceY?.apply { + blockStrategy.refreshFrontDistance(it.toDouble().toInt()) + } } } catch (e: Exception) { Logger.e(S_TAG, e, "解析adas数据异常") diff --git a/modules/mogo-module-widgets/build.gradle b/modules/mogo-module-widgets/build.gradle index f4c2ca4f84..8310141b4c 100644 --- a/modules/mogo-module-widgets/build.gradle +++ b/modules/mogo-module-widgets/build.gradle @@ -55,7 +55,6 @@ dependencies { api rootProject.ext.dependencies.mogocommons api rootProject.ext.dependencies.mogoserviceapi implementation rootProject.ext.dependencies.modulecommon - implementation rootProject.ext.dependencies.gpssimulator } else { api project(":libraries:mogo-map") api project(":libraries:mogo-map-api") @@ -63,7 +62,6 @@ dependencies { api project(":foudations:mogo-commons") api project(':services:mogo-service-api') implementation project(':modules:mogo-module-common') - implementation project(':modules:mogo-module-gps-simulator') } } diff --git a/settings.gradle b/settings.gradle index a7eab4a54c..49edc56a94 100644 --- a/settings.gradle +++ b/settings.gradle @@ -42,9 +42,9 @@ include ':libraries:map-amap' include ':libraries:mogo-map-api' include ':modules:mogo-module-apps' include ':modules:mogo-module-extensions' -include ':modules:mogo-module-gps-simulator' -include ':modules:mogo-module-gps-simulator-debug' -include ':modules:mogo-module-gps-simulator-noop' +//include ':modules:mogo-module-gps-simulator' +//include ':modules:mogo-module-gps-simulator-debug' +//include ':modules:mogo-module-gps-simulator-noop' include ':libraries:map-autonavi' include ':modules:mogo-module-media' include ':modules:mogo-module-v2x'