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

[6.4.0]

Browse Source 
[模式拦截、车型名称修改、清扫车路由]
This commit is contained in:
yangyakun
2024-04-11 18:48:03 +08:00
parent 5c624c1943
commit 2080efee38
63 changed files with 885 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/ShuttlePassengerProvider.kt
View File

@@ -9,7 +9,6 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.util.ActivityUtils
import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils
import com.mogo.och.common.module.biz.constant.OchCommonConst
import com.mogo.och.common.module.biz.provider.CommonService
import com.mogo.och.common.module.biz.provider.CommonServiceImpl
import com.mogo.och.common.module.wigets.media.MediaPlayerActivity
import com.mogo.och.shuttle.passenger.model.TicketModel
@@ -31,9 +30,9 @@ class ShuttlePassengerProvider : CommonServiceImpl() {
override fun init(context: Context) {
TicketModel.load()
mPM2Fragment = if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
mPM2Fragment = if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) {
PM2BaseFragment()
}else if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
}else if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) {
BusPassengerRouteFragment()
}else{
BusPassengerRouteFragment()
@@ -42,9 +41,9 @@ class ShuttlePassengerProvider : CommonServiceImpl() {
override fun getStatusBarView(context: Context): View {
if(statusBarView==null){
statusBarView = if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
statusBarView = if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) {
M2StatusBarView(context);
} else if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
} else if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) {
BusPStatusBarView(context);
}else{
BusPStatusBarView(context);
@@ -54,7 +53,7 @@ class ShuttlePassengerProvider : CommonServiceImpl() {
}
override fun getFragment(): Fragment {
if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) {
if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) {
MultiDisplayUtils.startActWithSecond(ActivityUtils.getTopActivity(), MediaPlayerActivity::class.java)
}
return mPM2Fragment

4
OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt
View File

@@ -55,7 +55,7 @@ object TicketModel : StateChangeListener {
override fun onFail(code: Int, msg: String?) {
CallerLogger.d(M_BUS_P + TAG, "核销失败 ${code}-----${msg}")
when (code) {
6002 -> {sendMessage2Driver("同一订单核销间隔时间需大于5分钟")}
6002 -> {sendMessage2Driver("同一订单核销间隔时间需大于2分钟")}
1009 -> {sendMessage2Driver("车票所选乘车日期非今日")}
1005 -> {sendMessage2Driver("车辆未登录、或没有任务")}
1006 -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合")}
@@ -64,7 +64,7 @@ object TicketModel : StateChangeListener {
1012 -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司")}
else -> {
when (msg) {
"6002" -> {sendMessage2Driver("同一订单核销间隔时间需大于5分钟")}
"6002" -> {sendMessage2Driver("同一订单核销间隔时间需大于2分钟")}
"1009" -> {sendMessage2Driver("车票所选乘车日期非今日")}
"1005" -> {sendMessage2Driver("车辆未登录、或没有任务")}
"1006" -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合")}