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

12
OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
View File

@@ -14,7 +14,6 @@ import com.magic.mogo.och.charter.constant.CharterConst
import com.magic.mogo.och.charter.manager.CharterAnalyticsManager
import com.magic.mogo.och.charter.manager.CharterTrajectoryManager
import com.magic.mogo.och.charter.net.DriverM1ServiceManager
import com.mogo.aicloud.services.socket.IMogoOnMessageListener
import com.mogo.commons.module.intent.IMogoIntentListener
import com.mogo.commons.module.intent.IntentManager
import com.mogo.commons.voice.AIAssist
@@ -39,10 +38,6 @@ import com.mogo.eagle.core.utilcode.util.*
import com.mogo.och.common.module.biz.login.LoginStatusManager
import com.mogo.och.common.module.callback.OchAdasStartFailureCallback
import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.manager.CharterSendTripInfoManager
import com.mogo.och.common.module.manager.CharterSendTripInfoManager.ARRIVE_STATION
import com.mogo.och.common.module.manager.CharterSendTripInfoManager.END_TRIP
import com.mogo.och.common.module.manager.CharterSendTripInfoManager.START_TRIP
import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
@@ -61,6 +56,7 @@ import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction
import com.mogo.och.common.module.manager.socket.cloud.data.OperateDoorMsg
import com.mogo.och.common.module.manager.socket.cloud.data.OrderCloseMsg
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.AppConnectMsg
import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg
import com.mogo.och.common.module.manager.socket.lan.bean.ChangeDestMsg
@@ -404,7 +400,7 @@ class DriverM1Model {
private fun onArriveAtSuccess() {
isArrivedStation = true
CharterSendTripInfoManager.sendCharterTripInfo(ARRIVE_STATION,mCurrentOrder?.lineName!!
LedScreenManager.sendTripInfo2Led(LedScreenManager.ARRIVE_STATION,mCurrentOrder?.lineName!!
,mCurrentOrder?.startSiteName!!,mCurrentOrder?.siteName!!,false)
if (currentChangeDestMsg != null){
@@ -764,13 +760,13 @@ class DriverM1Model {
*/
private fun sendCharterStartTripInfo() {
if (mCurrentOrder == null) return
CharterSendTripInfoManager.sendCharterTripInfo(START_TRIP,mCurrentOrder?.lineName!!
LedScreenManager.sendTripInfo2Led(LedScreenManager.START_TRIP,mCurrentOrder?.lineName!!
,"","",false)
}
private fun sendCharterEndTripInfo() {
if (mCurrentOrder == null) return
CharterSendTripInfoManager.sendCharterTripInfo(END_TRIP,mCurrentOrder?.lineName!!
LedScreenManager.sendTripInfo2Led(LedScreenManager.END_TRIP,mCurrentOrder?.lineName!!
,"","",false)
}

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

@@ -38,13 +38,9 @@ import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg
import com.mogo.och.common.module.manager.socket.lan.bean.ChangeDestMsg
import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
import com.mogo.och.common.module.biz.login.LoginStatusManager
import com.mogo.och.common.module.constant.OchCommonConst
import com.mogo.och.common.module.biz.login.ILoginCallback
import com.mogo.och.common.module.biz.login.LoginStatusEnum
import com.mogo.och.common.module.network.OchCommonServiceCallback
import com.mogo.och.common.module.manager.CharterSendTripInfoManager
import com.mogo.och.common.module.manager.CharterSendTripInfoManager.LEAVE_STATION
import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation
import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
@@ -54,6 +50,7 @@ import com.mogo.och.common.module.manager.beautifymode.BeautifyManager
import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
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.utils.CoordinateCalculateRouteUtil
import com.mogo.och.common.module.utils.DateTimeUtil
import com.mogo.och.common.module.utils.PinYinUtil
@@ -1215,8 +1212,8 @@ object CharterPassengerModel {
//发送前后屏出站消息 3：代表出站
orderInfo?.let {
if(!it.lineName.isNullOrEmpty()&&!it.startSiteName.isNullOrEmpty()&&!it.siteName.isNullOrEmpty()) {
CharterSendTripInfoManager.sendCharterTripInfo(
LEAVE_STATION,
LedScreenManager.sendTripInfo2Led(
LedScreenManager.LEAVE_STATION,
it.lineName, it.startSiteName!!, it.siteName!!, false
)
}