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

[6.4.0]

Browse Source 
[fragment 复用问题]
This commit is contained in:
yangyakun
2024-04-23 17:40:11 +08:00
parent 5cfbb738c2
commit 9e175c870f
4 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OCH/bus/passenger/src/m2/AndroidManifest.xml
View File

@@ -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>

5
OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
View File

@@ -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))
) {

6
OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
View File

@@ -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) {

5
OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
View File

@@ -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();
}
}