diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerManager.kt index 1c96a1ca72..bbc1de9de4 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerManager.kt @@ -139,30 +139,30 @@ object ScannerManager : IOchLanPassengerStatusListener { ) when (state) { SerialPortManager.SERVICE_STATE.BIND_SUCCEED -> { - CallerLogger.d(M_BUS_P + TAG, "服务绑定成功") + CallerLogger.d(M_BUS_P + TAG, "硬件服务绑定成功") bindStatus = BindStatus.BIND_SUCCEED } SerialPortManager.SERVICE_STATE.BIND_FAILURE_UNINSTALLED -> { - CallerLogger.d(M_BUS_P + TAG, "服务绑定失败:未安装串口服务端APP") + CallerLogger.d(M_BUS_P + TAG, "硬件服务绑定失败:未安装“硬件服务”APP") bindStatus = BindStatus.BIND_FAILURE_UNINSTALLED } SerialPortManager.SERVICE_STATE.BIND_FAILURE_NO_PERMISSION_NOT_FOUND -> { CallerLogger.d( M_BUS_P + TAG, - "服务绑定失败:没有绑定权限或找不到服务(如果是此状态,基本上安装后就可以找到,主要就是权限问题)" + "硬件服务绑定失败:没有绑定权限或找不到服务(如果是此状态,基本上安装后就可以找到,主要就是权限问题)" ) bindStatus = BindStatus.BIND_FAILURE_NO_PERMISSION_NOT_FOUND } SerialPortManager.SERVICE_STATE.EXCEPTION -> { - CallerLogger.d(M_BUS_P + TAG, "服务被异常销毁") + CallerLogger.d(M_BUS_P + TAG, "硬件服务绑定失败:服务被异常销毁") bindStatus = BindStatus.EXCEPTION } else -> { - CallerLogger.d(M_BUS_P + TAG, "扫码枪未初始化") + CallerLogger.d(M_BUS_P + TAG, "硬件服务未初始化") bindStatus = BindStatus.NOTHING } } @@ -294,18 +294,18 @@ object ScannerManager : IOchLanPassengerStatusListener { private fun dispatchMsg(newV: BindStatus) { when (newV) { BindStatus.BIND_FAILURE_UNINSTALLED -> { - // 服务绑定失败:未安装串口服务端APP - sendWriteOffDevicesMessage2Driver(false, "服务绑定失败:未安装串口服务端APP") + // 硬件服务绑定失败:未安装“硬件服务”APP + sendWriteOffDevicesMessage2Driver(false, "硬件服务绑定失败:未安装“硬件服务”APP") } BindStatus.BIND_FAILURE_NO_PERMISSION_NOT_FOUND -> { - // 服务绑定失败:没有绑定权限或找不到服务(如果是此状态,基本上安装后就可以找到,主要就是权限问题) - sendWriteOffDevicesMessage2Driver(false, "服务绑定失败:没有绑定权限或找不到服务") + // 硬件服务绑定失败:没有绑定权限或找不到服务(如果是此状态,基本上安装后就可以找到,主要就是权限问题) + sendWriteOffDevicesMessage2Driver(false, "硬件服务绑定失败:没有绑定权限或找不到服务") } BindStatus.EXCEPTION -> { - // 扫码枪open错误 - sendWriteOffDevicesMessage2Driver(false, "扫码枪打开错误") + // 硬件服务绑定失败:服务被异常销毁 + sendWriteOffDevicesMessage2Driver(false, "硬件服务绑定失败:服务被异常销毁") } BindStatus.NOTHING -> {} diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index db4218888f..b3e3f2cb4c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -2769,7 +2769,7 @@ internal class DebugSettingView @JvmOverloads constructor( } else -> { - "未知" + "未初始化" } } val title = if (isUseTitle) { diff --git a/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/DevicesManager.kt b/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/DevicesManager.kt index bcc15a9468..08db724fdf 100644 --- a/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/DevicesManager.kt +++ b/libraries/mogo-hardware-devices/src/main/java/com/mogo/support/device/DevicesManager.kt @@ -90,11 +90,11 @@ object DevicesManager { return } verificationAutoListeners[tag] = listener - listener.onDeviceState( - verificationOpenState.path, verificationOpenState.deviceType, - verificationOpenState.isOpen, verificationOpenState.message - )//注册时回调一次当前状态 if (serviceBindState == SERVICE_STATE.BIND_SUCCEED) { + listener.onDeviceState( + verificationOpenState.path, verificationOpenState.deviceType, + verificationOpenState.isOpen, verificationOpenState.message + )//注册时回调一次当前状态 if (!serialPortManager.isOpen(DefaultDevices.VERIFICATION.path)) { serialPortManager.open(DefaultDevices.VERIFICATION, verificationListener) } @@ -122,13 +122,13 @@ object DevicesManager { if (speechCx830seListeners.containsKey(tag)) { return } - listener.onOpenState( - speechCx830seOpenState.path ?: "", - speechCx830seOpenState.isOpen, - speechCx830seOpenState.message - )//注册时回调一次当前状态 speechCx830seListeners[tag] = listener if (serviceBindState == SERVICE_STATE.BIND_SUCCEED) { + listener.onOpenState( + speechCx830seOpenState.path ?: "", + speechCx830seOpenState.isOpen, + speechCx830seOpenState.message + )//注册时回调一次当前状态 if (!serialPortManager.isOpen(DefaultDevices.SPEECH_CX830SE.path)) { serialPortManager.open(DefaultDevices.SPEECH_CX830SE, speechCx830seListener) } @@ -184,10 +184,10 @@ object DevicesManager { override fun onServiceState(serviceState: Int) { serviceBindState = serviceState - var msg = "" + var msg = "硬件服务未初始化" when (serviceState) { SERVICE_STATE.BIND_SUCCEED -> { - msg = "服务绑定成功" + msg = "硬件服务绑定成功" if (!serialPortManager.isOpen(DefaultDevices.VERIFICATION.path)) { serialPortManager.open(DefaultDevices.VERIFICATION, verificationListener) } @@ -197,16 +197,16 @@ object DevicesManager { } SERVICE_STATE.BIND_FAILURE_UNINSTALLED -> { - msg = "服务绑定失败:未安装串口服务端APP" + msg = "硬件服务绑定失败:未安装“硬件服务”APP" } SERVICE_STATE.BIND_FAILURE_NO_PERMISSION_NOT_FOUND -> { msg = - "服务绑定失败:没有绑定权限或找不到服务(如果是此状态,基本上安装后就可以找到,主要就是权限问题)" + "硬件服务绑定失败:没有绑定权限或找不到服务(如果是此状态,基本上安装后就可以找到,主要就是权限问题)" } SERVICE_STATE.EXCEPTION -> { - msg = "服务被异常销毁" + msg = "硬件服务绑定失败:服务被异常销毁" } else -> {}