[6.4.4]

[删除vr监听]

OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/callback/IBusPassengerControllerStatusCallback.java

@@ -8,8 +8,7 @@ import com.mogo.eagle.core.data.map.MogoLocation;
  * Model->Presenter回调：状态控制器监听（accOn、adas ui show、voice ui show、push ui show、v2x ui show等等）
  */
 public interface IBusPassengerControllerStatusCallback {
-    // 是否vr map模式
-    void onVRModeChanged(boolean isVRMode);
+
     // 自车定位
     void onCarLocationChanged(MogoLocation location);
 }

OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/model/BusPassengerModel.kt

@@ -335,11 +335,6 @@ object BusPassengerModel {
         OchAutoPilotStatusListenerManager.addListener(TAG, mGoAutopilotStatusListener)
         IntentManager.getInstance()
             .registerIntentListener(ConnectivityManager.CONNECTIVITY_ACTION, mNetWorkIntentListener)
-        MogoStatusManager.getInstance().registerStatusChangedListener(
-            TAG,
-            StatusDescriptor.VR_MODE,
-            mMogoStatusChangedListener
-        )
         // 定位监听
         addListener(TAG, 3, mMapLocationListener)
 
@@ -351,11 +346,6 @@ object BusPassengerModel {
     }
 
     private fun releaseListeners() {
-        MogoStatusManager.getInstance().unregisterStatusChangedListener(
-            TAG,
-            StatusDescriptor.VR_MODE,
-            mMogoStatusChangedListener
-        )
 
         // 注销定位监听
         CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
@@ -449,17 +439,6 @@ object BusPassengerModel {
         }
     }
 
-    // VR mode变更回调
-    private val mMogoStatusChangedListener =
-        IMogoStatusChangedListener { descriptor: StatusDescriptor, isTrue: Boolean ->
-            if (StatusDescriptor.VR_MODE == descriptor) {
-                if (mControllerStatusCallbackMap.isNotEmpty()) {
-                    for (callback in mControllerStatusCallbackMap.values) {
-                        callback.onVRModeChanged(isTrue)
-                    }
-                }
-            }
-        }
     private val mMapLocationListener: IMoGoChassisLocationGCJ02Listener =
         object : IMoGoChassisLocationGCJ02Listener {
             override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) {

OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java

@@ -109,11 +109,6 @@ public class BaseBusPassengerPresenter extends Presenter<BusPassengerRouteFragme
         });
     }
 
-    @Override
-    public void onVRModeChanged(boolean isVRMode) {
-
-    }
-
     @Override
     public void onCarLocationChanged(MogoLocation location) {
         runOnUIThread(() -> {

app/script/flavorfilter/flavors.json

@@ -1,8 +1,8 @@
 {
   "mogo": {
     "C1":["driver"],
-    "B1":["driver","passenger","bailing"],
-    "B2":["driver","passenger","bailing"],
+    "B1":["driver","passenger"],
+    "B2":["driver","passenger"],
     "T1T2":["driver","passenger"],
     "ALL":["driver","passenger"]
   },