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

Merge branch 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0

Browse Source
This commit is contained in:
aibingbing
2023-03-09 23:45:52 +08:00
parent 9195fdf217 a264e0f4a4
commit fd83511f67
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
View File

@@ -512,14 +512,14 @@ object CharterPassengerModel {
it.dispose()
}
}
val leadTime = endlast / 1000
val leadTime = endlast / 1000+60
subscribeCountDown =
Observable.intervalRange(0L, leadTime, 0, 1, TimeUnit.SECONDS)
.map { aLong -> leadTime - aLong }
.subscribeOn(Schedulers.io())
.observeOn(Schedulers.io())
.subscribe{millisUntilFinished->
if (millisUntilFinished <= 300L) {
if (millisUntilFinished <= 360L) {
orderInfo?.let {
if (broadcastList.get("${it}$min5Speak") == null
|| broadcastList.get("${it}$min5Speak") == false
@@ -544,7 +544,7 @@ object CharterPassengerModel {
}
iDistanceTimeCallback?.setOrderTimeCallBack(-1)
}else{
iDistanceTimeCallback?.setOrderTimeCallBack(millisUntilFinished+60)
iDistanceTimeCallback?.setOrderTimeCallBack(millisUntilFinished)
}
CallerLogger.d(
M_BUS_P + TAG,

5
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
View File

@@ -158,7 +158,10 @@ class BusPassengerPresenter(view: MainFragment?) :
setOrderTime("--","--")
return
}
val surplusTime = (timeInSecond / 60).toInt()
var surplusTime = (timeInSecond / 60).toInt()
if(surplusTime==0){
surplusTime = 1
}
val beforeTime = Calendar.getInstance()
beforeTime.add(Calendar.MINUTE, surplusTime)

15
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
View File

@@ -107,13 +107,13 @@ class LineSiteView @JvmOverloads constructor(
checkSite = hasSetLineAndSite.second
lineList.clear()
resetData()
isChangeIngLineAndSite = true
} else {
queryLineList()
setEnableLineStatus(true)
setEnableSiteStatus(false)
onlyChangeSite(false)
setSiteAdapterEnable(false)
setSwitchEnable(false)
isChangeIngLineAndSite = false
}
@@ -137,6 +137,7 @@ class LineSiteView @JvmOverloads constructor(
setEnableSiteStatus(false)
onlyChangeSite(false)
setSiteAdapterEnable(true)
isChangeIngLineAndSite = true
lineAdapter.submitLine(it)
checkLine?.let {
querySitesByLineId(it.lineId.toString(),false)
@@ -210,12 +211,13 @@ class LineSiteView @JvmOverloads constructor(
}
tv_line_cancle.onClick {
isChangeIngLineAndSite = false
resetData()
tempCheckLine = null
}
tv_site_cancle.onClick {
isChangeIngLineAndSite = false
resetData()
tempCheckLine = null
tempCheckSite = null
}
tv_line_submit.onClick {
if (tempCheckLine == null) {
@@ -333,6 +335,9 @@ class LineSiteView @JvmOverloads constructor(
}
}
}
private fun setSwitchEnable(enable: Boolean){
tv_switch_line.isEnabled = enable
}
/**
* 接收司机屏反馈信息
@@ -353,6 +358,7 @@ class LineSiteView @JvmOverloads constructor(
setEnableSiteStatus(true)
onlyChangeSite(false)
setSiteAdapterEnable(true)
setSwitchEnable(false)
tempCheckLineIsSubmit = true
tempCheckLine?.let {
lineAdapter.submitLine(it)
@@ -368,6 +374,7 @@ class LineSiteView @JvmOverloads constructor(
setEnableSiteStatus(true)
onlyChangeSite(false)
setSiteAdapterEnable(true)
setSwitchEnable(true)
checkLine = tempCheckLine
checkSite = tempCheckSite
tempCheckLine = null
@@ -378,7 +385,7 @@ class LineSiteView @JvmOverloads constructor(
}
go2StartCar()
} else {
tempCheckLineIsSubmit = false
tempCheckLineIsSubmit = true
ToastUtils.showShort("司机端拒绝请重新选择")
}
}