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 952d9ded09..95849e138d 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 @@ -4,7 +4,6 @@ import android.content.Context import android.view.View import androidx.fragment.app.Fragment import com.alibaba.android.arouter.facade.annotation.Route -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 @@ -24,8 +23,7 @@ import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType import com.mogo.och.common.module.manager.socket.lan.bean.EnvType import com.mogo.och.common.module.manager.socket.lan.bean.ProjectType import com.mogo.och.common.module.manager.socket.lan.bean.VehicleType -import com.mogo.och.common.module.utils.Project -import com.mogo.och.common.module.utils.ProjectUtils +import com.mogo.och.common.module.utils.FlavorUtils /** * 网约车小巴业务实现入口 @@ -89,50 +87,13 @@ class LoginProvider : LoginService { } override fun checkBusiness(businessType: Int): Boolean { - val businessEnum = BusinessEnum.valueOf(businessType) - FunctionBuildConfig.supportBusiness.forEach { - when (it) { - "shuttle" -> { - val isSupply = businessEnum == BusinessEnum.Shuttle - if (isSupply) { - return isSupply - } - } - - "bus" -> { - val isSupply = businessEnum == BusinessEnum.Bus - if (isSupply) { - return isSupply - } - } - - "taxi" -> { - val isSupply = businessEnum == BusinessEnum.Taxi - if (isSupply) { - return isSupply - } - } - - "charter" -> { - val isSupply = businessEnum == BusinessEnum.Charter - if (isSupply) { - return isSupply - } - } - - else -> {} - } + val businessInfo = FlavorUtils.getBusinessInfo(businessType) + if(businessInfo.isEmpty()){ + return true } if (loginFragment is ILoginViewCallback) { - val reaseon = when (businessEnum) { - BusinessEnum.Taxi -> "后台配置为：出租车模式、请检查应用或配置" - BusinessEnum.Bus -> "后台配置为：小巴模式、请检查应用或配置" - BusinessEnum.Shuttle -> "后台配置为：接驳模式、请检查应用或配置" - BusinessEnum.Charter -> "后台配置为：包车模式、请检查应用或配置" - else -> "后台配置为：未知模式${businessType}、请检查应用或配置" - } UiThreadHandler.post({ - (loginFragment as ILoginViewCallback).showErrorInfo(reaseon) + (loginFragment as ILoginViewCallback).showErrorInfo(businessInfo) },UiThreadHandler.MODE.QUEUE) } return false @@ -145,70 +106,27 @@ class LoginProvider : LoginService { businessType: BusinessType ): Boolean { - val isProjectSupply = when (ProjectUtils.getProjectType()) { - Project.SAAS -> projectType == ProjectType.saas - Project.DALI -> projectType == ProjectType.dali - Project.MOGO -> projectType == ProjectType.mogo - Project.YANTAI -> projectType == ProjectType.yantai - } - - val envTypeSupply = when (DebugConfig.getNetMode()) { - 2 -> { - envType == EnvType.qa - } - - 3 -> { - envType == EnvType.online - } - - 4 -> { - envType == EnvType.demo - } - - else -> { - envType == EnvType.qa - } - } - val vehicleTypeSupply = - if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)) { - vehicleType == VehicleType.T1T2 - } else if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)) { - vehicleType == VehicleType.M1 - } else if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) { - vehicleType == VehicleType.B1 - } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) { - vehicleType == VehicleType.B2 - } else { - vehicleType == VehicleType.C1 - } - - val businessTypeSupply = checkBusinessMine(businessType) - - if(isProjectSupply&&envTypeSupply&&vehicleTypeSupply&&businessTypeSupply){ + val checkAllEnv = FlavorUtils.checkAllEnv(projectType, envType, vehicleType, businessType) + if(checkAllEnv.isEmpty()){ }else{ if (loginFragment is ILoginViewCallback) { + changeStatus(checkAllEnv) UiThreadHandler.post({ - (loginFragment as ILoginViewCallback).checkAllEnv(projectType,envType,vehicleType,businessType) + changeStatus(checkAllEnv) + (loginFragment as ILoginViewCallback).checkAllEnv(checkAllEnv) },UiThreadHandler.MODE.QUEUE) } } - return isProjectSupply&&envTypeSupply&&vehicleTypeSupply&&businessTypeSupply + return checkAllEnv.isEmpty() } - fun checkBusinessMine(businessType: BusinessType) :Boolean{ - if(businessType==BusinessType.none){ - return true - } - FunctionBuildConfig.supportBusiness.forEach { - if (businessType.name == it) { - return true - } - } - return false + override fun changeStatus(currentStatus: String) { + (loginFragment as ILoginViewCallback).updateStatus(currentStatus) } + override fun setLoginInfo(loginInfo: LoginInfo) { CallerLogger.d(tag, "setLoginInfo:${loginInfo}") this.loginInfo = loginInfo diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/callback/ILoginViewCallback.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/callback/ILoginViewCallback.kt index b973dceacb..c624511a53 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/callback/ILoginViewCallback.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/callback/ILoginViewCallback.kt @@ -9,10 +9,7 @@ interface ILoginViewCallback { fun showErrorInfo(errorInfo: String) fun checkAllEnv( - projectType: ProjectType, - envType: EnvType, - vehicleType: VehicleType, - businessType: BusinessType + reason:String ){} fun updateStatus(status:String){} diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/presenter/LoginPassengerPresenter.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/presenter/LoginPassengerPresenter.kt index 20b07d8b7b..455fd6180e 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/presenter/LoginPassengerPresenter.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/presenter/LoginPassengerPresenter.kt @@ -7,6 +7,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.och.biz.login.callback.ITaxiLoginCallback import com.mogo.och.biz.login.model.LoginModel import com.mogo.och.biz.login.ui.LoginPassengerFragment +import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.common.module.manager.loop.LoopInfo /** * @author congtaowang @@ -26,6 +28,7 @@ class LoginPassengerPresenter(view: LoginPassengerFragment?) : Presenter(), ILoginView } override fun checkAllEnv( - projectType: ProjectType, - envType: EnvType, - vehicleType: VehicleType, - businessType: BusinessType + reason:String ) { // 司机屏不用处理 只处理 后台返回的业务模型就行 } 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 7fffccee37..dbe4b7795a 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 @@ -4,21 +4,18 @@ import android.view.View import androidx.appcompat.widget.AppCompatTextView import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.commons.mvp.MvpFragment -import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.util.AppUtils +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.biz.R import com.mogo.och.biz.login.callback.ILoginViewCallback import com.mogo.och.biz.login.presenter.LoginPassengerPresenter import com.mogo.och.biz.login.ui.debugview.BusinessView -import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType -import com.mogo.och.common.module.manager.socket.lan.bean.EnvType -import com.mogo.och.common.module.manager.socket.lan.bean.ProjectType -import com.mogo.och.common.module.manager.socket.lan.bean.VehicleType +import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket +import com.mogo.och.common.module.utils.FlavorUtils import kotlinx.android.synthetic.main.biz_login_view.eiv_Info -import java.lang.StringBuilder /** @@ -34,6 +31,8 @@ class LoginPassengerFragment : MvpFragment() + override fun getLayoutId(): Int { if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) && @@ -58,12 +57,13 @@ class LoginPassengerFragment : MvpFragment info.append("大理环境") - ProjectType.mogo -> info.append("衡阳环境") - ProjectType.saas -> info.append("saas环境") - ProjectType.yantai -> info.append("烟台环境") - } - when (envType) { - EnvType.qa -> info.append("、qa测试环境") - EnvType.online -> info.append("、正式环境环境") - EnvType.demo -> info.append("、开发环境环境") - } - when (vehicleType) { - VehicleType.T1T2 -> info.append("、车型是:T1T2") - VehicleType.C1 -> info.append("、车型是:B2") - VehicleType.B1 -> info.append("、车型是:B1") - VehicleType.B2 -> info.append("、车型是:B2") - VehicleType.M1 -> info.append("、车型是:M1") - } - - info.append("、支持的业务类型有:") - when (businessType) { - BusinessType.none -> { - return - } - BusinessType.bus -> info.append("小巴车") - BusinessType.shuttle -> info.append("接驳车") - BusinessType.charter -> info.append("包车") - BusinessType.taxi -> info.append("出租车") - BusinessType.taxiunmanned -> info.append("无人化出租车") - } - eiv_Info.visibility = View.VISIBLE - eiv_Info.showErrinfo(info.toString()) + eiv_Info.showErrinfo(reason) } override fun updateStatus(status: String) { - actv_connect_status?.text = "当前状态:${status}" + statusList.add(status) } override fun onResume() { super.onResume() CallerLogger.d(TAG, "onResume") + if (CallerTelematicManager.getClientConnStatus()) { + updateStatus("连接成功 司机SN:${LoginLanPassengerSocket.driverSn}") + }else{ + updateStatus("连接司机屏中") + } } override fun onPause() { super.onPause() CallerLogger.d(TAG, "onPause") } + + fun showStatus() { + if (statusList.isNotEmpty()) { + val removeFirst = statusList.removeFirst() + UiThreadHandler.post({ + actv_connect_status?.text = "当前状态:${removeFirst}" + }, UiThreadHandler.MODE.QUEUE) + } + + } } \ No newline at end of file diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt index 682eb83bfa..8041973b4c 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt @@ -15,7 +15,6 @@ import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_charter import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_shuttle import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_taxi -import kotlinx.android.synthetic.main.biz_login_errorinfo_view.view.actv_countdown class BusinessView : ConstraintLayout, BusinessViewModel.IErrorInfoViewCallback { 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 3ab7cb9172..69cb14b5fb 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 @@ -3,26 +3,16 @@ package com.mogo.och.biz.login.ui.errorview import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater +import androidx.appcompat.widget.AppCompatTextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner -import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.och.biz.R -import com.mogo.och.biz.login.ui.debugview.BusinessViewModel -import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType -import com.mogo.och.common.module.manager.socket.lan.bean.EnvType -import com.mogo.och.common.module.manager.socket.lan.bean.ProjectType -import com.mogo.och.common.module.manager.socket.lan.bean.VehicleType -import com.mogo.och.common.module.utils.Project -import com.mogo.och.common.module.utils.ProjectUtils -import kotlinx.android.synthetic.main.biz_login_errorinfo_view.view.actv_countdown -import kotlinx.android.synthetic.main.biz_login_errorinfo_view.view.actv_error_body -import kotlinx.android.synthetic.main.biz_login_errorinfo_view.view.actv_error_head -import kotlinx.android.synthetic.main.biz_login_errorinfo_view.view.actv_see -import java.lang.StringBuilder +import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket +import com.mogo.och.common.module.utils.FlavorUtils class ErrorInfoView : ConstraintLayout, ErrorInfoViewModel.IErrorInfoViewCallback { @@ -33,75 +23,53 @@ class ErrorInfoView : ConstraintLayout, ErrorInfoViewModel.IErrorInfoViewCallbac constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) - constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super( + context, + attributeSet, + defStyleAttr + ) - constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) + constructor( + context: Context, + attributeSet: AttributeSet, + defStyleAttr: Int, + defStyleRes: Int + ) : super(context, attributeSet, defStyleAttr, defStyleRes) + + private var actv_see: AppCompatTextView? = null + private var actv_countdown: AppCompatTextView? = null + private var actv_error_body: AppCompatTextView? = null + private var actv_error_head: AppCompatTextView? = null private var viewModel: ErrorInfoViewModel? = null private fun initView() { - LayoutInflater.from(context).inflate(R.layout.biz_login_errorinfo_view, this, true) - - if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && + if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger((FunctionBuildConfig.appIdentityMode)) ) { - actv_see.visibility = GONE + LayoutInflater.from(context) + .inflate(R.layout.biz_login_errorinfo_view_1920x1080, this, true) + } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && + AppIdentityModeUtils.isPassenger((FunctionBuildConfig.appIdentityMode)) + ) { + LayoutInflater.from(context) + .inflate(R.layout.biz_login_errorinfo_view_1080x1920, this, true) + } else { + LayoutInflater.from(context) + .inflate(R.layout.biz_login_errorinfo_view_2560x1600, this, true) } + actv_see = findViewById(R.id.actv_see) + actv_countdown = findViewById(R.id.actv_countdown) + actv_error_body = findViewById(R.id.actv_error_body) + actv_error_head = findViewById(R.id.actv_error_head) - actv_see.onClick { + actv_see?.onClick { viewModel?.cancleCountDown() - actv_countdown.text = "10s" + actv_countdown?.text = "10s" visibility = GONE } - val info = StringBuilder() - - when (ProjectUtils.getProjectType()) { - Project.SAAS -> info.append("saas环境") - Project.DALI -> info.append("大理环境") - Project.MOGO -> info.append("衡阳环境") - Project.YANTAI -> info.append("烟台环境") - } - - when (DebugConfig.getNetMode()) { - 2 -> { - info.append("、qa测试环境") - } - - 3 -> { - info.append("、正式环境环境") - } - - 4 -> { - info.append("、开发环境环境") - } - - else -> { - info.append("、qa测试环境") - } - } - val vehicleTypeSupply = - if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)) { - info.append("、车型是:T1T2") - } else if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)) { - info.append("、车型是:M1") - } else if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) { - info.append("、车型是:B1") - } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) { - info.append("、车型是:B2") - } else { - info.append("、车型是:C1") - } - info.append("、支持的业务类型有:") - FunctionBuildConfig.supportBusiness.forEachIndexed { index, s -> - if (index==FunctionBuildConfig.supportBusiness.size-1) { - info.append(s) - }else{ - info.append("$s、") - } - } - - actv_error_body.text = info + actv_error_body?.text = FlavorUtils.getInfo() } @@ -119,9 +87,9 @@ class ErrorInfoView : ConstraintLayout, ErrorInfoViewModel.IErrorInfoViewCallbac override fun onVisibilityAggregated(isVisible: Boolean) { super.onVisibilityAggregated(isVisible) - if(isVisible){ + if (isVisible) { viewModel?.showCountDown() - }else{ + } else { } } @@ -135,15 +103,16 @@ class ErrorInfoView : ConstraintLayout, ErrorInfoViewModel.IErrorInfoViewCallbac } override fun setCountDownText(countDown: String, isEnd: Boolean) { - if(isEnd){ + if (isEnd) { visibility = GONE - }else{ - actv_countdown.text = countDown + } else { + actv_countdown?.text = countDown } } fun showErrinfo(errorInfo: String) { - actv_error_head.text = errorInfo + actv_error_head?.text = errorInfo + actv_error_body?.text = "${FlavorUtils.getInfo()} 司机SN:${LoginLanPassengerSocket.driverSn}" } } \ No newline at end of file diff --git a/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1080x1920.xml b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1080x1920.xml new file mode 100644 index 0000000000..ab9ff629d4 --- /dev/null +++ b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1080x1920.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1920x1080.xml b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1920x1080.xml new file mode 100644 index 0000000000..e6c4f2e47a --- /dev/null +++ b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1920x1080.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + \ No newline at end of file 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_2560x1600.xml similarity index 97% rename from OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view.xml rename to OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_2560x1600.xml index 6020829588..c0a9935842 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_2560x1600.xml @@ -2,8 +2,8 @@ @@ -25,9 +25,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/dp_70" + android:gravity="center" android:text="版本号:6.4.0" android:textColor="@color/white" - android:textSize="@dimen/dp_44" + android:textSize="@dimen/dp_36" app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml index 3c120e0d16..fb5d552458 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml @@ -14,9 +14,9 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_70" - android:text="当前状态:等待中" + android:text="当前状态:连接司机屏中" android:textColor="@color/white" - android:textSize="@dimen/dp_44" + android:textSize="@dimen/dp_36" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/actv_app_version" app:layout_constraintHorizontal_chainStyle="packed" @@ -30,7 +30,7 @@ android:layout_marginBottom="@dimen/dp_70" android:text="版本号:6.4.0" android:textColor="@color/white" - android:textSize="@dimen/dp_44" + android:textSize="@dimen/dp_36" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/actv_connect_status" /> diff --git a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_2560x1600.xml b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_2560x1600.xml index 3c17996e5e..4f6314ecdc 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_2560x1600.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_2560x1600.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_70" - android:text="当前状态:等待中" + android:text="当前状态:连接司机屏中" android:textColor="@color/white" android:textSize="@dimen/dp_44" app:layout_constraintBottom_toBottomOf="parent" diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt index d584c9d86b..c9b733522b 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt @@ -15,20 +15,11 @@ import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType import com.mogo.och.common.module.manager.socket.lan.bean.ChangeBusinessType import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType import com.mogo.och.common.module.manager.socket.lan.bean.EnvCheck -import com.mogo.och.common.module.manager.socket.lan.bean.EnvType -import com.mogo.och.common.module.manager.socket.lan.bean.ProjectType -import com.mogo.och.common.module.manager.socket.lan.bean.VehicleType -import com.mogo.och.common.module.utils.Project -import com.mogo.och.common.module.utils.ProjectUtils +import com.mogo.och.common.module.utils.FlavorUtils object LoginLanDriverSocket : ILoginCallback { private const val TAG = "LoginLanSocket" - var vehicleType: VehicleType? = null - var businessType: BusinessType? = null - var projectType: ProjectType? = null - var envType: EnvType? = null - // 客户端注册 private val registerListener = object : ILanMessageListener { override fun target(): Class { @@ -38,14 +29,14 @@ object LoginLanDriverSocket : ILoginCallback { override fun onMsgReceived(obj: Array) { println("-------${obj}") if(LoginStatusManager.isLogin()) { - getEnvCheck() + FlavorUtils.getEnvCheck() val msg = - ChangeBusinessType(vehicleType!!, businessType!!, projectType!!, envType!!) + ChangeBusinessType(FlavorUtils.vehicleType!!, FlavorUtils.businessType!!, FlavorUtils.projectType!!, FlavorUtils.envType!!) LanSocketManager.sendMsgToClient(msg) }else{ - getEnvCheck() + FlavorUtils.getEnvCheck() val msg = - ChangeBusinessType(vehicleType!!, BusinessType.none, projectType!!, envType!!) + ChangeBusinessType(FlavorUtils.vehicleType!!, BusinessType.none, FlavorUtils.projectType!!, FlavorUtils.envType!!) LanSocketManager.sendMsgToClient(msg) } } @@ -70,90 +61,26 @@ object LoginLanDriverSocket : ILoginCallback { super.onStatusChange(currentStatus) when (currentStatus) { LoginStatusEnum.Login -> { - getEnvCheck() + FlavorUtils.getEnvCheck() val msg = - ChangeBusinessType(vehicleType!!, businessType!!, projectType!!, envType!!) + ChangeBusinessType(FlavorUtils.vehicleType!!, FlavorUtils.businessType!!, FlavorUtils.projectType!!, FlavorUtils.envType!!) LanSocketManager.sendMsgToClient(msg) - BizLoopManager.setLoopFunction(TAG, LoopInfo(60 * 5, ::loopCheck)) + BizLoopManager.setLoopFunction(TAG, LoopInfo(60, ::loopCheck)) } else -> { BizLoopManager.removeLoopFunction(TAG) val msg = - ChangeBusinessType(vehicleType!!, BusinessType.none, projectType!!, envType!!) + ChangeBusinessType(FlavorUtils.vehicleType!!, BusinessType.none, FlavorUtils.projectType!!, FlavorUtils.envType!!) LanSocketManager.sendMsgToClient(msg) } } } private fun loopCheck() { - getEnvCheck() - val msg = EnvCheck(vehicleType!!, businessType!!, projectType!!, envType!!) + FlavorUtils.getEnvCheck() + val msg = EnvCheck(FlavorUtils.vehicleType!!, FlavorUtils.businessType!!, FlavorUtils.projectType!!, FlavorUtils.envType!!) LanSocketManager.sendMsgToClient(msg) } - private fun getEnvCheck() { - vehicleType = - if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)) { - VehicleType.T1T2 - } else if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)) { - VehicleType.M1 - } else if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) { - VehicleType.B1 - } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) { - VehicleType.B2 - } else { - VehicleType.C1 - } - businessType = - when (AppIdentityModeUtils.getProduct(FunctionBuildConfig.appIdentityMode)) { - AppIdentityModeUtils.Product.BUS -> { - BusinessType.bus - } - - AppIdentityModeUtils.Product.TAXI -> { - BusinessType.taxi - } - - AppIdentityModeUtils.Product.SWEEPER -> { - BusinessType.none - } - - AppIdentityModeUtils.Product.SHUTTLE -> { - BusinessType.shuttle - } - - AppIdentityModeUtils.Product.CHARTER -> { - BusinessType.charter - } - - else -> { - BusinessType.none - } - } - projectType = when (ProjectUtils.getProjectType()) { - Project.SAAS -> ProjectType.saas - Project.DALI -> ProjectType.dali - Project.MOGO -> ProjectType.mogo - Project.YANTAI -> ProjectType.yantai - } - envType = when (DebugConfig.getNetMode()) { - - 2 -> { - EnvType.qa - } - - 3 -> { - EnvType.online - } - 4 -> { - EnvType.demo - } - - else -> { - EnvType.qa - } - } - } - } \ No newline at end of file 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 962044c7a4..c305ec6afe 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 @@ -3,9 +3,11 @@ package com.mogo.och.common.module.biz.lansocket import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.biz.login.BusinessEnum import com.mogo.och.common.module.biz.login.LoginStatusEnum import com.mogo.och.common.module.biz.login.LoginStatusManager +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.socket.lan.ILanMessageListener import com.mogo.och.common.module.manager.socket.lan.LanSocketManager import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg @@ -16,16 +18,21 @@ import com.mogo.och.common.module.manager.socket.lan.bean.EnvCheck import com.mogo.och.common.module.manager.socket.lan.bean.EnvType import com.mogo.och.common.module.manager.socket.lan.bean.ProjectType import com.mogo.och.common.module.manager.socket.lan.bean.VehicleType +import java.lang.StringBuilder import kotlin.properties.Delegates object LoginLanPassengerSocket : IReceivedMsgListener { private const val TAG = "LoginLanSocket" - private var driverSn: String by Delegates.observable("") { _, oldV, newV -> + var driverSn: String by Delegates.observable("") { _, oldV, newV -> if (oldV != newV) { // 司机屏发生变化 val msg = BaseDPMsg(type = DPMsgType.TYPE_CLIENT_REGISTER.type) LanSocketManager.sendMsgToServer(msg) + LoginStatusManager.changeStatus("连接成功 司机SN:${newV}") + if(newV.isNotEmpty()){ + OchChainLogManager.writeChainLogNetLanSocketConnect("局域网socket链接状态","已连接 sn${newV}") + } } } @@ -38,7 +45,12 @@ object LoginLanPassengerSocket : IReceivedMsgListener { override fun onMsgReceived(obj: Array) { if (obj.isNotEmpty()) { val first = obj.first() as EnvCheck - checkEnv(first.projectType, first.envType, first.vehicleType, first.businessType) + val checkEnv = checkEnv(first.projectType, first.envType, first.vehicleType, first.businessType) + if(checkEnv){ + + }else{ + LoginStatusManager.setLoginStatus(LoginStatusEnum.Logout) + } } } @@ -69,6 +81,8 @@ object LoginLanPassengerSocket : IReceivedMsgListener { first.businessType ) if(checkEnv){ + val status = StringBuilder() + status.append("切换业务模式<当前:${LoginStatusManager.getBusInessType().name}") when (first.businessType) { BusinessType.none -> { LoginStatusManager.setBusinessType(BusinessEnum.None.code) @@ -80,7 +94,12 @@ object LoginLanPassengerSocket : IReceivedMsgListener { BusinessType.taxi -> LoginStatusManager.setBusinessType(BusinessEnum.Taxi.code) BusinessType.taxiunmanned ->LoginStatusManager.setBusinessType(BusinessEnum.Taxi.code) } - LoginStatusManager.setLoginStatus(LoginStatusEnum.Login) + status.append(", 后台配置:${LoginStatusManager.getBusInessType().name}>") + LoginStatusManager.changeStatus(status.toString()) + UiThreadHandler.postDelayed({ + LoginStatusManager.setLoginStatus(LoginStatusEnum.Login) + },2000) + } } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginService.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginService.kt index ec85ab4b28..23525828f1 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginService.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginService.kt @@ -34,4 +34,6 @@ interface LoginService :CommonService { businessType: BusinessType ): Boolean + fun changeStatus(currentStatus: String) + } \ No newline at end of file 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 da9802e666..61c3d3a4af 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 @@ -126,5 +126,11 @@ object LoginStatusManager : CallerBase() { return false } + fun changeStatus(status: String) { + loginService?.let { + it.changeStatus(status) + } + } + } \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt index 55d748073c..468f456a4a 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt @@ -23,14 +23,20 @@ object OchChainLogManager { const val EVENT_KEY_INFE_ERROR = "event_key_och_error" const val EVENT_KEY_INFO_Net = "event_key_och_net" - const val EVENT_KEY_INFO_SOCKET = "event_key_och_socket" + const val EVENT_KEY_INFO_SOCKET = "analytics_event_och_track_screen_msg" + const val EVENT_KEY_INFO_SOCKET_CONNECT = "analytics_event_och_track_screen_connect" fun writeChainLogNet(info: String, changeInfo: String){ writeChainLog(info,changeInfo,true,EVENT_KEY_INFO_Net) } - fun writeChainLogLanSocket(info: String, changeInfo: String){ - writeChainLog(info,changeInfo,true,EVENT_KEY_INFO_SOCKET) + fun writeChainLogNetLanSocketConnect(info: String, changeInfo: String){ + writeChainLog(info,changeInfo,true,EVENT_KEY_INFO_SOCKET_CONNECT) + } + fun writeChainLogLanSocket(info: String, changeInfo: String,action:String){ + val map = hashMapOf() + map["action"] = action + writeChainLog(info,changeInfo,true,EVENT_KEY_INFO_SOCKET, map) } /** @@ -44,7 +50,7 @@ object OchChainLogManager { paramIndexes = [0,1] ) @JvmStatic - fun writeChainLog(Info: String, changeInfo: String,upload:Boolean = true,eventID:String=EVENT_KEY_INFE_WITH_CHANGE) { + fun writeChainLog(Info: String, changeInfo: String,upload:Boolean = true,eventID:String=EVENT_KEY_INFE_WITH_CHANGE,patch:HashMap?=null) { try { d(SceneConstant.M_OCHCOMMON + TAG, Info) d(SceneConstant.M_OCHCOMMON + TAG, changeInfo) @@ -57,6 +63,9 @@ object OchChainLogManager { params["time"] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) params["info"] = Info params["changeInfo"] = changeInfo + patch?.let { + params.putAll(it) + } MogoAnalyticUtils.track(eventID, params) } }catch (e:Exception){ 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 1d54a8aa6c..cb9b15f299 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 @@ -26,7 +26,7 @@ object LanSocketManager : IReceivedMsgListener { fun sendMsgToClient(msg: BaseDPMsg?) { val message = GsonUtils.toJson(msg) CallerLogger.d(TAG, "sendMsgToClient: $message") - OchChainLogManager.writeChainLogLanSocket("发送msg到各个端",message) + OchChainLogManager.writeChainLogLanSocket("发送msg到各个端",message,"send") CallerTelematicManager.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING, message.toByteArray()) } @@ -34,13 +34,13 @@ object LanSocketManager : IReceivedMsgListener { fun sendMsgToServer(msg: BaseDPMsg?) { val message = GsonUtils.toJson(msg) CallerLogger.d(TAG, "sendMsgToServer:$message") - OchChainLogManager.writeChainLogLanSocket("发送msg到服务端(司机)",message) + OchChainLogManager.writeChainLogLanSocket("发送msg到服务端(司机)",message,"send") CallerTelematicManager.sendMsgToServer(OchCommonConst.BUSINESS_STRING, message.toByteArray()) } override fun onReceivedMsg(type: Int, byteArray: ByteArray) { CallerLogger.d(TAG, "收到数据:_type:${type},byteArray:${String(byteArray)}") - OchChainLogManager.writeChainLogLanSocket("收到数据","type:${type},byteArray:${String(byteArray)}") + OchChainLogManager.writeChainLogLanSocket("收到数据","type:${type},byteArray:${String(byteArray)}","receive") if (OchCommonConst.BUSINESS_STRING == type) { try { val baseMsg = GsonUtils.fromJson(String(byteArray), BaseDPMsg::class.java) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt new file mode 100644 index 0000000000..8689364782 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt @@ -0,0 +1,287 @@ +package com.mogo.och.common.module.utils + +import com.mogo.commons.debug.DebugConfig +import com.mogo.commons.storage.SharedPrefsMgr +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.eagle.core.utilcode.util.AppUtils +import com.mogo.och.common.module.biz.login.BusinessEnum +import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType +import com.mogo.och.common.module.manager.socket.lan.bean.EnvType +import com.mogo.och.common.module.manager.socket.lan.bean.ProjectType +import com.mogo.och.common.module.manager.socket.lan.bean.VehicleType +import kotlin.text.StringBuilder + +object FlavorUtils { + + var vehicleType: VehicleType? = null + var businessType: BusinessType? = null + var projectType: ProjectType? = null + var envType: EnvType? = null + + + fun getInfo():String{ + val info = StringBuilder() + + when (ProjectUtils.getProjectType()) { + Project.SAAS -> info.append("saas") + Project.DALI -> info.append("dali") + Project.MOGO -> info.append("mogo") + Project.YANTAI -> info.append("yantai") + } + + if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)) { + info.append(" T1T2") + } else if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)) { + info.append(" M1") + } else if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) { + info.append(" B1") + } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) { + info.append(" B2") + } else { + info.append(" C1") + } + + when (DebugConfig.getNetMode()) { + 2 -> { + info.append(" qa ") + } + + 3 -> { + info.append(" online ") + } + + 4 -> { + info.append(" demo ") + } + + else -> { + info.append(" qa ") + } + } + + info.append(" Passenger") + info.append(" ${AppUtils.getAppVersionName()}") + info.append(" AppSN:${SharedPrefsMgr.getInstance().sn}") + return info.toString() + } + + fun getBusinessInfo(businessType: Int):String { + val businessEnum = BusinessEnum.valueOf(businessType) + FunctionBuildConfig.supportBusiness.forEach { + when (it) { + "shuttle" -> { + val isSupply = businessEnum == BusinessEnum.Shuttle + if (isSupply) { + return "" + } + } + + "bus" -> { + val isSupply = businessEnum == BusinessEnum.Bus + if (isSupply) { + return "" + } + } + + "taxi" -> { + val isSupply = businessEnum == BusinessEnum.Taxi + if (isSupply) { + return "" + } + } + + "charter" -> { + val isSupply = businessEnum == BusinessEnum.Charter + if (isSupply) { + return "" + } + } + + else -> {} + } + } + val reason = StringBuilder() + reason.append("业务异常<当前支持:") + FunctionBuildConfig.supportBusiness.forEachIndexed { index, s -> + if(index==FunctionBuildConfig.supportBusiness.size-1){ + reason.append(s) + }else{ + reason.append("${s},") + } + } + when (businessEnum) { + BusinessEnum.Taxi -> reason.append(" 后台配置:taxi") + BusinessEnum.Bus -> reason.append(" 后台配置:bus") + BusinessEnum.Shuttle -> reason.append(" 后台配置:shuttle") + BusinessEnum.Charter -> reason.append(" 后台配置:charter") + else -> reason.append(" 后台配置:未知") + } + return reason.toString() + } + + fun getEnvCheck() { + businessType = + when (AppIdentityModeUtils.getProduct(FunctionBuildConfig.appIdentityMode)) { + AppIdentityModeUtils.Product.BUS -> { + BusinessType.bus + } + + AppIdentityModeUtils.Product.TAXI -> { + BusinessType.taxi + } + + AppIdentityModeUtils.Product.SWEEPER -> { + BusinessType.none + } + + AppIdentityModeUtils.Product.SHUTTLE -> { + BusinessType.shuttle + } + + AppIdentityModeUtils.Product.CHARTER -> { + BusinessType.charter + } + + else -> { + BusinessType.none + } + } + + if(vehicleType==null||projectType==null||envType==null) { + vehicleType = + if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)) { + VehicleType.T1T2 + } else if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)) { + VehicleType.M1 + } else if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) { + VehicleType.B1 + } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) { + VehicleType.B2 + } else { + VehicleType.C1 + } + + projectType = when (ProjectUtils.getProjectType()) { + Project.SAAS -> ProjectType.saas + Project.DALI -> ProjectType.dali + Project.MOGO -> ProjectType.mogo + Project.YANTAI -> ProjectType.yantai + } + envType = when (DebugConfig.getNetMode()) { + + 2 -> { + EnvType.qa + } + + 3 -> { + EnvType.online + } + + 4 -> { + EnvType.demo + } + + else -> { + EnvType.qa + } + } + } + } + + fun checkAllEnv( projectType: ProjectType, + envType: EnvType, + vehicleType: VehicleType, + businessType: BusinessType):String{ + + val reason = StringBuilder() + + val isProjectSupply = when (ProjectUtils.getProjectType()) { + Project.SAAS -> projectType == ProjectType.saas + Project.DALI -> projectType == ProjectType.dali + Project.MOGO -> projectType == ProjectType.mogo + Project.YANTAI -> projectType == ProjectType.yantai + } + if(!isProjectSupply){ + reason.append("项目异常<当前:${ProjectUtils.getProjectType().name}, 后台配置:${projectType.name}> ") + } + + val currentVehicle:String + val vehicleTypeSupply = + if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)) { + currentVehicle = VehicleType.T1T2.name + vehicleType == VehicleType.T1T2 + } else if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)) { + currentVehicle = VehicleType.M1.name + vehicleType == VehicleType.M1 + } else if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) { + currentVehicle = VehicleType.B1.name + vehicleType == VehicleType.B1 + } else if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) { + currentVehicle = VehicleType.B2.name + vehicleType == VehicleType.B2 + } else { + currentVehicle = VehicleType.C1.name + vehicleType == VehicleType.C1 + } + if(!vehicleTypeSupply){ + reason.append("车型异常<当前:${currentVehicle}, 后台配置:${vehicleType.name}> ") + } + + val currentenvType:String + val envTypeSupply = when (DebugConfig.getNetMode()) { + 2 -> { + currentenvType = EnvType.qa.name + envType == EnvType.qa + } + + 3 -> { + currentenvType = EnvType.online.name + envType == EnvType.online + } + + 4 -> { + currentenvType = EnvType.demo.name + envType == EnvType.demo + } + + else -> { + currentenvType = EnvType.qa.name + envType == EnvType.qa + } + } + if(!envTypeSupply){ + reason.append("环境异常<当前:${currentenvType} 后台配置:${envType.name}> ") + } + + + val businessTypeSupply = checkBusinessMine(businessType) + + if(!businessTypeSupply){ + reason.append("业务异常<当前支持:") + FunctionBuildConfig.supportBusiness.forEachIndexed { index, s -> + if(index==FunctionBuildConfig.supportBusiness.size-1){ + reason.append(s) + }else{ + reason.append("${s},") + } + } + reason.append(" 后台配置:${businessType.name}> ") + } + + return reason.toString() + } + + fun checkBusinessMine(businessType: BusinessType) :Boolean{ + if(businessType==BusinessType.none){ + return true + } + FunctionBuildConfig.supportBusiness.forEach { + if (businessType.name == it) { + return true + } + } + return false + } + +} \ No newline at end of file