[6.10.0]

[fea] [删除车型维度]
2025-01-23 14:55:57 +08:00
parent 496af11530
commit bf313f04c1
98 changed files with 1540 additions and 1689 deletions
--- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeDriverProvider.kt
+++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeDriverProvider.kt
@@ -9,7 +9,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.och.bridge.device.checkvin.CheckVinManager
 import com.mogo.och.bridge.ota.OTAManager
 import com.mogo.och.common.module.biz.lansocket.LoginLanDriverSocket
-import com.mogo.och.common.module.biz.login.LoginStatusEnum
+import com.mogo.och.common.module.biz.login.EnumLoginStatus
 import com.mogo.och.common.module.biz.login.LoginStatusManager
 import com.mogo.och.common.module.biz.offline.OfflineManager
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
@@ -58,7 +58,7 @@ class FacadeDriverProvider : FacadeProvider() {
        super.onDestroy()
    }

-    override fun onStatusChange(currentStatus: LoginStatusEnum) {
-        super.onStatusChange(currentStatus)
+    override fun onLoginStatusChange(currentStatus: EnumLoginStatus) {
+        super.onLoginStatusChange(currentStatus)
    }
 }
--- 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
@@ -22,7 +22,6 @@ 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.Product
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.util.AppUtils
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
@@ -31,7 +30,7 @@ import com.mogo.eagle.core.utilcode.util.TimeUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.eagle.core.utilcode.util.VolumeUtils
 import com.mogo.och.common.module.biz.login.ILoginCallback
-import com.mogo.och.common.module.biz.login.LoginStatusEnum
+import com.mogo.och.common.module.biz.login.EnumLoginStatus
 import com.mogo.och.common.module.biz.login.LoginStatusManager
 import com.mogo.och.common.module.biz.provider.CommonService
 import com.mogo.och.common.module.biz.skin.SkinManager
@@ -97,13 +96,6 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
    }

    private fun getFragment(): Fragment {
-        if (FunctionBuildConfig.isOffLine) {
-            if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
-                return getFragmentByServeName(OchCommonConst.OFFLINE_DRIVER)
-            } else if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
-                return getFragmentByServeName(OchCommonConst.OFFLINE_PASSENGER)
-            }
-        }
        if(DeviceUtils.isEB5Model() && !AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)){
            val maxVolume = VolumeUtils.getMaxVolume(AudioManager.STREAM_MUSIC)
            val volume = VolumeUtils.getVolume(AudioManager.STREAM_MUSIC)
@@ -165,10 +157,10 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
        activity!!.finish()
    }

