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

[6.7.2]

Browse Source 
[fea]
[乘客屏取消后台数据获取、添加saas 核销接口]
This commit is contained in:
yangyakun
2024-10-21 16:33:15 +08:00
parent 685b7dd70a
commit 8ab3c01fef
561 changed files with 32 additions and 18243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,27 +11,19 @@ project.dependencies {
implementation project.project(':OCH:offline:driver')
implementation project.project(':OCH:shuttle:driver_weaknet')
} else if (isCurrentPassenger("B1")) {
implementation project.project(':OCH:bus:passenger')
implementation project.project(':OCH:shuttle:passenger')
implementation project.project(':OCH:shuttle:passenger_weaknet')
} else if (isCurrentBaiLing("B1")) {
implementation project.project(':OCH:shuttle:driver_weaknet')
implementation project.project(':OCH:bus:passenger')
implementation project.project(':OCH:shuttle:passenger')
implementation project.project(':OCH:shuttle:passenger_weaknet')
} else if (isCurrentDriver("M1")) {
implementation project.project(':OCH:charter:driver')
implementation project.project(':OCH:shuttle:driver_weaknet')
} else if (isCurrentPassenger("M1")) {
implementation project.project(':OCH:charter:passenger')
implementation project.project(':OCH:shuttle:passenger')
implementation project.project(':OCH:shuttle:passenger_weaknet')
} else if (isCurrentDriver("B2")) {
implementation project.project(':OCH:offline:driver')
implementation project.project(':OCH:shuttle:driver_weaknet')
} else if (isCurrentPassenger("B2")) {
implementation project.project(':OCH:bus:passenger')
implementation project.project(':OCH:shuttle:passenger')
implementation project.project(':OCH:shuttle:passenger_weaknet')
} else if (isCurrentDriver("T1T2")) {
implementation project.project(':OCH:taxi:driver')
@@ -48,17 +40,13 @@ project.dependencies {
} else if (isCurrentPassenger("ALL")) {
implementation project.project(':OCH:taxi:unmanned-passenger')
implementation project.project(':OCH:taxi:passenger')
implementation project.project(':OCH:bus:passenger')
implementation project.project(':OCH:charter:passenger')
implementation project.project(':OCH:shuttle:passenger')
implementation project.project(':OCH:shuttle:passenger_weaknet')
implementation project.project(':OCH:shuttle:driver_weaknet')
} else {
implementation project.project(':OCH:offline:driver')
implementation project.project(':OCH:bus:passenger')
implementation project.project(':OCH:charter:driver')
implementation project.project(':OCH:charter:passenger')
implementation project.project(':OCH:shuttle:passenger')
implementation project.project(':OCH:sweeper:driver')
implementation project.project(':OCH:taxi:driver')
implementation project.project(':OCH:taxi:passenger')

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

@@ -109,11 +109,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
if (AppIdentityModeUtils.isBusDriver(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER_WEAKNET)
} else if (AppIdentityModeUtils.isShuttleDriver(FunctionBuildConfig.appIdentityMode)) {
return if (ProjectUtils.isSaas()) {
getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER_WEAKNET)
} else {
getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER_WEAKNET)
}
return getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER_WEAKNET)
} else if (AppIdentityModeUtils.isCharterDriver(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.CHARTER_DRIVER)
} else if (AppIdentityModeUtils.isTaxiDriver(FunctionBuildConfig.appIdentityMode)) {
@@ -127,13 +123,9 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
} else if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.SWEEPER_DRIVER)
} else if (AppIdentityModeUtils.isBusPassenger(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.BUS_PASSENGER)
return getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER_WEAKNET)
} else if (AppIdentityModeUtils.isShuttlePassenger(FunctionBuildConfig.appIdentityMode)) {
return if (ProjectUtils.isSaas()) {
getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER_WEAKNET)
} else {
getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER)
}
return getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER_WEAKNET)
} else if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) {
return getFragmentByServeName(OchCommonConst.CHARTER_PASSENGER)
} else if (AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) {