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

Merge branch 'dev' into dev_custom_map

Browse Source 
# Conflicts:
#	libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
This commit is contained in:
wangcongtao
2020-08-14 16:24:47 +08:00
parent a573a53ceb 0093886a35
commit d12083b22b
928 changed files with 25369 additions and 4487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/mogo-map/src/main/java/com/mogo/map/MogoMapDelegateFactory.java
View File

@@ -75,7 +75,10 @@ class MogoMapDelegateFactory {
}
public static IMogoNavi getNaviDelegate( Context context ) {
if ( AppUtils.isAppInstalled( context, "com.autonavi.amapauto" ) ) {
if ( DebugConfig.isUseCustomNavi() ) {
return NaviClient.getInstance( context );
} else if ( AppUtils.isAppInstalled( context, "com.autonavi.amapauto" ) ) {
return AutoNaviClient.getInstance( context );
} else {
if ( DebugConfig.isUseCustomMap() ) {

1
libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java
View File

@@ -6,6 +6,7 @@ import android.content.pm.PackageManager;
import android.graphics.Rect;
import android.location.Location;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.impl.amap.navi.NaviClient;
import com.mogo.map.impl.automap.navi.AutoNaviClient;
import com.mogo.map.navi.IMogoCarLocationChangedListener2;