1.1.4 商米预处理串口

zqtoolkit/build.gradle

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

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

@@ -6,9 +6,7 @@ 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.QmScaleBrand
-import com.qmai.zqtoolkit.config.ScaleAppType
-import com.qmai.zqtoolkit.config.SunmiPort
+import com.qmai.zqtoolkit.config.*
 import com.qmai.zqtoolkit.utils.ScaleChecker
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -55,7 +53,7 @@ object ScaleHub : ScaleBaseAction {
     private fun tryInitSDK2C() {
         scaleKit = when {
             ScaleChecker.isZQ() -> ZqScaleKit
-            ScaleChecker.isSUNMI() -> SunmiScaleKit
+            ScaleChecker.isSUNMI_S2CC() -> SunmiScaleKit
             ScaleChecker.isAclas() -> AclasScaleKit
             else -> ZqScaleKit
         }
@@ -69,7 +67,7 @@ object ScaleHub : ScaleBaseAction {
     ) {
         if (scaleKit == null) {
             scaleKit = when {
-                ScaleChecker.isSUNMI() -> SunmiScaleKit
+                ScaleChecker.isSUNMI_S2CC() -> SunmiScaleKit
                 ScaleChecker.isAclas() -> AclasScaleKit
                 else -> when (scale.brand?.brand) {
                     QmScaleBrand.ZQEB.brand -> ZqScaleKit
@@ -83,8 +81,8 @@ object ScaleHub : ScaleBaseAction {
 
     override fun connect(cxt: Context?, scale: ScaleInfo) {
         when (scale.appType) {
-            ScaleAppType.SHOP_ASSITANT_2C -> tryInitSDK2C()
-            ScaleAppType.SHOP_ASSITANT_2B -> tryInitSDK(scale)
+            SHOP_ASSITANT_2C -> tryInitSDK2C()
+            SHOP_ASSITANT_2B -> tryInitSDK(scale)
         }
         //称只给连一个端口，其他端口用其他hub
         if (isScaleSuccess()) {
@@ -96,7 +94,7 @@ object ScaleHub : ScaleBaseAction {
             }
             //商米机器外接三方称 预处理串口
             scale.run {
-                port = if (scale.appType == ScaleAppType.SHOP_ASSITANT_2B && ScaleChecker.isSUNMI())
+                port = if (scale.appType == SHOP_ASSITANT_2B && ScaleChecker.isSUNMI())
                     SunmiPort.find()
                 else "ttyS4"
                 buad = "9600"

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

@@ -2,7 +2,7 @@ package com.qmai.zqtoolkit
 
 import com.qmai.zqtoolkit.config.QmScaleBrandValue
 import com.qmai.zqtoolkit.config.QmScaleModelValue
-import com.qmai.zqtoolkit.config.ScaleAppType
+import com.qmai.zqtoolkit.config.SHOP_ASSITANT_2C
 
 /**
  * tongzi
@@ -14,5 +14,5 @@ data class ScaleInfo(
     var brand: QmScaleBrandValue? = null,
     var model: QmScaleModelValue? = null,
     var connectType: Int?,
-    var appType: ScaleAppType? = ScaleAppType.SHOP_ASSITANT_2C
+    var appType: Int? = SHOP_ASSITANT_2C
 )
\ No newline at end of file

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

@@ -5,6 +5,10 @@ package com.qmai.zqtoolkit.config
  * 2022/9/6
  */
 
-enum class ScaleAppType {
-    SHOP_ASSITANT_2C, SHOP_ASSITANT_2B;
-}
+
+
+//门店2c版本
+const val SHOP_ASSITANT_2C= 1
+
+//门店2b版本
+const val SHOP_ASSITANT_2B= 2
\ No newline at end of file

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

@@ -16,13 +16,19 @@ import com.qmai.zqtoolkit.config.*
  */
 object ScaleChecker {
 
+
     /**
      * 商米电子秤
      * manufacturer ： SUNMI
      */
     fun isSUNMI() = DeviceUtils.getManufacturer().lowercase().contains("sunmi")
 
-
+    /**
+     * 商米电子秤
+     * manufacturer ： SUNMI
+     */
+    fun isSUNMI_S2CC() = DeviceUtils.getManufacturer().lowercase().contains("sunmi") &&
+            DeviceUtils.getModel().lowercase().contains("s2_cc")
 
 
     /**