1.0.8

增加app默认版本判断 ,2B默认无称

zqtoolkit/build.gradle

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

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

@@ -58,21 +58,21 @@ object ScaleHub : ScaleBaseAction {
     /**
      * fix-20220707  中崎称类型多，通过DeviceUtils.getModel()判断不准确，现改为默认中崎
      */
-    private fun tryInit(): Boolean {
+    private fun tryInit(appType: Int? = 0): Boolean {
         if (scaleKit == null) {
             scaleKit = when {
                 ScaleChecker.isZQ() -> ZqScaleKit
                 ScaleChecker.isSUNMI() -> SunmiScaleKit
                 ScaleChecker.isAclas() -> AclasScaleKit
-                else -> ZqScaleKit
+                else -> if (appType == null || appType == 0) null else ZqScaleKit
             }
         }
         return scaleKit == null
     }
 
-    override fun connect(cxt: Context?, port: String?, buad: String?) {
+    override fun connect(cxt: Context?, port: String?, buad: String?, appType: Int?) {
         // var trueCxt = cxt?.applicationContext
-        if (tryInit()) {
+        if (tryInit(appType)) {
             return
         }
         //称只给连一个端口，其他端口用其他hub
@@ -92,6 +92,7 @@ object ScaleHub : ScaleBaseAction {
     }
 
 
+
     private suspend fun collectConnectData() {
         scaleKit?.connectState?.collect {
             _connectState.emit(it)

zqtoolkit/src/main/java/com/qmai/zqtoolkit/base/AclasScaleKit.kt

@@ -57,14 +57,13 @@ object AclasScaleKit : ScaleBaseKit() {
 
     }
 
-    override fun connect(cxt: Context?, port: String?, buad: String?) {
-        super.connect(cxt, port, buad)
+    override fun connect(cxt: Context?, port: String?, buad: String?, appType: Int?) {
+        super.connect(cxt, port, buad, appType)
         if (aclasScaler == null) {
             cxt?.let {
                 aclasScaler = AclasScaler(AclasScaler.Type_USB, it, aclasScalerListener)
             }
         }
-
         //
         val usbConnectIndex = getAclasScaleIndex()
         //val usbConnectIndex = 0
@@ -144,7 +143,7 @@ object AclasScaleKit : ScaleBaseKit() {
             var comList = mutableListOf<String>()
             aclasScaler?.getCommList(comList)
             if (!comList.isNullOrEmpty()) {
-                usbIndex = comList.indexOfFirst { name -> name.contains(aclasPname)}
+                usbIndex = comList.indexOfFirst { name -> name.contains(aclasPname) }
                 return usbIndex
             }
         }

zqtoolkit/src/main/java/com/qmai/zqtoolkit/base/SunmiScaleKit.kt

@@ -32,9 +32,9 @@ object SunmiScaleKit : ScaleBaseKit() {
     override fun connect(
         cxt: Context?,
         port: String?,
-        buad: String?
+        buad: String?, appType: Int?
     ) {
-        super.connect(cxt, port, buad)
+        super.connect(cxt, port, buad, appType)
         cxt?.let {
             mScaleManager = ScaleManager.getInstance(it)
             mScaleManager?.connectService(object : ScaleServiceConnection {

zqtoolkit/src/main/java/com/qmai/zqtoolkit/base/ZqScaleKit.kt

@@ -26,8 +26,8 @@ object ZqScaleKit : ScaleBaseKit() {
     override val SCALE_TYPE: QmScaleType
         get() = QmScaleType.ZQEB
 
-    override fun connect(cxt: Context?, port: String?, buad: String?) {
-        super.connect(cxt, port, buad)
+    override fun connect(cxt: Context?, port: String?, buad: String?, appType: Int?) {
+        super.connect(cxt, port, buad,appType)
         val ebConnect =
             zqeb.EB_Connect(String.format("%s:%s", port ?: "ttyS4", buad ?: "9600"), cxt)
         val msg: String = when (ebConnect) {

zqtoolkit/src/main/java/com/qmai/zqtoolkit/base/scale/ScaleBaseAction.kt

@@ -10,11 +10,14 @@ import com.qmai.zqtoolkit.ScaleInfo
  */
 interface ScaleBaseAction {
     //电子秤连接
+    //appType 0是2B版本
     fun connect(
         cxt: Context? = null,
         port: String? = null,
-        buad: String? = null
+        buad: String? = null,
+        appType: Int? = 0
     )
+
     //电子秤断开连接
     fun disconnect()
 
@@ -31,7 +34,7 @@ interface ScaleBaseAction {
     fun setNetWeight()
 
     //电子秤数字去皮
-    fun setNetWeightByElec(tare:Double)
+    fun setNetWeightByElec(tare: Double)
 
     //电子秤清除去皮
     fun clearTare()

zqtoolkit/src/main/java/com/qmai/zqtoolkit/base/scale/ScaleBaseKit.kt

@@ -35,7 +35,8 @@ abstract class ScaleBaseKit : ScaleBaseAction, ScaleUpdateAction {
 
     private var stableWeight = mutableListOf<String>()
 
-    override fun connect(cxt: Context?, port: String?, buad: String?) {
+
+    override fun connect(cxt: Context?, port: String?, buad: String?, appType: Int?) {
         lastTryScale = ScaleInfo(port, buad, SCALE_TYPE)
     }