From aaa63597ba151356c882dfc753a210ac9e8166d5 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 26 Sep 2024 12:23:33 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fea]=20[=E4=B9=98=E5=AE=A2=E5=B1=8F?= =?UTF-8?q?=E4=B8=8D=E7=94=A8=E5=87=BA=E5=8F=91=E5=B7=A5=E5=85=B7=E7=AE=B1?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/bus/constant/BusConst.kt | 1 - .../magic/mogo/och/charter/constant/CharterConst.kt | 3 --- .../java/com/mogo/och/facade/route/FacadeProvider.kt | 4 ++-- .../com/mogo/och/facade/view/OchCustomViewProvider.kt | 10 +++++++--- .../java/com/mogo/och/offline/constant/BusConst.kt | 2 -- .../java/com/mogo/och/shuttle/constant/BusConst.kt | 1 - .../java/com/mogo/och/weaknet/constant/BusConst.kt | 2 -- .../mogo/och/sweeper/common/constant/SweeperConst.kt | 3 --- .../main/java/com/mogo/och/taxi/constant/TaxiConst.kt | 3 --- .../och/unmanned/taxi/constant/TaxiUnmannedConst.kt | 3 --- 10 files changed, 9 insertions(+), 23 deletions(-) diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt index a72a91e2d4..8b3f020005 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/constant/BusConst.kt @@ -6,7 +6,6 @@ package com.mogo.och.bus.constant class BusConst { companion object { // OCH arouter 路由path - const val PATH = "/driver/api" // 测试用的广播 const val BROADCAST_TEST_BUS_CONTROL_TYPE_EXTRA_KEY = "sceneType" diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/constant/CharterConst.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/constant/CharterConst.kt index 8bd7d25eb6..967785e7f7 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/constant/CharterConst.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/constant/CharterConst.kt @@ -6,9 +6,6 @@ package com.magic.mogo.och.charter.constant class CharterConst { companion object { - // OCH arouter 路由path - const val PATH = "/driver/api" - // 上报心跳轮询ms const val LOOP_PERIOD_60S = 60 * 1000L // 开始服务启动自动驾驶等待时间（埋点上传） 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 8b506b716d..62e3b7c16a 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 @@ -78,7 +78,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { LoginStatusManager.getFragment() } - d(TAG, "切换 fragment:${fragment}_activity:$activity _ ${containerId}") + d(TAG, "切换 fragment:${fragment}_activity:$activity _ ${containerId}_$this") if (supportFragmentManager != null) { val back = supportFragmentManager.beginTransaction() @@ -234,7 +234,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { LoginStatusManager.setLoginStatus(LoginStatusEnum.Login) val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager val fragment = getFragment() - d(TAG, "切换 fragment:${fragment}") + d(TAG, "切换 fragment:${fragment}_activity:$activity _ ${containerId}_$this") LoginStatusManager.resetFragment() if (supportFragmentManager != null) { val back = supportFragmentManager.beginTransaction() diff --git 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 index fd3cdfb78a..8dbc57d0d5 100644 --- 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 @@ -4,7 +4,9 @@ import android.content.Context import android.view.View import com.alibaba.android.arouter.facade.annotation.Route import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.och.IOchCustomViewProvider +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.och.common.module.biz.provider.CommonService import com.mogo.och.facade.constant.FacadeConst @@ -26,9 +28,11 @@ class OchCustomViewProvider : IOchCustomViewProvider { } private fun getCommontService(context: Context?){ - val temp = ARouter.getInstance().build(FacadeConst.DRIVER_PATH).navigation(context) - if(temp is FacadeProvider){ - commonService = temp.commonService + if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { + val temp = ARouter.getInstance().build(FacadeConst.DRIVER_PATH).navigation(context) + if(temp is FacadeProvider){ + commonService = temp.commonService + } } } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/constant/BusConst.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/constant/BusConst.kt index baae3bea08..97e1e15ea5 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/constant/BusConst.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/constant/BusConst.kt @@ -7,8 +7,6 @@ import com.mogo.commons.debug.DebugConfig */ class BusConst { companion object { - // OCH arouter 路由path - const val PATH = "/driver/api" // 测试用的广播 const val BROADCAST_TEST_BUS_CONTROL_TYPE_EXTRA_KEY = "sceneType" diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/constant/BusConst.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/constant/BusConst.kt index 10fb756a69..3c2f380d67 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/constant/BusConst.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/constant/BusConst.kt @@ -8,7 +8,6 @@ import com.mogo.commons.debug.DebugConfig class BusConst { companion object { // OCH arouter 路由path - const val PATH = "/driver/api" // 测试用的广播 const val BROADCAST_TEST_BUS_CONTROL_TYPE_EXTRA_KEY = "sceneType" diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/constant/BusConst.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/constant/BusConst.kt index 8c528a922e..18b1fb1f31 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/constant/BusConst.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/constant/BusConst.kt @@ -7,8 +7,6 @@ import com.mogo.commons.debug.DebugConfig */ class BusConst { companion object { - // OCH arouter 路由path - const val PATH = "/driver/api" // 测试用的广播 const val BROADCAST_TEST_BUS_CONTROL_TYPE_EXTRA_KEY = "sceneType" diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/constant/SweeperConst.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/constant/SweeperConst.kt index 249d022bb9..8c5d485a64 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/constant/SweeperConst.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/constant/SweeperConst.kt @@ -8,9 +8,6 @@ import com.mogo.commons.debug.DebugConfig class SweeperConst { companion object { - // OCH arouter 路由path - const val PATH = "/driver/api" - // 测试用的广播 const val BROADCAST_TEST_SWEEPER_CONTROL_TYPE_EXTRA_KEY = "sceneType" diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt index 4b748b74a3..458d03895c 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt @@ -8,9 +8,6 @@ import com.mogo.commons.debug.DebugConfig class TaxiConst { companion object { - // OCH arouter 路由path - const val PATH = "/driver/api" - // 到达起始点围栏 const val ARRIVE_AT_START_STATION_DISTANCE = 15 //围栏由20m改为50m 再次改为15m diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiUnmannedConst.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiUnmannedConst.kt index 0359e52cad..ec59450929 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiUnmannedConst.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/constant/TaxiUnmannedConst.kt @@ -6,9 +6,6 @@ package com.mogo.och.unmanned.taxi.constant class TaxiUnmannedConst { companion object { - // OCH arouter 路由path - const val PATH = "/driver/api" - // 到达起始点围栏 const val ARRIVE_AT_START_STATION_DISTANCE = 15 //围栏由20m改为50m 再次改为15m