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

[3.2.0] m1 司机端确认路线改为一次确认

Browse Source
This commit is contained in:
wangmingjun
2023-04-17 16:41:37 +08:00
parent ae2e8fddbb
commit 95f81150ba
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
View File

@@ -236,15 +236,10 @@ class DriverM1Model {
}
private fun showChangerDestCommitDialog(changeDestMsg: ChangeDestMsg) {
if (!TextUtils.isEmpty(changeDestMsg.destSiteName)){
if (!TextUtils.isEmpty(changeDestMsg.destSiteName) && !TextUtils.isEmpty(changeDestMsg.lineName)){
UiThreadHandler.post{
mChangeDestCallback?.showCommitDialog("确认站点",
"请确认是否前往"+ changeDestMsg.destSiteName + "站点")
}
}else if (!TextUtils.isEmpty(changeDestMsg.lineName)){
UiThreadHandler.post{
mChangeDestCallback?.showCommitDialog("确认路线",
"请确认是否切换"+ changeDestMsg.lineName + "路线")
mChangeDestCallback?.showCommitDialog("确认路线站点",
"请确认是否前往 "+ changeDestMsg.lineName+ changeDestMsg.destSiteName + " 站点")
}
}
}
@@ -526,6 +521,7 @@ class DriverM1Model {
*/
fun sendCommitMsgToClient(isConfirmed: Boolean) {
if (currentChangeDestMsg !== null) {
d(SceneConstant.M_CHARTER_D + TAG, "confirmed station $isConfirmed" )
currentChangeDestMsg?.isConfirmed = isConfirmed
sendMsgToClient(currentChangeDestMsg)
}
@@ -674,11 +670,11 @@ class DriverM1Model {
fun changeDest(){
if (currentChangeDestMsg == null) return
if (TextUtils.isEmpty(currentChangeDestMsg?.destSiteName)){//确认路线
d(SceneConstant.M_CHARTER_D + TAG, "confirm line .")
sendCommitMsgToClient(true)
return
}
// if (TextUtils.isEmpty(currentChangeDestMsg?.destSiteName)){//确认路线
// d(SceneConstant.M_CHARTER_D + TAG, "confirm line .")
// sendCommitMsgToClient(true)
// return
// }
DriverM1ServiceManager.changeDest(mContext,currentChangeDestMsg!!.lineId,
currentChangeDestMsg!!.startSiteId,
currentChangeDestMsg!!.destSiteId,