From 989d8e515d66c3910ce2dd9984a9907f4e9595d0 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 22 Nov 2024 14:55:32 +0800 Subject: [PATCH] =?UTF-8?q?[6.8.0]=20[fea]=20[=E5=88=A0=E9=99=A4=20mogo=20?= =?UTF-8?q?taxi]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/facade/script/och.gradle | 12 ++++---- .../mogo/och/facade/route/FacadeProvider.kt | 28 +++++++++---------- settings.gradle | 4 +-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/OCH/facade/script/och.gradle b/OCH/facade/script/och.gradle index a7ca13bec8..a9b2e0736e 100644 --- a/OCH/facade/script/och.gradle +++ b/OCH/facade/script/och.gradle @@ -26,20 +26,20 @@ project.dependencies { } else if (isCurrentPassenger("B2")) { implementation project.project(':OCH:shuttle:passenger_weaknet') } else if (isCurrentDriver("T1T2")) { - implementation project.project(':OCH:taxi:driver') +// implementation project.project(':OCH:taxi:driver') implementation project.project(':OCH:taxi:unmanned-driver') } else if (isCurrentPassenger("T1T2")) { implementation project.project(':OCH:taxi:unmanned-passenger') - implementation project.project(':OCH:taxi:passenger') +// implementation project.project(':OCH:taxi:passenger') } else if (isCurrentDriver("ALL")) { implementation project.project(':OCH:offline:driver') implementation project.project(':OCH:taxi:unmanned-driver') - implementation project.project(':OCH:taxi:driver') +// implementation project.project(':OCH:taxi:driver') implementation project.project(':OCH:charter:driver') implementation project.project(':OCH:sweeper:driver') } else if (isCurrentPassenger("ALL")) { implementation project.project(':OCH:taxi:unmanned-passenger') - implementation project.project(':OCH:taxi:passenger') +// implementation project.project(':OCH:taxi:passenger') implementation project.project(':OCH:charter:passenger') implementation project.project(':OCH:shuttle:passenger_weaknet') implementation project.project(':OCH:shuttle:driver_weaknet') @@ -48,8 +48,8 @@ project.dependencies { implementation project.project(':OCH:charter:driver') implementation project.project(':OCH:charter:passenger') implementation project.project(':OCH:sweeper:driver') - implementation project.project(':OCH:taxi:driver') - implementation project.project(':OCH:taxi:passenger') +// implementation project.project(':OCH:taxi:driver') +// implementation project.project(':OCH:taxi:passenger') implementation project.project(':OCH:taxi:unmanned-driver') implementation project.project(':OCH:taxi:unmanned-passenger') implementation project.project(':OCH:shuttle:passenger_weaknet') 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 6f7c6172ae..bc77c249fd 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 @@ -122,13 +122,13 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { } else if (AppIdentityModeUtils.isCharterDriver(FunctionBuildConfig.appIdentityMode)) { return getFragmentByServeName(OchCommonConst.CHARTER_DRIVER) } else if (AppIdentityModeUtils.isTaxiDriver(FunctionBuildConfig.appIdentityMode)) { - return if (ProjectUtils.isMogo()) { - getFragmentByServeName(OchCommonConst.TAXI_DRIVER) - } else if (ProjectUtils.isSaas()) { - getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_DRIVER) - } else { - getFragmentByServeName(OchCommonConst.TAXI_DRIVER) - } +// return if (ProjectUtils.isMogo()) { +// getFragmentByServeName(OchCommonConst.TAXI_DRIVER) +// } else if (ProjectUtils.isSaas()) { + return getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_DRIVER) +// } else { +// getFragmentByServeName(OchCommonConst.TAXI_DRIVER) +// } } else if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) { return getFragmentByServeName(OchCommonConst.SWEEPER_DRIVER) } else if (AppIdentityModeUtils.isBusPassenger(FunctionBuildConfig.appIdentityMode)) { @@ -138,13 +138,13 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { } else if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) { return getFragmentByServeName(OchCommonConst.CHARTER_PASSENGER) } else if (AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) { - return if (ProjectUtils.isMogo()) { - getFragmentByServeName(OchCommonConst.TAXI_PASSENGER) - } else if (ProjectUtils.isSaas()) { - getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_PASSENGER) - } else { - getFragmentByServeName(OchCommonConst.TAXI_PASSENGER) - } +// return if (ProjectUtils.isMogo()) { +// getFragmentByServeName(OchCommonConst.TAXI_PASSENGER) +// } else if (ProjectUtils.isSaas()) { + return getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_PASSENGER) +// } else { +// getFragmentByServeName(OchCommonConst.TAXI_PASSENGER) +// } } return LoginStatusManager.getFragment() } diff --git a/settings.gradle b/settings.gradle index 720c3a940c..3ef1a4e2c2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -62,8 +62,8 @@ include ':test:crashreport-apmbyte' //include ':OCH:bus:driver' //include ':OCH:bus:passenger' -include ':OCH:taxi:driver' -include ':OCH:taxi:passenger' +//include ':OCH:taxi:driver' +//include ':OCH:taxi:passenger' include ':OCH:taxi:pcommon' include ':OCH:taxi:unmanned-driver'