Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk

modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java

@@ -131,11 +131,11 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
                 .longitude(location.getLon())
                 .set3DMode(true)
                 .controlAngle(true)
-                .rotate(rotate)
                 .icon3DRes(getModelRes(type))
                 .anchorColor("#FB3C3CFF")
                 .flat(true);
         IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(markerType, options);
+        marker.setRotateAngle(rotate);
         marker.setToTop();
     }
 

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java

@@ -40,6 +40,9 @@ public class V2XFatigueDrivingScenario extends AbsV2XScenario<V2XPushMessageEnti
 
     @Override
     public void init(@Nullable V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity) {
+        if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
+            return;
+        }
         if (!isSameScenario(v2XMessageEntity)) {
             setV2XMessageEntity(v2XMessageEntity);
             if (v2XMessageEntity != null) {