-    override fun onStatusChange(currentStatus: LoginStatusEnum) {
+    override fun onLoginStatusChange(currentStatus: EnumLoginStatus) {
        d(TAG, "登录状态发生改变 $currentStatus")
        when (currentStatus) {
-            LoginStatusEnum.Login -> {
+            EnumLoginStatus.Login -> {
                CallerEagleBaseFunctionCall4OchManager.updateLoginStatus(true)
            }
            else -> {
@@ -180,69 +172,6 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
        }
    }

-    override fun onBusinessChange(businessEnum: Product) {
-        super.onBusinessChange(businessEnum)
-        val (_, identity, model) = AppIdentityModeUtils.getInfo(FunctionBuildConfig.appIdentityMode)
-        when (businessEnum) {
-            Product.NONE -> {}
-            Product.TAXI -> FunctionBuildConfig.appIdentityMode =
-                "${AppIdentityModeUtils.TAXI}_${identity}_${model}"
-
-            Product.BUS -> FunctionBuildConfig.appIdentityMode =
-                "${AppIdentityModeUtils.BUS}_${identity}_${model}"
-
-            Product.SHUTTLE -> FunctionBuildConfig.appIdentityMode =
-                "${AppIdentityModeUtils.SHUTTLE}_${identity}_${model}"
-
-            Product.CHARTER -> FunctionBuildConfig.appIdentityMode =
-                "${AppIdentityModeUtils.CHARTER}_${identity}_${model}"
-
-            Product.SCHEDULED -> FunctionBuildConfig.appIdentityMode =
-                "${AppIdentityModeUtils.SCHEDULED}_${identity}_${model}"
-        }
-        CallerDevaToolsManager.updateAppChannel()
-        // 加入启动统计
-        val mStartParams: HashMap<String, Any> = HashMap()
-        mStartParams["start_time"] = TimeUtils.getNowMills()
-        mStartParams["app_version"] = AppUtils.getAppVersionName()
-        mStartParams["app_identity_mode"] = FunctionBuildConfig.appIdentityMode
-        MogoAnalyticUtils.track("app_start_time", mStartParams)
-    }
-
-    override fun onBusinessChangeDebug(businessEnum: Product) {
-        if (businessEnum == Product.NONE) {
-            CallerHmiManager.hideToolsView()
-            ToggleDebugView.toggleDebugView.dismiss()
-            SopView.sopView.dismiss()
-            CallerHmiManager.dismissFSMExceptionStatusWindow()
-            CallerHmiManager.hideStatusSummaryDialog()
-            _commonService?.resetFragment()
-            val fragment = LoginStatusManager.getFragment()
-            val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager
-            if (supportFragmentManager != null) {
-                val back = supportFragmentManager.beginTransaction()
-                back.replace(containerId, fragment, fragment.tag)
-                back.commitAllowingStateLoss()
-            }
-            removeStatusBar()
-        } else {
-            onBusinessChange(businessEnum)
-            FunctionBuildConfig.ochdebug = true
-            d(TAG, "denbug模式进入${LoginStatusEnum.Login}")
-            LoginStatusManager.setLoginStatus(LoginStatusEnum.Login)
-            val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager
-            val fragment = getFragment()
-            d(TAG, "切换 fragment:${fragment}_activity:$activity _ ${containerId}_$this")
-            LoginStatusManager.resetFragment()
-            if (supportFragmentManager != null) {
-                val back = supportFragmentManager.beginTransaction()
-                back.replace(containerId, fragment, fragment.tag)
-                back.commitAllowingStateLoss()
-            }
-            injectStatusBar()
-        }
-    }
-
    private fun injectStatusBar() {
        activity?.let {
            val decorView = it.window.decorView as? FrameLayout ?: return
--- a/OCH/facade/src/main/java/com/mogo/och/facade/view/OchCustomViewProvider.kt
+++ b/OCH/facade/src/main/java/com/mogo/och/facade/view/OchCustomViewProvider.kt
@@ -10,7 +10,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON
 import com.mogo.och.common.module.biz.login.ILoginCallback
-import com.mogo.och.common.module.biz.login.LoginStatusEnum
+import com.mogo.och.common.module.biz.login.EnumLoginStatus
 import com.mogo.och.common.module.biz.login.LoginStatusManager
 import com.mogo.och.common.module.biz.provider.CommonService
 import com.mogo.och.facade.constant.FacadeConst
@@ -19,18 +19,17 @@ import com.mogo.och.facade.route.FacadeProvider
@Route(path = FacadeConst.OCH_VIEW_PATH)
 class OchCustomViewProvider : IOchCustomViewProvider, ILoginCallback {

-    companion object {
-        const val TAG = M_OCHCOMMON+"OchCustomViewProvider"
-    }
+    private val TAG = M_OCHCOMMON+"OchViewProvider"

    init {
+        CallerLogger.d(TAG,"初始化_提供View")
        LoginStatusManager.addListener(TAG,this)
    }

    private var commonService: CommonService?=null

-    override fun onStatusChange(currentStatus: LoginStatusEnum?) {
-        if(currentStatus!=LoginStatusEnum.Login){
+    override fun onLoginStatusChange(currentStatus: EnumLoginStatus?) {
+        if(currentStatus!=EnumLoginStatus.Login){
            commonService = null
        }
    }