Commit a74d216d authored by 王雷's avatar 王雷

修改蓝牙打印机连接方式

parent 2f8ae2e8
...@@ -51,7 +51,7 @@ repositories { ...@@ -51,7 +51,7 @@ repositories {
} }
group 'com.qmai.android.print' group 'com.qmai.android.print'
version '1.1.71-SNAPSHOT' version '1.1.75-SNAPSHOT'
gradlePublish { gradlePublish {
......
...@@ -33,6 +33,9 @@ data class PrintDeviceStatus( ...@@ -33,6 +33,9 @@ data class PrintDeviceStatus(
} }
USER_CANCEL_CONNECTED -> "用户主动取消连接" USER_CANCEL_CONNECTED -> "用户主动取消连接"
PRINT_WRITE ->{
"打印下发指令"
}
else -> { else -> {
"" ""
} }
...@@ -53,8 +56,13 @@ data class PrintDeviceStatus( ...@@ -53,8 +56,13 @@ data class PrintDeviceStatus(
//用户主动取消连接 //用户主动取消连接
const val USER_CANCEL_CONNECTED = 6 const val USER_CANCEL_CONNECTED = 6
//设备重复添加 //设备重复添加
const val PRINT_REPEAT_ADD = 7 const val PRINT_REPEAT_ADD = 7
//下发指令
const val PRINT_WRITE = 8
} }
} }
\ No newline at end of file
...@@ -13,18 +13,12 @@ import zs.qimai.com.printer2.printStatus.PrintStatusCallBack ...@@ -13,18 +13,12 @@ import zs.qimai.com.printer2.printStatus.PrintStatusCallBack
import zs.qimai.com.printer2.printStatus.PrinterStatusUtils import zs.qimai.com.printer2.printStatus.PrinterStatusUtils
import zs.qimai.com.printer2.utils.PrintFormat import zs.qimai.com.printer2.utils.PrintFormat
import zs.qimai.com.printer2.utils.PrintManagerUtils import zs.qimai.com.printer2.utils.PrintManagerUtils
import zs.qimai.com.printer2.utils.PrintManagerUtils.Companion.ACTIVITY_NOT_FOUND
import zs.qimai.com.printer2.utils.PrintManagerUtils.Companion.BOND_NONE
import zs.qimai.com.printer2.utils.PrintManagerUtils.Companion.PRINT_MODE_NOT_SUPPORT import zs.qimai.com.printer2.utils.PrintManagerUtils.Companion.PRINT_MODE_NOT_SUPPORT
import zs.qimai.com.printer2.callback.BlueToothPwdCallBack
import zs.qimai.com.printer2.callback.OnBtConnectCallBack import zs.qimai.com.printer2.callback.OnBtConnectCallBack
import zs.qimai.com.printer2.lifecycle.ActivityManagers
import zs.qimai.com.printer2.receiverManager.BlueToothPwdReceiverManager
import zs.qimai.com.printer2.utils.PrintManagerUtils.Companion.DEVICE_NOT_FIND import zs.qimai.com.printer2.utils.PrintManagerUtils.Companion.DEVICE_NOT_FIND
import java.io.IOException import java.io.IOException
import java.lang.Exception import java.lang.Exception
import java.util.* import java.util.*
import java.util.concurrent.Executors
class BlueDeviceManager(override var mType: Int = BT) : DeviceManager() { class BlueDeviceManager(override var mType: Int = BT) : DeviceManager() {
...@@ -299,6 +293,8 @@ class BlueDeviceManager(override var mType: Int = BT) : DeviceManager() { ...@@ -299,6 +293,8 @@ class BlueDeviceManager(override var mType: Int = BT) : DeviceManager() {
override fun writeData(bytes: ByteArray) { override fun writeData(bytes: ByteArray) {
try { try {
val printString = String(bytes)
printWriteNotify("指令大小: ${bytes.size} 指令内容: $printString socket状态: ${this.mBluetoothSocket?.isConnected} 线程:${Thread.currentThread().name}")
this.mOutPutStream?.write(bytes) this.mOutPutStream?.write(bytes)
this.mOutPutStream?.flush() this.mOutPutStream?.flush()
} catch (e: Exception) { } catch (e: Exception) {
......
...@@ -128,4 +128,16 @@ abstract class DeviceManager { ...@@ -128,4 +128,16 @@ abstract class DeviceManager {
DeviceManagerUtils.getInstance() DeviceManagerUtils.getInstance()
.notifyPrintStatusChangeCallBack(printDeviceStatus) .notifyPrintStatusChangeCallBack(printDeviceStatus)
} }
fun printWriteNotify(msg: String?) {
//回调通知
val printDeviceStatus = PrintDeviceStatus(
PrintDeviceStatus.PRINT_WRITE,
this, Log.getStackTraceString(Throwable()),
"msg: $msg"
)
DeviceManagerUtils.getInstance()
.notifyPrintStatusChangeCallBack(printDeviceStatus)
}
} }
\ No newline at end of file
...@@ -27,7 +27,7 @@ class DeviceManagerUtils { ...@@ -27,7 +27,7 @@ class DeviceManagerUtils {
//打印机状态监听 //打印机状态监听
private var mPrintStatusChangeCallBackList: CopyOnWriteArrayList<PrintStatusChangeCallBack> = private var mPrintStatusChangeCallBackList: CopyOnWriteArrayList<PrintStatusChangeCallBack> =
CopyOnWriteArrayList() CopyOnWriteArrayList()
var lists: CopyOnWriteArrayList<DeviceManager> = CopyOnWriteArrayList() var lists: CopyOnWriteArrayList<DeviceManager> = CopyOnWriteArrayList()
internal fun addDevice(deviceManager: DeviceManager?) { internal fun addDevice(deviceManager: DeviceManager?) {
deviceManager?.let { deviceManager?.let {
//避免重复添加 //避免重复添加
......
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