增加顶尖称判断

zqtoolkit/build.gradle

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

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

 package com.qmai.zqtoolkit
 
 import android.content.Context
-import android.os.Build
+import android.hardware.usb.UsbManager
 import android.util.Log
-import com.blankj.utilcode.util.DeviceUtils
 import com.blankj.utilcode.util.GsonUtils
 import com.blankj.utilcode.util.ToastUtils
+import com.blankj.utilcode.util.Utils
 import com.qmai.zqtoolkit.base.AclasScaleKit
 import com.qmai.zqtoolkit.base.SunmiScaleKit
 import com.qmai.zqtoolkit.base.ZqScaleKit
 import com.qmai.zqtoolkit.base.scale.ScaleBaseAction
 import com.qmai.zqtoolkit.base.scale.ScaleBaseKit
+import com.qmai.zqtoolkit.config.ACLAS_PRODUCTID
+import com.qmai.zqtoolkit.config.ACLAS_VENDORID
 import com.qmai.zqtoolkit.config.QmScaleType
 import com.qmai.zqtoolkit.utils.ScaleChecker
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
 import kotlin.coroutines.EmptyCoroutineContext
 
 /**
@@ -62,7 +67,8 @@ object ScaleHub : ScaleBaseAction {
             scaleKit = when {
                 ScaleChecker.isZQ() -> ZqScaleKit
                 ScaleChecker.isSUNMI() -> SunmiScaleKit
-                else -> AclasScaleKit
+                ScaleChecker.isAclas() -> AclasScaleKit
+                else -> scaleKit
             }
         }
         return scaleKit == null

zqtoolkit/src/main/java/com/qmai/zqtoolkit/config/AclasConstant.kt

+package com.qmai.zqtoolkit.config
+
+/**
+ * tongzi
+ * 2022/5/30
+ */
+
+//产品识别码
+const val ACLAS_PRODUCTID= 29987
+
+//供应商ID
+const val ACLAS_VENDORID= 6790
\ No newline at end of file

zqtoolkit/src/main/java/com/qmai/zqtoolkit/utils/ScaleChecker.kt

 package com.qmai.zqtoolkit.utils
 
 
+import android.content.Context
+import android.hardware.usb.UsbManager
+import android.util.Log
 import com.blankj.utilcode.util.DeviceUtils
+import com.blankj.utilcode.util.GsonUtils
+import com.blankj.utilcode.util.Utils
+import com.qmai.zqtoolkit.ScaleHub
+import com.qmai.zqtoolkit.config.ACLAS_PRODUCTID
+import com.qmai.zqtoolkit.config.ACLAS_VENDORID
 
 
 /**
@@ -28,6 +36,16 @@ object ScaleChecker {
 
 
     /**
-     * 顶尖不是直接连接，无法判断
+     * 顶尖不是直接连接，通过 产品识别码 供应商ID
      */
+
+    fun isAclas(): Boolean {
+        var usbManager = Utils.getApp().getSystemService(Context.USB_SERVICE) as UsbManager?
+        usbManager?.deviceList?.forEach {
+            if (it.value.productId == ACLAS_PRODUCTID && it.value.vendorId == ACLAS_VENDORID) {
+                return true
+            }
+        }
+        return false
+    }
 }
\ No newline at end of file