diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/TicketModel.kt b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/TicketModel.kt index 8f1c7a8c6c..47a51d7d6f 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/TicketModel.kt +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/bus/model/TicketModel.kt @@ -93,6 +93,7 @@ object TicketModel : IReceivedMsgListener, IMogoOnMessageListener { + CallerLogger.d(M_BUS_P + TAG, "服务绑定成功") bindStatus = BindStatus.BIND_SUCCEED serialPortManager.openVerificationDevice(this) } diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt index 5183a494a2..a1388b6280 100644 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerStateView.kt @@ -4,6 +4,8 @@ import android.content.Context import android.util.AttributeSet import android.view.View import androidx.appcompat.widget.AppCompatImageView +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.R class ScannerStateView @JvmOverloads constructor( @@ -19,6 +21,7 @@ class ScannerStateView @JvmOverloads constructor( } override fun stateChange(newBindValue: BindStatus, newOpentValue: OpenStatus) { + CallerLogger.d(SceneConstant.M_BUS_P + TAG, "newBindValue = $newBindValue newOpentValue = $newOpentValue") when (newBindValue) { BindStatus.BIND_SUCCEED -> { // 绑定成功 diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt index fce605296e..7b87149914 100644 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt @@ -61,7 +61,19 @@ object TicketModel : StateChangeListener { 1008 -> {sendMessage2Driver("车票剩余可用次数为0")} 6001 -> {sendMessage2Driver("二维码已过期")} 1012 -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司")} - else -> {} + else -> { + when (msg) { + "6002" -> {sendMessage2Driver("同一订单核销间隔时间需大于5分钟")} + "1009" -> {sendMessage2Driver("车票所选乘车日期非今日")} + "1006" -> {sendMessage2Driver("车票路线信息与当前车辆执行任务的路线信息不符合")} + "1008" -> {sendMessage2Driver("车票剩余可用次数为0")} + "6001" -> {sendMessage2Driver("二维码已过期")} + "1012" -> {sendMessage2Driver("当前用户下单路线非当前的车辆所属公司")} + else -> { + sendMessage2Driver(msg?:"") + } + } + } } } @@ -70,7 +82,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,