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
c0cb7b48
Commit
c0cb7b48
authored
May 19, 2023
by
tongzifang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix AclasScaleKit
parent
0ded4341
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
build.gradle
zqtoolkit/build.gradle
+1
-1
AclasScaleKit.kt
...it/src/main/java/com/qmai/zqtoolkit/base/AclasScaleKit.kt
+9
-1
No files found.
zqtoolkit/build.gradle
View file @
c0cb7b48
...
@@ -30,7 +30,7 @@ android {
...
@@ -30,7 +30,7 @@ android {
}
}
}
}
group
'com.qmai.android.zqtoolkit'
group
'com.qmai.android.zqtoolkit'
version
'1.
2.9
'
version
'1.
3.0
'
gradlePublish
{
gradlePublish
{
...
...
zqtoolkit/src/main/java/com/qmai/zqtoolkit/base/AclasScaleKit.kt
View file @
c0cb7b48
...
@@ -4,6 +4,7 @@ import android.content.Context
...
@@ -4,6 +4,7 @@ import android.content.Context
import
android.util.Log
import
android.util.Log
import
com.blankj.utilcode.util.GsonUtils
import
com.blankj.utilcode.util.GsonUtils
import
com.blankj.utilcode.util.TimeUtils
import
com.blankj.utilcode.util.TimeUtils
import
com.blankj.utilcode.util.Utils
import
com.example.scaler.AclasScaler
import
com.example.scaler.AclasScaler
import
com.example.scaler.AclasScaler.AclasScalerListener
import
com.example.scaler.AclasScaler.AclasScalerListener
import
com.qmai.zqtoolkit.ConnectState
import
com.qmai.zqtoolkit.ConnectState
...
@@ -14,6 +15,7 @@ import com.qmai.zqtoolkit.config.QmScaleBrand
...
@@ -14,6 +15,7 @@ import com.qmai.zqtoolkit.config.QmScaleBrand
import
com.qmai.zqtoolkit.utils.ScaleChecker
import
com.qmai.zqtoolkit.utils.ScaleChecker
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.delay
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
/**
/**
...
@@ -30,6 +32,7 @@ object AclasScaleKit : ScaleBaseKit() {
...
@@ -30,6 +32,7 @@ object AclasScaleKit : ScaleBaseKit() {
override
val
SCALE_TYPE
:
QmScaleBrand
override
val
SCALE_TYPE
:
QmScaleBrand
get
()
=
QmScaleBrand
.
ACLAS
get
()
=
QmScaleBrand
.
ACLAS
private
var
aclasScaler
:
AclasScaler
?
=
null
private
var
aclasScaler
:
AclasScaler
?
=
null
private
var
reConnectCount
=
1
private
var
aclasScalerListener
=
object
:
AclasScalerListener
{
private
var
aclasScalerListener
=
object
:
AclasScalerListener
{
override
fun
onDisConnected
()
{
override
fun
onDisConnected
()
{
updateScaleInfo
(
"$TAG :onDisConnected "
+
TimeUtils
.
getNowString
())
updateScaleInfo
(
"$TAG :onDisConnected "
+
TimeUtils
.
getNowString
())
...
@@ -54,6 +57,11 @@ object AclasScaleKit : ScaleBaseKit() {
...
@@ -54,6 +57,11 @@ object AclasScaleKit : ScaleBaseKit() {
override
fun
onError
(
p0
:
Int
,
p1
:
String
?)
{
override
fun
onError
(
p0
:
Int
,
p1
:
String
?)
{
updateScaleInfo
(
"$TAG :onError "
+
TimeUtils
.
getNowString
()
+
" data: p0"
+
p0
+
" p1"
+
p1
)
updateScaleInfo
(
"$TAG :onError "
+
TimeUtils
.
getNowString
()
+
" data: p0"
+
p0
+
" p1"
+
p1
)
if
(
p0
==
-
2
&&
reConnectCount
>
0
)
{
reConnectCount
=
0
disconnect
()
lastTryScale
?.
let
{
connect
(
Utils
.
getApp
(),
it
)
}
}
}
}
override
fun
onUpdateProcess
(
p0
:
Int
,
p1
:
Int
)
{
override
fun
onUpdateProcess
(
p0
:
Int
,
p1
:
Int
)
{
...
@@ -75,7 +83,7 @@ object AclasScaleKit : ScaleBaseKit() {
...
@@ -75,7 +83,7 @@ object AclasScaleKit : ScaleBaseKit() {
val
usbConnectIndex
=
getAclasScaleIndex
()
val
usbConnectIndex
=
getAclasScaleIndex
()
//val usbConnectIndex = 0
//val usbConnectIndex = 0
val
aclasConnect
=
aclasScaler
?.
AclasConnect
(
usbConnectIndex
)
val
aclasConnect
=
aclasScaler
?.
AclasConnect
(
usbConnectIndex
)
Log
.
v
(
TAG
,
"aclasConnect:$aclasConnect"
)
updateScaleInfo
(
"$TAG :aclasConnect $aclasConnect "
+
TimeUtils
.
getNowString
()
)
}
}
override
fun
disconnect
()
{
override
fun
disconnect
()
{
...
...
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