From 32cf2592bbac89bb23e0e2fab650c43ac631470a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 22 Oct 2024 18:26:33 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.2]=20[fea]=20[=E6=B7=BB=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/biz/login/model/LoginModel.kt | 2 ++ .../och/common/module/biz/lansocket/LoginLanPassengerSocket.kt | 3 +++ .../com/mogo/och/common/module/biz/login/LoginStatusManager.kt | 2 ++ .../och/common/module/network/interceptor/FRetryWithTime.kt | 2 ++ .../src/main/java/com/mogo/och/facade/route/FacadeProvider.kt | 1 + 5 files changed, 10 insertions(+) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt index a2700f1428..b062f888bb 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt @@ -259,6 +259,7 @@ object LoginModel { fun logout() { val location4Login = TaxiLogoutReqBean.Location4Login() if (FunctionBuildConfig.isOffLine) { + CallerLogger.d(TAG, "离线模式登录后退出 setLoginStatus:${LoginStatusEnum.Logout}") LoginStatusManager.setLoginStatus(LoginStatusEnum.Logout) FunctionBuildConfig.isOffLine = false return @@ -319,6 +320,7 @@ object LoginModel { fun gotoOfflineMode() { FunctionBuildConfig.isOffLine = true + CallerLogger.d(TAG, "离线模式登录 setLoginStatus:${LoginStatusEnum.Login}") LoginStatusManager.setLoginStatus(LoginStatusEnum.Login) } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanPassengerSocket.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanPassengerSocket.kt index d030415706..b2f90d1d35 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanPassengerSocket.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanPassengerSocket.kt @@ -90,6 +90,7 @@ object LoginLanPassengerSocket : IReceivedMsgListener, CallerBase { LoginStatusManager.setBusinessType(BusinessEnum.None.code) + CallerLogger.d(TAG, "乘客屏 收到消息 司机屏没有登录:${LoginStatusEnum.Logout}") return LoginStatusManager.setLoginStatus(LoginStatusEnum.Logout) } BusinessType.bus -> LoginStatusManager.setBusinessType(BusinessEnum.Bus.code) @@ -137,6 +139,7 @@ object LoginLanPassengerSocket : IReceivedMsgListener, CallerBase") LoginStatusManager.changeStatus(status.toString()) UiThreadHandler.postDelayed({ + CallerLogger.d(TAG, "乘客屏 收到消息 司机屏业务模式相同:${LoginStatusEnum.Login}") LoginStatusManager.setLoginStatus(LoginStatusEnum.Login) },2000) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt index c8b6af3dd0..c3af1361b0 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt @@ -4,6 +4,7 @@ package com.mogo.och.common.module.biz.login import androidx.fragment.app.Fragment import com.alibaba.android.arouter.launcher.ARouter import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.manager.loop.LoopInfo @@ -100,6 +101,7 @@ object LoginStatusManager : CallerBase() { @JvmStatic fun setLoginStatus(loginStatus: LoginStatusEnum) { + CallerLogger.d(TAG, "setLoginStatus:${loginStatus}") loginService?.setLoginStatus(loginStatus) } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/network/interceptor/FRetryWithTime.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/network/interceptor/FRetryWithTime.kt index eabefa8ed7..e9e5748b5b 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/network/interceptor/FRetryWithTime.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/network/interceptor/FRetryWithTime.kt @@ -4,6 +4,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClient import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.biz.login.LoginStatusEnum import io.reactivex.Observable @@ -20,6 +21,7 @@ class FRetryWithTime : Function> { }else if(it.code == 1003){ if(!FunctionBuildConfig.isOffLine&&!FunctionBuildConfig.ochdebug){ if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { + CallerLogger.d("FRetryWithTime", "接口失败报错 1003:${LoginStatusEnum.Logout}") LoginStatusManager.setLoginStatus(LoginStatusEnum.Logout) } } diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt index 8018098bd5..8566a607b2 100644 --- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt +++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt @@ -224,6 +224,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { } else { onBusinessChange(businessEnum) FunctionBuildConfig.ochdebug = true + CallerLogger.d(TAG, "denbug模式进入${LoginStatusEnum.Login}") LoginStatusManager.setLoginStatus(LoginStatusEnum.Login) val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager val fragment = getFragment()