Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
Widget
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Android Widget
Widget
Commits
a74d216d
Commit
a74d216d
authored
Dec 16, 2021
by
王雷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改蓝牙打印机连接方式
parent
2f8ae2e8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
9 deletions
+25
-9
build.gradle
printer/build.gradle
+1
-1
PrintDeviceStatus.kt
.../src/main/java/zs/qimai/com/printer2/PrintDeviceStatus.kt
+9
-1
BlueDeviceManager.kt
...n/java/zs/qimai/com/printer2/manager/BlueDeviceManager.kt
+2
-6
DeviceManager.kt
.../main/java/zs/qimai/com/printer2/manager/DeviceManager.kt
+12
-0
DeviceManagerUtils.kt
.../java/zs/qimai/com/printer2/manager/DeviceManagerUtils.kt
+1
-1
No files found.
printer/build.gradle
View file @
a74d216d
...
@@ -51,7 +51,7 @@ repositories {
...
@@ -51,7 +51,7 @@ repositories {
}
}
group
'com.qmai.android.print'
group
'com.qmai.android.print'
version
'1.1.7
1
-SNAPSHOT'
version
'1.1.7
5
-SNAPSHOT'
gradlePublish
{
gradlePublish
{
...
...
printer/src/main/java/zs/qimai/com/printer2/PrintDeviceStatus.kt
View file @
a74d216d
...
@@ -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
printer/src/main/java/zs/qimai/com/printer2/manager/BlueDeviceManager.kt
View file @
a74d216d
...
@@ -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
)
{
...
...
printer/src/main/java/zs/qimai/com/printer2/manager/DeviceManager.kt
View file @
a74d216d
...
@@ -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
printer/src/main/java/zs/qimai/com/printer2/manager/DeviceManagerUtils.kt
View file @
a74d216d
...
@@ -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
{
//避免重复添加
//避免重复添加
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment