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

Merge remote-tracking branch 'origin/demo/shunyi_vr_map' into demo/shunyi_vr_map

Browse Source
This commit is contained in:
董宏宇
2020-10-28 16:20:53 +08:00
parent 2871256d44 1f95e7fc86
commit 876c3d7d3f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/mogo-module-common/src/main/aidl/com/mogo/module/common/machinevision/IMachineVisionInterface.aidl
View File

@@ -1,7 +1,6 @@
// IMachineVisionInterface.aidl
package com.mogo.module.common.machinevision;
import com.mogo.module.common.entity.MogoSnapshotSetData;
import com.mogo.service.adas.entity.ADASRecognizedListResult;
// Declare any non-default types here with import statements

3
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java
View File

@@ -7,6 +7,7 @@ import android.view.LayoutInflater;
import androidx.annotation.Nullable;
import com.mogo.map.marker.MogoMarkerOptions;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerPoiTypeEnum;
import com.mogo.module.common.entity.MarkerShowEntity;
@@ -50,6 +51,8 @@ public class MapMarkerView extends MapMarkerBaseView {
public void updateView( MarkerShowEntity markerShowEntity ) {
try {
Object bindObj = markerShowEntity.getBindObj();
if ( MogoApisHandler.getInstance().getApis().getMapFrameControllerApi().isVrMode() ) {
}
switch ( markerShowEntity.getMarkerType() ) {
case ServiceConst.CARD_TYPE_ROAD_CONDITION:
case ServiceConst.CARD_TYPE_NOVELTY: