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

[5.2.8]

Browse Source 
[shuttle]
[核销接驳票 司机屏处理]
This commit is contained in:
yangyakun
2024-01-16 19:16:57 +08:00
parent d1112d3d96
commit b1ef57f081
6 changed files with 211 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerManager.kt
View File

@@ -198,7 +198,7 @@ object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IR
* 打开设备后数据异常
*/
private fun sendMessage2DriverWriteOffInfo(message:String){
val msg = WriteOffMsg(false, "", 0, "", message)
val msg = WriteOffMsg(false, "", 0, "", message,"")
CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg))
CallerTelematicManager.sendMsgToServer(
OchCommonConst.BUSINESS_STRING,

8
OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt
View File

@@ -49,7 +49,7 @@ object TicketModel : StateChangeListener {
val ticketInfo =
"核销成功：票种名称：${data.data.ticketName},车票数量：${data.data.ticketSize},预留手机号：${data.data.phone}，时间:${data.data.remainingTimes}"
CallerLogger.d(M_BUS_P + TAG, ticketInfo)
sendMessage2DriverSuccess(data.data)
sendMessage2DriverSuccess(data.data,orderNo)
}
override fun onFail(code: Int, msg: String?) {
@@ -70,7 +70,7 @@ object TicketModel : StateChangeListener {
}
private fun sendMessage2Driver(message:String){
val msg = WriteOffMsg(false, "", 0, "", message)
val msg = WriteOffMsg(false, "", 0, "", "",message)
CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg))
CallerTelematicManager.sendMsgToServer(
OchCommonConst.BUSINESS_STRING,
@@ -78,8 +78,8 @@ object TicketModel : StateChangeListener {
)
ScannerChainLogManager.writeChainLog(TAG +"sendMessage2Driver","核验失败：message:${message}")
}
private fun sendMessage2DriverSuccess(message: PassengerWriteOffResponse.Result){
val msg = WriteOffMsg(true, message.phone, message.ticketSize, message.ticketName, "")
private fun sendMessage2DriverSuccess(message: PassengerWriteOffResponse.Result,orderNo: String){
val msg = WriteOffMsg(true, message.phone, message.ticketSize, message.ticketName, "",orderNo)
CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg))
CallerTelematicManager.sendMsgToServer(
OchCommonConst.BUSINESS_STRING,