yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[shuttle] m2乘客屏auto bug

Browse Source
This commit is contained in:
wangmingjun
2023-02-27 10:52:56 +08:00
parent c5ddb64496
commit 387572900b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
View File

@@ -145,7 +145,7 @@ class PM2DrivingModel private constructor() {
override fun onReceivedMsg(type: Int, byteArray: ByteArray) {//接收司机端发来的信息
if (TelematicConstant.BUSINESS_STRING == type){
val msg = GsonUtils.fromJson(String(byteArray),AppConnectMsg::class.java) as AppConnectMsg
Logger.d(TAG,"onReceivedMsg = "+GsonUtils.toJson(msg))
Logger.d(SceneConstant.M_BUS_P+TAG,"onReceivedMsg = "+GsonUtils.toJson(msg))
if (msg.isPlay){ //播报
speakTTS(msg.msg)
}
@@ -227,7 +227,7 @@ class PM2DrivingModel private constructor() {
super.onAutopilotStatusResponse(autoPilotStatusInfo)
val status = autoPilotStatusInfo.state
if (mCurrentAutoStatus == status) return
d(SceneConstant.M_BUS_P+TAG, "onAutopilotStatusResponse ===== $status")
if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != status){
//美化模式下且行程中
if (FunctionBuildConfig.isDemoMode &&
@@ -241,6 +241,7 @@ class PM2DrivingModel private constructor() {
}else{//自驾状态 2
mAutoStatusCallback?.updateAutoStatus(true)
}
mCurrentAutoStatus = status
}
}
@@ -260,7 +261,7 @@ class PM2DrivingModel private constructor() {
if (data?.data == null) return
if (data.data.driverStatus != operationStatus?.driverStatus
|| data.data.plateNumber != operationStatus?.plateNumber){
d(TAG, "queryDriverOperationStatus ===== 车牌或者登陆状态有变更")
d(SceneConstant.M_BUS_P+TAG, "queryDriverOperationStatus ===== 车牌或者登陆状态有变更")
mDrivingInfoCallback?.changeOperationStatus(data.data.driverStatus == 1)
}
operationStatus = data.data as PM2OperationStatusResponse.Result
@@ -294,7 +295,7 @@ class PM2DrivingModel private constructor() {
}
if (data?.result?.sites === null) {
d(TAG, "queryDriverSiteByCoordinate ===== 没有路线")
d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate ===== 没有路线")
routesResult = null
mNextStationIndex = 0
isGoingToNextStation = false
@@ -314,7 +315,7 @@ class PM2DrivingModel private constructor() {
queryDriverOperationDelay()
return
}
d(TAG, "queryDriverSiteByCoordinate = %s", msg)
d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate = %s", msg)
}
})
@@ -335,7 +336,7 @@ class PM2DrivingModel private constructor() {
&& station.isLeaving && i + 1 < stations.size) {
mDrivingInfoCallback?.updateStationsInfo(stations as MutableList<PM2Station>, i + 1, false)
if (mNextStationIndex != i + 1) {
d(TAG,"轨迹排查--开始行程")
d(SceneConstant.M_BUS_P+TAG,"轨迹排查--开始行程")
mTwoStationsRouts.clear()
startRemainRouteInfo()
}
@@ -467,7 +468,7 @@ class PM2DrivingModel private constructor() {
* @param isStart
*/
fun startOrStopCalculateRouteInfo(isStart: Boolean) {
d(TAG, "startOrStopCalculateRouteInfo() $isStart")
d(SceneConstant.M_BUS_P+TAG, "startOrStopCalculateRouteInfo() $isStart")
if (isStart) {
PM2ModelLoopManager.startCalculateRouteInfoLoop()
} else {