[6.0.0]

[修改线路]

OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt

@@ -1,14 +1,21 @@
 package com.magic.mogo.och.charter.manager
 
+import com.magic.mogo.och.charter.R
 import com.magic.mogo.och.charter.constant.CharterConst
 import com.magic.mogo.och.charter.model.DriverM1Model.Companion.get
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters.AutoPilotLine
+import com.mogo.eagle.core.data.msgbox.MsgBoxBean
+import com.mogo.eagle.core.data.msgbox.MsgBoxType
+import com.mogo.eagle.core.data.msgbox.OperationMsg
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.sendTrajectoryDownloadReq
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.och.common.module.biz.constant.LoginStatusManager
+import com.mogo.och.common.module.utils.SoundPoolHelper
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
@@ -80,6 +87,16 @@ object CharterTrajectoryManager {
             // 5. 轨迹管理_轨迹下载超时
             d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() 轨迹下载超时")
             // ToastUtils.showShort("轨迹下载超时");
+        } else if ("IMAP_TRA_LOADED" == guardianInfo.getCode()) {
+            CallerMsgBoxManager.saveMsgBox(
+                MsgBoxBean(
+                    MsgBoxType.OPERATION,
+                    OperationMsg(
+                        System.currentTimeMillis(), "请尽快操作车辆至适当位置掉头！", -1
+                    )
+                )
+            )
+            SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getTopActivity(), R.raw.startautopilot)
         } else if ("ISSM_FUNC_AUTO_PILOT_READY" == guardianInfo.getCode()) {
             // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。
             d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() ssm ready，再次发起下载")

OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt

@@ -23,12 +23,16 @@ import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
 import com.mogo.eagle.core.data.map.MogoLocation
+import com.mogo.eagle.core.data.msgbox.MsgBoxBean
+import com.mogo.eagle.core.data.msgbox.MsgBoxType
+import com.mogo.eagle.core.data.msgbox.OperationMsg
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
 import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.startAutoPilot
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.sendMsgToAllClients
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -231,18 +235,18 @@ class DriverM1Model {
 
     private fun showChangerDestCommitDialog(changeDestMsg: ChangeDestMsg) {
         if (!TextUtils.isEmpty(changeDestMsg.destSiteName) && !TextUtils.isEmpty(changeDestMsg.lineName)){
-            if (changeDestMsg.lineId == currentChangeDestMsg?.lineId){//同一条路线切换站点不需要再确认
+            //if (changeDestMsg.lineId == currentChangeDestMsg?.lineId){//同一条路线切换站点不需要再确认
                 currentChangeDestMsg = changeDestMsg
                 changeDest()
                 return
-            }
+            //}  不用司机端确认直接保存
 
-            currentChangeDestMsg = changeDestMsg
+//            currentChangeDestMsg = changeDestMsg
 
-            UiThreadHandler.post{
-                mChangeDestCallback?.showCommitDialog("确认路线站点",
-                    "请确认是否前往 "+ changeDestMsg.lineName+ changeDestMsg.destSiteName + " 站点")
-            }
+//            UiThreadHandler.post{
+//                mChangeDestCallback?.showCommitDialog("确认路线站点",
+//                    "请确认是否前往 "+ changeDestMsg.lineName+ changeDestMsg.destSiteName + " 站点")
+//            }
         }
     }
 
@@ -783,6 +787,17 @@ class DriverM1Model {
                        CallerAutoPilotControlManager.cancelAutoPilot()
                        queryCurrentServiceStatus()
                        sendCommitMsgToClient(true,writeVersion)
+                       CallerMsgBoxManager.saveMsgBox(
+                           MsgBoxBean(
+                               MsgBoxType.OPERATION,
+                               OperationMsg(
+                                   System.currentTimeMillis(),
+                                   "即将前往路线${currentChangeDestMsg!!.lineName}、站点${currentChangeDestMsg!!.destSiteName}；如需掉头请尽快操作车辆至适当位置！",
+                                   -1
+                               )
+                           )
+                       )
+                       SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getTopActivity(), R.raw.startautopilot)
                    }
                }
 

OCH/charter/passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt

@@ -53,6 +53,7 @@ import io.reactivex.Observable
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import mogo.telematics.pad.MessagePad
+import mogo_msg.MogoReportMsg
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.TimeUnit
@@ -222,6 +223,15 @@ object CharterPassengerModel {
                 }
             }
 
+            override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
+                super.onAutopilotGuardian(guardianInfo)
+                guardianInfo?.let {
+                    if (it.code=="IMAP_TRA_LOADED") {
+                        ToastCharterUtils.showShort("请等待车辆完成掉头后再出发吧～")
+                    }
+                }
+            }
+
             override fun onAutopilotArriveAtStation(arrivalNotification: MessagePad.ArrivalNotification?) {
                 d(M_BUS_P + TAG, "底盘给到站信息")
                 arriveDest()