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

[6.6.0]

Browse Source 
[led通讯添加日志]
This commit is contained in:
yangyakun
2024-08-13 12:02:54 +08:00
parent 0806383490
commit d5fbbf7028
11 changed files with 44 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt
View File

@@ -46,6 +46,7 @@ import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction
import com.mogo.och.common.module.manager.socket.lan.ILanMessageListener
import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
import com.mogo.och.common.module.manager.socket.lan.LedScreenManager
import com.mogo.och.common.module.manager.socket.lan.bean.BusCacheKey
import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType
import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType
@@ -76,8 +77,6 @@ import com.mogo.och.weaknet.net.OrderServiceManager
import com.mogo.och.weaknet.net.OrderServiceManager.endTask
import com.mogo.och.weaknet.net.OrderServiceManager.leaveStation
import com.mogo.och.weaknet.util.BusAnalyticsManager
import com.mogo.och.weaknet.util.BusSendTripInfoManager
import com.mogo.och.weaknet.util.BusSendTripInfoManager.sendBusTripInfo
import com.mogo.och.weaknet.util.BusTrajectoryManager
import com.mogo.och.weaknet.util.ShuttleVoiceManager
@@ -453,8 +452,8 @@ object OrderModel {
currentStationIndex = 0
if (busRoutesResult != null) {
sendBusTripInfo(
BusSendTripInfoManager.END_TRIP,
LedScreenManager.sendTripInfo2Led(
LedScreenManager.END_TRIP,
busRoutesResult!!.name,
"",
"",
@@ -488,8 +487,8 @@ object OrderModel {
isLastStop = true
}
//给bus外屏发送
sendBusTripInfo(
BusSendTripInfoManager.LEAVE_STATION,
LedScreenManager.sendTripInfo2Led(
LedScreenManager.LEAVE_STATION,
busRoutesResult!!.name,
leaveStation,
nextStation,
@@ -688,8 +687,8 @@ object OrderModel {
isLastStop = true
}
//给bus外屏发送
sendBusTripInfo(
BusSendTripInfoManager.ARRIVE_STATION,
LedScreenManager.sendTripInfo2Led(
LedScreenManager.ARRIVE_STATION,
busRoutesResult!!.name,
departureStopName,
arriveStation,
@@ -861,8 +860,8 @@ object OrderModel {
if (currentStationIndex == 0 && stationList[0].drivingStatus == BusConst.STATION_STATUS_STOPPED && !stationList[0].isLeaving
) { //默认是第一站到站查询
if (busRoutesResult != null) { // 第一站到站也是行程开始的时候
sendBusTripInfo(
BusSendTripInfoManager.START_TRIP,
LedScreenManager.sendTripInfo2Led(
LedScreenManager.START_TRIP,
busRoutesResult!!.name, "", "", false
)
}

36
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusSendTripInfoManager.kt
View File

@@ -1,36 +0,0 @@
package com.mogo.och.weaknet.util
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
/**
* @author: wangmingjun
* @date: 2022/10/24
*/
object BusSendTripInfoManager{
const val START_TRIP = 1
const val END_TRIP = 2
const val LEAVE_STATION = 3
const val ARRIVE_STATION = 4
/**
* 行程信息
* @param type 事件类型, 1:行程开始, 2:行程结束, 3:出站, 4:进站, 5:城市占道施工预警
* @param lineName 路线名, for type 1, 2
* @param departureStopName 出站站点名, for type 3, 4
* @param arrivalStopName 下一站到达站点名, for type 3, 4
* @param isLastStop 是否终点站(下一站或者要到达站)
* @return
*/
fun sendBusTripInfo(type: Int, lineName: String,
departureStopName: String,
arrivalStopName: String,
isLastStop: Boolean) {
d(SceneConstant.M_BUS + "BusSendTripInfoManager", "type: "+ type
+", lineName: "+ lineName +", departureStopName: "+ departureStopName
+ ", arrivalStopName: "+arrivalStopName+", isLastStop: "+isLastStop)
CallerAutoPilotControlManager.sendTripInfo(type,lineName,departureStopName, arrivalStopName, isLastStop)
}
}