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 8381ca7ba8..2e1f653608 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 @@ -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,