yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.8.0]

Browse Source 
[fea]
[删除 mogo taxi]
This commit is contained in:
yangyakun
2024-11-22 14:55:32 +08:00
parent b53d4d2df3
commit 989d8e515d
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OCH/facade/script/och.gradle
View File

@@ -26,20 +26,20 @@ project.dependencies {
} else if (isCurrentPassenger("B2")) { } else if (isCurrentPassenger("B2")) {
implementation project.project(':OCH:shuttle:passenger_weaknet') implementation project.project(':OCH:shuttle:passenger_weaknet')
} else if (isCurrentDriver("T1T2")) { } else if (isCurrentDriver("T1T2")) {
implementation project.project(':OCH:taxi:driver') // implementation project.project(':OCH:taxi:driver')
implementation project.project(':OCH:taxi:unmanned-driver') implementation project.project(':OCH:taxi:unmanned-driver')
} else if (isCurrentPassenger("T1T2")) { } else if (isCurrentPassenger("T1T2")) {
implementation project.project(':OCH:taxi:unmanned-passenger') implementation project.project(':OCH:taxi:unmanned-passenger')
implementation project.project(':OCH:taxi:passenger') // implementation project.project(':OCH:taxi:passenger')
} else if (isCurrentDriver("ALL")) { } else if (isCurrentDriver("ALL")) {
implementation project.project(':OCH:offline:driver') implementation project.project(':OCH:offline:driver')
implementation project.project(':OCH:taxi:unmanned-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:charter:driver')
implementation project.project(':OCH:sweeper:driver') implementation project.project(':OCH:sweeper:driver')
} else if (isCurrentPassenger("ALL")) { } else if (isCurrentPassenger("ALL")) {
implementation project.project(':OCH:taxi:unmanned-passenger') 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:charter:passenger')
implementation project.project(':OCH:shuttle:passenger_weaknet') implementation project.project(':OCH:shuttle:passenger_weaknet')
implementation project.project(':OCH:shuttle:driver_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:driver')
implementation project.project(':OCH:charter:passenger') implementation project.project(':OCH:charter:passenger')
implementation project.project(':OCH:sweeper:driver') implementation project.project(':OCH:sweeper:driver')
implementation project.project(':OCH:taxi:driver') // implementation project.project(':OCH:taxi:driver')
implementation project.project(':OCH:taxi:passenger') // implementation project.project(':OCH:taxi:passenger')
implementation project.project(':OCH:taxi:unmanned-driver') implementation project.project(':OCH:taxi:unmanned-driver')
implementation project.project(':OCH:taxi:unmanned-passenger') implementation project.project(':OCH:taxi:unmanned-passenger')
implementation project.project(':OCH:shuttle:passenger_weaknet') implementation project.project(':OCH:shuttle:passenger_weaknet')

28
OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt
View File

@@ -122,13 +122,13 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
} else if (AppIdentityModeUtils.isCharterDriver(FunctionBuildConfig.appIdentityMode)) { } else if (AppIdentityModeUtils.isCharterDriver(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.CHARTER_DRIVER) return getFragmentByServeName(OchCommonConst.CHARTER_DRIVER)
} else if (AppIdentityModeUtils.isTaxiDriver(FunctionBuildConfig.appIdentityMode)) { } else if (AppIdentityModeUtils.isTaxiDriver(FunctionBuildConfig.appIdentityMode)) {
return if (ProjectUtils.isMogo()) { // return if (ProjectUtils.isMogo()) {
getFragmentByServeName(OchCommonConst.TAXI_DRIVER) // getFragmentByServeName(OchCommonConst.TAXI_DRIVER)
} else if (ProjectUtils.isSaas()) { // } else if (ProjectUtils.isSaas()) {
getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_DRIVER) return getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_DRIVER)
} else { // } else {
getFragmentByServeName(OchCommonConst.TAXI_DRIVER) // getFragmentByServeName(OchCommonConst.TAXI_DRIVER)
} // }
} else if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) { } else if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.SWEEPER_DRIVER) return getFragmentByServeName(OchCommonConst.SWEEPER_DRIVER)
} else if (AppIdentityModeUtils.isBusPassenger(FunctionBuildConfig.appIdentityMode)) { } else if (AppIdentityModeUtils.isBusPassenger(FunctionBuildConfig.appIdentityMode)) {
@@ -138,13 +138,13 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
} else if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) { } else if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.CHARTER_PASSENGER) return getFragmentByServeName(OchCommonConst.CHARTER_PASSENGER)
} else if (AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) { } else if (AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) {
return if (ProjectUtils.isMogo()) { // return if (ProjectUtils.isMogo()) {
getFragmentByServeName(OchCommonConst.TAXI_PASSENGER) // getFragmentByServeName(OchCommonConst.TAXI_PASSENGER)
} else if (ProjectUtils.isSaas()) { // } else if (ProjectUtils.isSaas()) {
getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_PASSENGER) return getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_PASSENGER)
} else { // } else {
getFragmentByServeName(OchCommonConst.TAXI_PASSENGER) // getFragmentByServeName(OchCommonConst.TAXI_PASSENGER)
} // }
} }
return LoginStatusManager.getFragment() return LoginStatusManager.getFragment()
} }

4
settings.gradle
View File

@@ -62,8 +62,8 @@ include ':test:crashreport-apmbyte'
//include ':OCH:bus:driver' //include ':OCH:bus:driver'
//include ':OCH:bus:passenger' //include ':OCH:bus:passenger'
include ':OCH:taxi:driver' //include ':OCH:taxi:driver'
include ':OCH:taxi:passenger' //include ':OCH:taxi:passenger'
include ':OCH:taxi:pcommon' include ':OCH:taxi:pcommon'
include ':OCH:taxi:unmanned-driver' include ':OCH:taxi:unmanned-driver'