Commit 9bd85c78 authored by 王韦's avatar 王韦

[bug ] 打印机bug fix

parent 625bf383
...@@ -51,7 +51,7 @@ repositories { ...@@ -51,7 +51,7 @@ repositories {
} }
group 'com.qmai.android.print' group 'com.qmai.android.print'
version '1.1.5-SNAPSHOT' version '1.1.6-SNAPSHOT'
gradlePublish { gradlePublish {
......
...@@ -25,7 +25,7 @@ class UsbDeviceManager(override var mType: Int = USB) : DeviceManager() { ...@@ -25,7 +25,7 @@ class UsbDeviceManager(override var mType: Int = USB) : DeviceManager() {
mmIntf = it.getInterface(0) mmIntf = it.getInterface(0)
if (mmIntf != null) { if (mmIntf != null) {
this.mmConnection = this.usbManager?.openDevice(this.usbDevice) this.mmConnection = this.usbManager?.openDevice(this.usbDevice)
this.deviceId = this.usbDevice?.serialNumber ?:"" this.deviceId = this.usbDevice?.serialNumber ?: ""
if (this.mmConnection != null && this.mmConnection?.claimInterface( if (this.mmConnection != null && this.mmConnection?.claimInterface(
mmIntf!!, mmIntf!!,
true true
...@@ -44,7 +44,7 @@ class UsbDeviceManager(override var mType: Int = USB) : DeviceManager() { ...@@ -44,7 +44,7 @@ class UsbDeviceManager(override var mType: Int = USB) : DeviceManager() {
} }
} }
} }
if (this.mmEndOut != null && this.mmEndIn != null) { if (this.mmEndOut != null) {
//检查打印机状态 //检查打印机状态
PrinterStatusUtils(this).apply { PrinterStatusUtils(this).apply {
mPrintStatusCallBack = object : PrintStatusCallBack { mPrintStatusCallBack = object : PrintStatusCallBack {
...@@ -84,16 +84,19 @@ class UsbDeviceManager(override var mType: Int = USB) : DeviceManager() { ...@@ -84,16 +84,19 @@ class UsbDeviceManager(override var mType: Int = USB) : DeviceManager() {
} }
override fun readData(bytes: ByteArray): Int { override fun readData(bytes: ByteArray): Int {
return if (this.mmConnection != null) this.mmConnection!!.bulkTransfer( this.mmEndIn?.let {
this.mmEndIn, return if (this.mmConnection != null) this.mmConnection!!.bulkTransfer(
bytes, this.mmEndIn,
bytes.size, bytes,
200 bytes.size,
) else 0 200
) else 0
}
return 0
} }
override fun writeData(bytes: ByteArray) { override fun writeData(bytes: ByteArray) {
this.mmConnection!!.bulkTransfer( this.mmConnection!!.bulkTransfer(
this.mmEndOut, this.mmEndOut,
bytes, bytes,
bytes.size, bytes.size,
......
...@@ -10,16 +10,14 @@ import android.hardware.usb.UsbManager ...@@ -10,16 +10,14 @@ import android.hardware.usb.UsbManager
import android.os.Build import android.os.Build
import android.util.Log import android.util.Log
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import zs.qimai.com.printer2.callback.*
import zs.qimai.com.printer2.fragment.BlueToothLists import zs.qimai.com.printer2.fragment.BlueToothLists
import zs.qimai.com.printer2.lifecycle.ActivityManagers import zs.qimai.com.printer2.lifecycle.ActivityManagers
import zs.qimai.com.printer2.lifecycle.PrintLifeCycleCallBack
import zs.qimai.com.printer2.manager.BlueDeviceManager import zs.qimai.com.printer2.manager.BlueDeviceManager
import zs.qimai.com.printer2.manager.DeviceManagerUtils import zs.qimai.com.printer2.manager.DeviceManagerUtils
import zs.qimai.com.printer2.callback.*
import zs.qimai.com.printer2.lifecycle.PrintLifeCycleCallBack
import zs.qimai.com.printer2.manager.DeviceManager
import zs.qimai.com.printer2.manager.UsbDeviceManager import zs.qimai.com.printer2.manager.UsbDeviceManager
import zs.qimai.com.printer2.receiverManager.UsbRqPermissionReceiverManager import zs.qimai.com.printer2.receiverManager.UsbRqPermissionReceiverManager
import java.lang.RuntimeException
/**** /****
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment