增加称筛选

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

@@ -45,6 +45,9 @@ class ZqToolActivity : AppCompatActivity() {
     private var ButSend: Button? = null
     private var etdata: EditText? = null
     private var ButConnectLED: Button? = null
+    private var rb_zq: RadioButton? = null
+    private var rb_sunmi: RadioButton? = null
+    private var rb_dj: RadioButton? = null
 
     private lateinit var sp: SharedPreferences;
 
@@ -91,6 +94,14 @@ class ZqToolActivity : AppCompatActivity() {
         ButConnectLED!!.setOnClickListener(MyClickListener)
         ButSend!!.setOnClickListener(MyClickListener)
         //
+
+        rb_zq = findViewById<View>(R.id.rb_zq) as RadioButton
+        rb_sunmi = findViewById<View>(R.id.rb_sunmi) as RadioButton
+        rb_dj = findViewById<View>(R.id.rb_dj) as RadioButton
+
+        rb_zq!!.setOnClickListener(MyClickListener)
+        rb_sunmi!!.setOnClickListener(MyClickListener)
+        rb_dj!!.setOnClickListener(MyClickListener)
         sp = getSharedPreferences("com.example.zqebsdksample_preferences", MODE_PRIVATE)
         //
         val ListPort: MutableList<String> = ArrayList()
@@ -244,6 +255,15 @@ class ZqToolActivity : AppCompatActivity() {
                         ScaleHub.readData()
                     }
                 }
+                R.id.rb_zq -> {
+                    ScaleHub.initScale(QmScaleType.ZQEB)
+                }
+                R.id.rb_sunmi -> {
+                    ScaleHub.initScale(QmScaleType.SUNMI)
+                }
+                R.id.rb_dj -> {
+                    ScaleHub.initScale(QmScaleType.ACLAS)
+                }
                 R.id.ButSend -> {
                     if (m_bConnected) {
 //                        val text: String = etdata?.text.toString().trim()

app/src/main/res/layout/activity_zqtool.xml

@@ -205,6 +205,37 @@
                     android:text="发送指令"
                     android:textSize="32dp"/>
             </TableRow>
+            <TableRow>
+                <RadioGroup
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+                    <RadioButton
+                        android:id="@+id/rb_zq"
+                        android:onClick="onClick"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:text="中崎"/>
+                    <RadioButton
+                        android:id="@+id/rb_sunmi"
+                        android:onClick="onClick"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:text="商米"/>
+                    <RadioButton
+                        android:id="@+id/rb_dj"
+                        android:onClick="onClick"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:text="顶尖"/>
+
+                </RadioGroup>
+
+            </TableRow>
 
         </TableLayout>
 

zqtoolkit/build.gradle

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

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

@@ -58,10 +58,12 @@ object ScaleHub : ScaleBaseAction {
     }
 
     private fun tryInit(): Boolean {
-        scaleKit = when {
-            ScaleChecker.isZQ() -> ZqScaleKit
-            ScaleChecker.isSUNMI() -> SunmiScaleKit
-            else -> AclasScaleKit
+        if (scaleKit == null) {
+            scaleKit = when {
+                ScaleChecker.isZQ() -> ZqScaleKit
+                ScaleChecker.isSUNMI() -> SunmiScaleKit
+                else -> AclasScaleKit
+            }
         }
         return scaleKit == null
     }

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

@@ -28,7 +28,7 @@ object AclasScaleKit : ScaleBaseKit() {
 
         override fun onRcvData(weght: AclasScaler.WeightInfoNew?) {
             Log.v(TAG, GsonUtils.toJson(weght))
-            getTare()
+          //  getTare()
             updateWeight(
                 LivingWeight(
                     weght?.isStable ?: false, weght.toString().replace(weght?.unit ?: "", ""),