diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 9d8d20d50d..5974cf305a 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -84,7 +84,6 @@ diff --git a/config.gradle b/config.gradle index c15cb61257..4fd57c702c 100644 --- a/config.gradle +++ b/config.gradle @@ -34,7 +34,7 @@ ext { // 地图 amapnavi3dmap : "com.amap.api:navi-3dmap:7.2.0_3dmap7.2.0", amapsearch : "com.amap.api:search:7.1.0", - amaplocation : "com.amap.api:location:4.9.0", + amaplocation : "com.amap.api:location:5.2.0", // json 转换 gson : "com.google.code.gson:gson:2.8.4", // 内存泄漏检测 diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 7be264997b..da8f4a0e08 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -68,7 +68,7 @@ dependencies { } implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.8.1' -// implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.4.5-log-1' +// implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/libraries/map-custom/src/main/res/drawable-ldpi/map_api_ic_current_location2.png b/libraries/map-custom/src/main/res/drawable-ldpi/map_api_ic_current_location2.png index 5f91be07f3..98fc674705 100644 Binary files a/libraries/map-custom/src/main/res/drawable-ldpi/map_api_ic_current_location2.png and b/libraries/map-custom/src/main/res/drawable-ldpi/map_api_ic_current_location2.png differ diff --git a/libraries/map-custom/src/main/res/drawable-mdpi/map_api_ic_current_location2.png b/libraries/map-custom/src/main/res/drawable-mdpi/map_api_ic_current_location2.png index 5f91be07f3..98fc674705 100644 Binary files a/libraries/map-custom/src/main/res/drawable-mdpi/map_api_ic_current_location2.png and b/libraries/map-custom/src/main/res/drawable-mdpi/map_api_ic_current_location2.png differ diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/ADASStatusIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/ADASStatusIntentHandler.java index ecd894836c..cb6fbe0bb4 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/ADASStatusIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/ADASStatusIntentHandler.java @@ -56,17 +56,17 @@ class ADASStatusIntentHandler implements IntentHandler { MarkerServiceHandler.getMogoStatusManager().setADASUIShow( ServiceConst.TYPE, status == 1 ); } // 由于adas可能调高此处的调用频率,存在anr风险,且此处没有作用,所以暂时注释掉 -// else { -// String msg = intent.getStringExtra( "adasMsg" ); -// if ( TextUtils.isEmpty( msg ) ) { -// return; -// } -// CarStateInfo stateInfo = GsonUtil.objectFromJson( msg, CarStateInfo.class ); -// if ( stateInfo != null ) { -// changeCarHeadstockDirection( context, stateInfo.getValues().getHeading() ); -// // changeMyLocation( stateInfo.getValues() ); -// } -// } + else { + String msg = intent.getStringExtra( "adasMsg" ); + if ( TextUtils.isEmpty( msg ) ) { + return; + } + CarStateInfo stateInfo = GsonUtil.objectFromJson( msg, CarStateInfo.class ); + if ( stateInfo != null ) { + changeCarHeadstockDirection( context, stateInfo.getValues().getHeading() ); + // changeMyLocation( stateInfo.getValues() ); + } + } } private void changeCarHeadstockDirection( final Context context, final double degree ) {