[3.2.0] m1司机端同一路线切换站点不再弹框

This commit is contained in:
wangmingjun
2023-05-14 21:51:38 +08:00
parent fc49e84091
commit 4c5da7b3e7

View File

@@ -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 + " 站点")