合并解决冲突

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java

@@ -133,10 +133,4 @@ public class V2XConst {
      * 绿波车速marker
      */
     public static final String V2X_OPTIMAL_SPEED_MARKER = "V2X_OPTIMAL_SPEED_MARKER";
-
-    /* TODO 这里是常量，不能作为判断依据，初始化后就存在内存了，不会随着状态改变而改变
-    * VR模式
-    * */
-    public static final boolean VR_MODE = MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode();
-
 }

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java

@@ -27,7 +27,6 @@ import com.shuyu.gsyvideoplayer.video.base.GSYVideoView;
 
 import java.util.ArrayList;
 
-import static com.mogo.module.v2x.V2XConst.VR_MODE;
 import static com.shuyu.gsyvideoplayer.utils.GSYVideoType.SCREEN_MATCH_FULL;
 
 /**

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java

@@ -8,7 +8,6 @@ import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.utils.logger.Logger;
 
-import static com.mogo.module.v2x.V2XConst.VR_MODE;
 
 /**
  * @ProjectName: MoGoModulSafeDriving

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java

@@ -15,7 +15,6 @@ import androidx.annotation.Nullable;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 
-import static com.mogo.module.v2x.V2XConst.VR_MODE;
 
 /**
  * 红心点赞按钮控件

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java

@@ -14,7 +14,6 @@ import androidx.annotation.Nullable;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 
-import static com.mogo.module.v2x.V2XConst.VR_MODE;
 
 /**
  * 不喜欢按钮控件