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

Merge branch 'demo/shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into demo/shunyi_vr_map

Browse Source
This commit is contained in:
unknown
2020-10-30 16:25:31 +08:00
parent 859eb86ece 6c01f8a2ec
commit 4cda009ab1
43 changed files with 512 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1101,4 +1101,8 @@ public class MogoServices implements IMogoMapListener,
public void destroy() {
Logger.d( TAG, "MogoServices do nothings." );
}
public Location getLastCarLocation() {
return mLastCarLocation;
}
}

17
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
View File

@@ -29,6 +29,7 @@ import com.mogo.module.common.entity.MarkerResponse;
import com.mogo.module.common.entity.MarkerShowEntity;
import com.mogo.module.common.entity.MogoSnapshotSetData;
import com.mogo.module.service.MarkerServiceHandler;
import com.mogo.module.service.MogoServices;
import com.mogo.module.service.R;
import com.mogo.module.service.ServiceConst;
import com.mogo.module.service.network.RefreshCallback;
@@ -148,7 +149,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
}
@Override
public Class<MogoSnapshotSetData> target() {
public Class< MogoSnapshotSetData > target() {
return MogoSnapshotSetData.class;
}
@@ -160,6 +161,10 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
if ( !MogoApisHandler.getInstance().getApis().getMapFrameControllerApi().isVrMode() ) {
return;
}
if ( MogoServices.getInstance().getLastCarLocation() != null ) {
data.curSpeed = MogoServices.getInstance().getLastCarLocation().getSpeed();
}
SnapshotSetDataDrawer.getInstance().renderSnapshotData( data, false );
VrModeController.getInstance().renderMogoSnapshotSetData( data );
}
@@ -174,8 +179,12 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
if ( resultList == null || resultList.isEmpty() ) {
return;
}
double speed = 0.0;
if ( MogoServices.getInstance().getLastCarLocation() != null ) {
speed = MogoServices.getInstance().getLastCarLocation().getSpeed();
}
// 绘制近景识别到的车辆，每秒绘制一次
AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult( resultList );
AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult( resultList, false, speed );
} );
}
@@ -652,12 +661,12 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
}
private boolean ignoreDrawRequest() {
return MarkerServiceHandler.getMogoStatusManager().isSearchUIShow()
|| MarkerServiceHandler.getMogoStatusManager().isV2XShow()
|| !MarkerServiceHandler.getMogoStatusManager().isMainPageLaunched()
|| !MarkerServiceHandler.getMogoStatusManager().isMainPageOnResume();
|| !MarkerServiceHandler.getMogoStatusManager().isMainPageOnResume()
|| MarkerServiceHandler.getApis().getMapFrameControllerApi().isVrMode();
}
private void runOnTargetThread( Runnable runnable ) {

10
modules/mogo-module-service/src/main/java/com/mogo/module/service/vrmode/VrModeController.java
View File

@@ -51,11 +51,11 @@ class VrModeController {
}
public void onVrModeChanged( boolean isVrMode ) {
if ( isVrMode ) {
bindVrModeService();
} else {
unbindVrModeService();
}
// if ( isVrMode ) {
// bindVrModeService();
// } else {
// unbindVrModeService();
// }
}
private void bindVrModeService() {