diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt index d72a9a072e..b3be7d3a25 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt @@ -228,7 +228,6 @@ class DriverM1Model { if (msg.type == DPMsgType.TYPE_CHANGE_DEST.type){ val changeDestMsg = GsonUtils.fromJson(String(byteArray), ChangeDestMsg::class.java) as ChangeDestMsg - currentChangeDestMsg = changeDestMsg if (changeDestMsg.arriveStatus == 2){//到站 // 2、到站同步 sendMsgToClient(changeDestMsg) @@ -249,6 +248,14 @@ class DriverM1Model { private fun showChangerDestCommitDialog(changeDestMsg: ChangeDestMsg) { if (!TextUtils.isEmpty(changeDestMsg.destSiteName) && !TextUtils.isEmpty(changeDestMsg.lineName)){ + if (changeDestMsg.lineId == currentChangeDestMsg?.lineId){//同一条路线切换站点不需要再确认 + currentChangeDestMsg = changeDestMsg + changeDest() + return + } + + currentChangeDestMsg = changeDestMsg + UiThreadHandler.post{ mChangeDestCallback?.showCommitDialog("确认路线站点", "请确认是否前往 "+ changeDestMsg.lineName+ changeDestMsg.destSiteName + " 站点")