1.1.1

app/src/main/java/com/qimai/android/widget/ZqToolActivity.kt

@@ -190,12 +190,12 @@ class ZqToolActivity : AppCompatActivity() {
                         tvState?.text = "稳定"
                         tvState?.setBackgroundColor(Color.GREEN)
                         tvLivingWeight?.text =
-                            "实时重量" + it.weight +" 单位" + it.unit + "time:" + System.currentTimeMillis()
+                            "实时重量" + it.weight + " 单位" + it.unit + "time:" + System.currentTimeMillis()
                     } else {
                         tvState?.setBackgroundColor(Color.RED)
                         tvState?.text = "不稳定"
                         tvLivingWeight?.text =
-                            "实时重量" + it.weight +" 单位" + it.unit+ "time:" + System.currentTimeMillis()
+                            "实时重量" + it.weight + " 单位" + it.unit + "time:" + System.currentTimeMillis()
                     }
                 }
             }
@@ -219,7 +219,7 @@ class ZqToolActivity : AppCompatActivity() {
             when (v.id) {
                 R.id.ButConnect -> {
                     if (!m_bConnected) {
-//                        ScaleHub.connect(this, ScaleInfo(1, ScaleAppType.SHOP_ASSITANT_2C))
+                        ScaleHub.connect(this, ScaleInfo(appType = ScaleAppType.SHOP_ASSITANT_2C))
 //                        Thread {
 //                            if (zqeb.EB_Connect(
 //                                    String.format(
@@ -269,13 +269,13 @@ class ZqToolActivity : AppCompatActivity() {
                     }
                 }
                 R.id.rb_zq -> {
-                    ScaleHub.initScale(QmScaleBrand.ZQEB)
+                   // ScaleHub.initScale(QmScaleBrand.ZQEB)
                 }
                 R.id.rb_sunmi -> {
-                    ScaleHub.initScale(QmScaleBrand.SUNMI)
+                    //ScaleHub.initScale(QmScaleBrand.SUNMI)
                 }
                 R.id.rb_dj -> {
-                    ScaleHub.initScale(QmScaleBrand.ACLAS)
+                    //ScaleHub.initScale(QmScaleBrand.ACLAS)
                 }
                 R.id.ButSend -> {
                     if (m_bConnected) {

zqtoolkit/build.gradle

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

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

@@ -41,18 +41,13 @@ object ScaleHub : ScaleBaseAction {
 //    }
 
 
-    fun initScale(qmScaleBrand: QmScaleBrand) {
+    fun manualInitSDK(scale: ScaleInfo) {
         disconnect()
-        scaleKit = when (qmScaleBrand) {
-            QmScaleBrand.SUNMI -> {
-                SunmiScaleKit
-            }
-            QmScaleBrand.ZQEB -> {
-                ZqScaleKit
-            }
-            QmScaleBrand.ACLAS -> {
-                AclasScaleKit
-            }
+        scaleKit = when (scale.brand?.brand) {
+            QmScaleBrand.ZQEB.brand -> ZqScaleKit
+            QmScaleBrand.SUNMI.brand -> SunmiScaleKit
+            QmScaleBrand.ACLAS.brand -> AclasScaleKit
+            else -> null
         }
     }
 

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

@@ -5,7 +5,6 @@ package com.qmai.zqtoolkit.config
  * 2022/9/6
  */
 
-enum class ScaleAppType(
-) {
+enum class ScaleAppType {
     SHOP_ASSITANT_2C, SHOP_ASSITANT_2B;
 }