[6.0.0]

[charter]
[登录状态补丁、删除底盘掉头提示]

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

@@ -87,17 +87,7 @@ 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()) {
+        }  else if ("ISSM_FUNC_AUTO_PILOT_READY" == guardianInfo.getCode()) {
             // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。
             d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() ssm ready，再次发起下载")
             syncTrajectoryInfo(get().getBusOrderResult()?.lineId!!,

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

@@ -45,6 +45,7 @@ import com.mogo.och.common.module.manager.OCHAdasAbilityManager
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.PinYinUtil
+import com.mogo.och.common.module.utils.RxUtils
 import com.mogo.och.common.module.voice.VoiceManager
 import com.mogo.och.common.module.voice.VoiceNotice
 import io.reactivex.Observable
@@ -191,15 +192,6 @@ object CharterPassengerModel {
                 }
             }
 
-            override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
-                super.onAutopilotGuardian(guardianInfo)
-                guardianInfo?.let {
-                    if (it.code=="IMAP_TRA_LOADED") {
-                        ToastCharterUtils.showToastShort("请等待车辆完成掉头后再出发吧～")
-                    }
-                }
-            }
-
             override fun onAutopilotArriveAtStation(arrivalNotification: MessagePad.ArrivalNotification?) {
                 d(M_BUS_P + TAG, "底盘给到站信息")
                 arriveDest()
@@ -293,7 +285,18 @@ object CharterPassengerModel {
                     LoginStatusManager.setLoginStatus(data.data.driverStatus)
                 }
 
-                override fun onFail(code: Int, msg: String) {}
+                override fun onFail(code: Int, msg: String) {
+                    RxUtils.createSubscribe {
+                        queryLoginStatus()
+                    }
+                }
+
+                override fun onError() {
+                    super.onError()
+                    RxUtils.createSubscribe {
+                        queryLoginStatus()
+                    }
+                }
             })
     }
 

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt

@@ -344,4 +344,9 @@ class BusPassengerPresenter(view: MainFragment?) :
         }
 
     }
+
+    fun querLogin() {
+        CharterPassengerModel.queryLoginStatus()
+    }
+
 }

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt

@@ -119,6 +119,7 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
                                 return true
                             }
                         } else {
+                            mPresenter?.querLogin()
                             ToastCharterUtils.showToastShort(requireContext().getString(R.string.m1_please_login_driver))
                             return true
                         }