yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去掉部分无效模块依赖

Browse Source
This commit is contained in:
wangcongtao
2020-11-25 22:26:00 +08:00
parent 02e58641af
commit 6e3c0b117d
11 changed files with 37 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -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"

4
app/functions/gpssimulator.gradle
View File

@@ -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')
}
}

4
modules/mogo-module-search/build.gradle
View File

@@ -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'

16
modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java
View File

@@ -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();

10
modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
View File

@@ -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()

4
modules/mogo-module-service/build.gradle
View File

@@ -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')
}
}

13
modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
View File

@@ -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进行调用

14
modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
View File

@@ -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;

5
modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt
View File

@@ -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数据异常")

2
modules/mogo-module-widgets/build.gradle
View File

@@ -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')
}
}

6
settings.gradle
View File

@@ -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'