From d1112d3d96119327345d02cca28f6501fe1fadab Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 16 Jan 2024 16:50:49 +0800 Subject: [PATCH] =?UTF-8?q?[5.2.8]=20[shuttle=5Fp]=20[=E6=A0=B8=E9=94=80?= =?UTF-8?q?=E6=8E=A5=E9=A9=B3=E7=A5=A8=20=E6=97=A5=E5=BF=97=E5=A4=84?= =?UTF-8?q?=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/scnner/ScannerChainLogManager.kt | 49 +++++++++++++++++++ .../manager/scnner/ScannerManager.kt | 4 ++ .../shuttle/passenger/model/TicketModel.kt | 3 ++ 3 files changed, 56 insertions(+) create mode 100644 OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerChainLogManager.kt diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerChainLogManager.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerChainLogManager.kt new file mode 100644 index 0000000000..abc506434e --- /dev/null +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerChainLogManager.kt @@ -0,0 +1,49 @@ +package com.mogo.och.shuttle.passenger.manager.scnner + +import android.text.TextUtils +import com.mogo.commons.debug.DebugConfig +import com.mogo.commons.storage.SharedPrefsMgr +import com.mogo.commons.utils.MogoAnalyticUtils +import com.mogo.eagle.core.data.app.AppConfigInfo +import com.mogo.eagle.core.data.deva.chain.ChainConstant +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.util.DateTimeUtils +import com.zhjt.service.chain.ChainLog + +object ScannerChainLogManager { + + private val TAG = ScannerChainLogManager::class.java.simpleName + + const val EVENT_KEY_INFE_WITH_CHANGE = "event_key_och_scanner_info" + + /** + * @param Info 事件 + * @param changeInfo 数据 + */ + @ChainLog( + linkChainLog = ChainConstant.CHAIN_TYPE_OCH, + linkCode = ChainConstant.CHAIN_SOURCE_OCH, + nodeAliasCode = ChainConstant.CHAIN_CODE_OCH_COMMON_DISTANCE, + paramIndexes = [0,1] + ) + @JvmStatic + fun writeChainLog(info: String, changeInfo: String,upload:Boolean = true,eventID:String=EVENT_KEY_INFE_WITH_CHANGE) { + try { + d(SceneConstant.M_OCHCOMMON + TAG, info+changeInfo) + if(upload) { + val plateNum = AppConfigInfo.plateNumber + val params = HashMap() + params["sn"] = SharedPrefsMgr.getInstance().sn + params["env"] = DebugConfig.getNetMode() + params["plate_number"] = if (TextUtils.isEmpty(plateNum)) "" else plateNum + params["time"] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss) + params[info] = changeInfo + MogoAnalyticUtils.track(eventID, params) + } + }catch (e:Exception){ + e.printStackTrace() + } + } + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerManager.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerManager.kt index 4555d4fbc6..2ae8465486 100644 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerManager.kt +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerManager.kt @@ -89,6 +89,7 @@ object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IR } override fun onServiceState(serviceState: Int) { + ScannerChainLogManager.writeChainLog(TAG+"bindStatus","绑定服务结果:serviceState:${serviceState}") when (serviceState) { SERVICE_STATE.BIND_SUCCEED -> { bindStatus = BindStatus.BIND_SUCCEED @@ -113,6 +114,7 @@ object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IR // 查询串口 override fun onFindSerialPort(paths: Array?) { CallerLogger.d(M_BUS_P + TAG, "$paths") + ScannerChainLogManager.writeChainLog(TAG+"onFindSerialPort","查询串口:${paths}") if(paths==null) { bindStatus = BindStatus.BIND_FAILURE_NO_PERMISSION_NOT_FOUND } @@ -127,6 +129,7 @@ object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IR M_BUS_P + TAG, "path ${path}---isOpen${isOpen}--throwableMessage${throwableMessage}" ) + ScannerChainLogManager.writeChainLog(TAG+"onSerialPortState","扫码枪是否打开:path${path}_isOpen${isOpen}_throwableMessage${throwableMessage}") openStatus = if (isOpen) { sendMessage2Driver(true,"扫码枪打开成功") OpenStatus.Open @@ -137,6 +140,7 @@ object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IR } override fun onActiveDataReceive(data: VerificationActiveData?) { + ScannerChainLogManager.writeChainLog(TAG+"onActiveDataReceive","扫码结果：data:${data}") data?.let { if(data.unpackStatus==UnpackStatus.SUCCEED){ "数据类型${it.dataType.name}" 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 14bf2cd93a..6e4944fae1 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 @@ -10,6 +10,7 @@ import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.shuttle.passenger.bean.request.PassengerWriteOffRequest import com.mogo.och.shuttle.passenger.bean.response.PassengerWriteOffResponse +import com.mogo.och.shuttle.passenger.manager.scnner.ScannerChainLogManager import com.mogo.och.shuttle.passenger.manager.scnner.ScannerManager import com.mogo.och.shuttle.passenger.manager.scnner.StateChangeListener import com.mogo.och.shuttle.passenger.network.PassengerServiceManager @@ -75,6 +76,7 @@ object TicketModel : StateChangeListener { OchCommonConst.BUSINESS_STRING, GsonUtils.toJson(msg).toByteArray() ) + ScannerChainLogManager.writeChainLog(TAG +"sendMessage2Driver","核验失败：message:${message}") } private fun sendMessage2DriverSuccess(message: PassengerWriteOffResponse.Result){ val msg = WriteOffMsg(true, message.phone, message.ticketSize, message.ticketName, "") @@ -83,6 +85,7 @@ object TicketModel : StateChangeListener { OchCommonConst.BUSINESS_STRING, GsonUtils.toJson(msg).toByteArray() ) + ScannerChainLogManager.writeChainLog(TAG +"sendMessage2DriverSuccess","核验成功：message:${message}") }