From 9e175c870f88efca83c8719652f78ab626aeb495 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 23 Apr 2024 17:40:11 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[fragment=20=E5=A4=8D=E7=94=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OCH/bus/passenger/src/m2/AndroidManifest.xml         | 12 ------------
 .../mogo/och/biz/login/ui/LoginPassengerFragment.kt  |  5 ++++-
 .../com/mogo/och/taxi/presenter/TaxiPresenter.java   |  6 ++----
 .../main/java/com/mogo/och/taxi/ui/TaxiFragment.java |  5 +++--
 4 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 OCH/bus/passenger/src/m2/AndroidManifest.xml

diff --git a/OCH/bus/passenger/src/m2/AndroidManifest.xml b/OCH/bus/passenger/src/m2/AndroidManifest.xml
deleted file mode 100644
index ef86a3875d..0000000000
--- a/OCH/bus/passenger/src/m2/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.mogo.och.bus.passenger">
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <application>
-        <activity android:name="com.mogo.eagle.core.function.main.MainLauncherActivity"
-            android:screenOrientation="portrait"
-            tools:replace="android:screenOrientation"/>
-    </application>
-</manifest>
\ No newline at end of file
diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
index dbe4b7795a..35423a8c0f 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
@@ -34,11 +34,14 @@ class LoginPassengerFragment : MvpFragment<LoginPassengerFragment?, LoginPasseng
     private val statusList = mutableListOf<String>()
 
     override fun getLayoutId(): Int {
-
         if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) &&
             AppIdentityModeUtils.isPassenger((FunctionBuildConfig.appIdentityMode))
         ) {
             return R.layout.biz_login_passenger_view_1920x1080
+        } else if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode) &&
+            AppIdentityModeUtils.isPassenger((FunctionBuildConfig.appIdentityMode))
+        ) {
+            return R.layout.biz_login_passenger_view_1920x1080
         } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) &&
             AppIdentityModeUtils.isPassenger((FunctionBuildConfig.appIdentityMode))
         ) {
diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
index 137b770f9c..8d8ba77f0b 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
@@ -52,9 +52,6 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
         super(view);
         TaxiModel.getInstance().init(AbsMogoApplication.getApp());
         OCHAdasAbilityManager.getInstance().init(AbsMogoApplication.getApp());
-        LoginStatusManager.INSTANCE.addListener(TAG,this);
-        onStatusChange(LoginStatusManager.getLoginStatus());
-        onOpenOrderStatusEnumChange(LoginStatusManager.getOpenOrderType());
         initListeners();
     }
 
@@ -76,14 +73,15 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
         TaxiModel.getInstance().setADASStatusCallback(this);
         TaxiModel.getInstance().setControllerStatusCallback(this);
         TaxiModel.getInstance().setOrderStatusCallback(this);
+        LoginStatusManager.INSTANCE.addListener(TAG,this);
     }
 
     private void releaseListeners() {
         TaxiModel.getInstance().setADASStatusCallback(null);
         TaxiModel.getInstance().setControllerStatusCallback(null);
         TaxiModel.getInstance().setOrderStatusCallback(null);
+        LoginStatusManager.INSTANCE.removeListener(TAG);
         OCHAdasAbilityManager.getInstance().release();
-        TaxiModel.getInstance().setMoGoAutopilotPlanningListener(null);
     }
 
     private void runOnUIThread(Runnable executor) {
diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
index 17cddf5e0b..4dc8f38b29 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
@@ -15,6 +15,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.fragment.app.FragmentTransaction;
 
+import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.temp.EventLogout;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.och.common.module.biz.login.LoginStatusManager;
@@ -166,11 +167,11 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
         CallerLogger.e(M_TAXI + TAG, "onOperationChanged:" + inOperation);
         if (LoginStatusManager.isOpenOrderType()) {
             tvOperationStatus.setText("暂停接单");
-            tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.shape_size_operation_back), null, null, null);
+            tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(AbsMogoApplication.getApp().getDrawable(R.drawable.shape_size_operation_back), null, null, null);
             showPanel();
         } else {
             tvOperationStatus.setText("接单");
-            tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.shape_size_operation_out), null, null, null);
+            tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(AbsMogoApplication.getApp().getDrawable(R.drawable.shape_size_operation_out), null, null, null);
             hidPanel();
         }
     }