Commit c0cb7b48 authored by tongzifang's avatar tongzifang

fix AclasScaleKit

parent 0ded4341
...@@ -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 {
......
...@@ -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() {
......
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