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

Merge branch 'qa_merge_shunyi_vr_map' into dev_1.1.9

Browse Source
This commit is contained in:
董宏宇
2020-12-31 10:08:36 +08:00
parent b4deae290e a588c7f22b
commit 9557606c03
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/map-custom/build.gradle
View File

@@ -67,7 +67,7 @@ dependencies {
implementation project(':foudations:mogo-commons')
}
implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.5.5'
implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.5.7'
// implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.4.5-log-1'
}

5
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
View File

@@ -699,7 +699,10 @@ public class AMapViewWrapper implements IMogoMapView,
NaviClient.getInstance( getContext() ).syncCarLocation( sysLocation );
if ( checkAMapView() ) {
MapStyleController.getInstance().onLocationChanged( location, this );
// 避免设置之后被其他初始化给重置为其他模式
UiThreadHandler.postDelayed( () -> {
MapStyleController.getInstance().onLocationChanged( location, this );
}, 5_000L );
}
}

12
modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
View File

@@ -932,11 +932,13 @@ public class MogoServices implements IMogoMapListener,
@Override
public void onMapModeChanged( EnumMapUI ui ) {
if ( ui == EnumMapUI.Type_VR ) {
MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, true );
MapCenterPointStrategy.resetByChangeMode();
MapMarkerManager.getInstance().redrawMarkerByStyleChanged();
AIAssist.getInstance( mContext ).speakTTSVoice( "你已进入鹰眼模式" );
mLastStatusIsVr = true;
if ( !mLastStatusIsVr ) {
MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, true );
MapCenterPointStrategy.resetByChangeMode();
MapMarkerManager.getInstance().redrawMarkerByStyleChanged();
AIAssist.getInstance( mContext ).speakTTSVoice( "你已进入鹰眼模式" );
mLastStatusIsVr = true;
}
} else {
if ( mLastStatusIsVr ) {
mLastStatusIsVr = false;

4
services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
View File

@@ -323,6 +323,10 @@ public class MogoADASController implements IMogoADASController {
return;
}
if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) {
return;
}
try {
AutopilotServiceManage.getInstance().showAdas();
} catch ( Exception e ) {