From 0c99cf4b603e1f7d662d158f92884730f6b66c0a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 22 Oct 2024 18:26:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[6.7.2]=20[fea]=20[=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=97=A5=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 2d5235085b..0aea55136f 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 @@ -246,6 +246,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 @@ -306,6 +307,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 59b9d6c0ba..72773fa6b0 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 @@ -232,6 +232,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() From ba6f1609238fa21ed4ab285130266e60fd3c658d Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 23 Oct 2024 14:10:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[6.7.0]=E4=BF=AE=E5=A4=8D=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E2=80=9C=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E2=80=9D=E5=90=8E=E5=87=BA=E7=8E=B0=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt index 1b17a56554..fab38a6847 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt @@ -99,7 +99,7 @@ class FaultReasonView @JvmOverloads constructor( private var reportNote: String = "" //上报描述 private val reportType: Int = 1 //上报方式：0：小程序 1：司机屏 2：云端上报 - private var source: Int = 0 //操作源，0:默认，一级分类 1:类型，二级分类；2:原因，三级分类 + private var source: Int = 0 //操作源，0:默认，一级分类 ; 1:类型，二级分类; 2:原因，三级分类 private var hasLevel2: Boolean = false //是否有二级分类 private var hasLevel3: Boolean = false //是否有三级分类 @@ -506,7 +506,6 @@ class FaultReasonView @JvmOverloads constructor( if (source == 0) { level1Id = list[0].id level1Name = list[0].name - source = 1 //获取故障二级分类即故障类型 CallerDevaToolsManager.getCategories( @@ -573,6 +572,7 @@ class FaultReasonView @JvmOverloads constructor( ) ) setAudio(false) + source = 0 level1Id = 0 //一级分类ID level2Id = 0 //二级分类ID level3Id = 0 //三级分类ID