fix

zqtoolkit/build.gradle

@@ -30,7 +30,7 @@ android {
     }
 }
 group 'com.qmai.android.zqtoolkit'
-version '1.2.6.2'
+version '1.2.8'
 
 gradlePublish {
 

zqtoolkit/src/main/java/com/qmai/zqtoolkit/ScaleHub.kt

@@ -33,13 +33,6 @@ object ScaleHub : ScaleBaseAction {
     private var connectJob: CoroutineScope? = null
     private var weightJob: CoroutineScope? = null
     private var scaleKit: ScaleBaseKit? = null
-//    private val scaleKit by lazy {
-//        when {
-//            ScaleChecker.isZQ() -> ZqScaleKit
-//            ScaleChecker.isSUNMI() -> SunmiScaleKit
-//            else -> AclasScaleKit
-//        }
-//    }
 
 
     fun manualInitSDK(scale: ScaleInfo) {
@@ -64,32 +57,30 @@ object ScaleHub : ScaleBaseAction {
     /**
      * fix-20220707  中崎称类型多，通过DeviceUtils.getModel()判断不准确，现改为默认中崎
      */
-    private fun tryInitSDK(
+    private fun tryInitSDK2B(
         scale: ScaleInfo
     ) {
-        if (scaleKit == null) {
-            scaleKit = when {
+        scaleKit = when (scale.brand?.brand) {
+            QmScaleBrand.ZQEB.brand -> ZqScaleKit
+            QmScaleBrand.SUNMI.brand -> SunmiScaleKit
+            QmScaleBrand.ACLAS.brand -> AclasScaleKit
+            else -> when {
                 ScaleChecker.isSUNMI_S2CC() -> SunmiScaleKit
                 ScaleChecker.isAclas() -> AclasScaleKit
-                else -> when (scale.brand?.brand) {
-                    QmScaleBrand.ZQEB.brand -> ZqScaleKit
-                    QmScaleBrand.SUNMI.brand -> SunmiScaleKit
-                    QmScaleBrand.ACLAS.brand -> AclasScaleKit
-                    else -> null
-                }
-            }
-            //通过tryInitSDK连接的,如果没有指定brand和model,赋一个默认的,若连接成功会被保存
-            if (scaleKit != null && (scale.brand == null || scale.model == null)) {
-                scale.brand = QmScaleBrand.find(scaleKit)
-                scale.model = QmScaleModel.find(scaleKit)
+                else -> null
             }
         }
+        //通过tryInitSDK连接的,如果没有指定brand和model,赋一个默认的,若连接成功会被保存
+        if (scaleKit != null && (scale.brand == null || scale.model == null)) {
+            scale.brand = QmScaleBrand.find(scaleKit)
+            scale.model = QmScaleModel.find(scaleKit)
+        }
     }
 
     override fun connect(cxt: Context?, scale: ScaleInfo) {
         when (scale.appType) {
             SHOP_ASSITANT_2C -> tryInitSDK2C()
-            SHOP_ASSITANT_2B -> tryInitSDK(scale)
+            SHOP_ASSITANT_2B -> tryInitSDK2B(scale)
         }
         scaleKit?.run {
             if (connectJob == null) {
@@ -107,9 +98,11 @@ object ScaleHub : ScaleBaseAction {
             collectScaleInfo()
         }
         connectJob?.launch(context = Dispatchers.IO) {
-            scaleKit?.connect(cxt, scale)
             collectConnectData()
         }
+        connectJob?.launch(context = Dispatchers.IO) {
+            scaleKit?.connect(cxt, scale)
+        }
     }