diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt index 2490efe9b7..952d9ded09 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt @@ -8,6 +8,7 @@ import com.mogo.commons.debug.DebugConfig 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.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.biz.login.callback.ILoginViewCallback import com.mogo.och.biz.login.model.LoginStatusDefaultModel import com.mogo.och.biz.login.ui.LoginFragment @@ -130,7 +131,9 @@ class LoginProvider : LoginService { BusinessEnum.Charter -> "后台配置为：包车模式、请检查应用或配置" else -> "后台配置为：未知模式${businessType}、请检查应用或配置" } - (loginFragment as ILoginViewCallback).showErrorInfo(reaseon) + UiThreadHandler.post({ + (loginFragment as ILoginViewCallback).showErrorInfo(reaseon) + },UiThreadHandler.MODE.QUEUE) } return false } @@ -181,14 +184,23 @@ class LoginProvider : LoginService { val businessTypeSupply = checkBusinessMine(businessType) - if (loginFragment is ILoginViewCallback) { - (loginFragment as ILoginViewCallback).checkAllEnv(projectType,envType,vehicleType,businessType) + if(isProjectSupply&&envTypeSupply&&vehicleTypeSupply&&businessTypeSupply){ + + }else{ + if (loginFragment is ILoginViewCallback) { + UiThreadHandler.post({ + (loginFragment as ILoginViewCallback).checkAllEnv(projectType,envType,vehicleType,businessType) + },UiThreadHandler.MODE.QUEUE) + } } return isProjectSupply&&envTypeSupply&&vehicleTypeSupply&&businessTypeSupply } fun checkBusinessMine(businessType: BusinessType) :Boolean{ + if(businessType==BusinessType.none){ + return true + } FunctionBuildConfig.supportBusiness.forEach { if (businessType.name == it) { return true 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 8be908fac9..7fffccee37 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 @@ -116,7 +116,9 @@ class LoginPassengerFragment : MvpFragment info.append("没有登录") + BusinessType.none -> { + return + } BusinessType.bus -> info.append("小巴车") BusinessType.shuttle -> info.append("接驳车") BusinessType.charter -> info.append("包车") diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt index 178affa48f..3ab7cb9172 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt @@ -41,6 +41,13 @@ class ErrorInfoView : ConstraintLayout, ErrorInfoViewModel.IErrorInfoViewCallbac private fun initView() { LayoutInflater.from(context).inflate(R.layout.biz_login_errorinfo_view, this, true) + + if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && + AppIdentityModeUtils.isPassenger((FunctionBuildConfig.appIdentityMode)) + ) { + actv_see.visibility = GONE + } + actv_see.onClick { viewModel?.cancleCountDown() actv_countdown.text = "10s" diff --git a/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view.xml b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view.xml index efa07885b4..6020829588 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view.xml @@ -20,9 +20,11 @@ ) { if (obj.isNotEmpty()) { val first = obj.first() as ChangeBusinessType - checkEnv(first.projectType, first.envType, first.vehicleType, first.businessType) + val checkEnv = checkEnv( + first.projectType, + first.envType, + first.vehicleType, + first.businessType + ) + if(checkEnv){ + when (first.businessType) { + BusinessType.none -> { + LoginStatusManager.setBusinessType(BusinessEnum.None.code) + return LoginStatusManager.setLoginStatus(LoginStatusEnum.Logout) + } + BusinessType.bus -> LoginStatusManager.setBusinessType(BusinessEnum.Bus.code) + BusinessType.shuttle -> LoginStatusManager.setBusinessType(BusinessEnum.Shuttle.code) + BusinessType.charter -> LoginStatusManager.setBusinessType(BusinessEnum.Charter.code) + BusinessType.taxi -> LoginStatusManager.setBusinessType(BusinessEnum.Taxi.code) + BusinessType.taxiunmanned ->LoginStatusManager.setBusinessType(BusinessEnum.Taxi.code) + } + LoginStatusManager.setLoginStatus(LoginStatusEnum.Login) + } } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/LanSocketManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/LanSocketManager.kt index f7de10b1cd..1d54a8aa6c 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/LanSocketManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/LanSocketManager.kt @@ -65,7 +65,7 @@ object LanSocketManager : IReceivedMsgListener { } } }catch (e:Exception){ - + e.printStackTrace() } } 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 10bdec3d3f..ee8d4acdf9 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 @@ -17,6 +17,7 @@ import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.biz.lansocket.LoginLanDriverSocket import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket import com.mogo.och.common.module.constant.OchCommonConst @@ -60,8 +61,9 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { private fun showFragment() { val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager val fragment = if (LoginStatusManager.isLogin()) { + val fragment = getFragment() injectStatusBar() - getFragment() + fragment } else { removeStatusBar() CallerHmiManager.hideToolsView() @@ -140,7 +142,9 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { override fun onStatusChange(currentStatus: LoginStatusEnum) { d(TAG, "登录状态发生改变 ${currentStatus}") - showFragment() + UiThreadHandler.post { + showFragment() + } } override fun onBusinessChange(businessEnum: BusinessEnum) {