增加称类型保存

zqtoolkit/build.gradle

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

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

 package com.qmai.zqtoolkit
 
-import com.qmai.zqtoolkit.config.QmScaleType
-
 /**
  *  author : tongzi
  *  date : 2022/2/15 14:00
@@ -9,6 +7,5 @@ import com.qmai.zqtoolkit.config.QmScaleType
  */
 data class ConnectState(
     val isConnect: Boolean,
-    val msg: String,
-    var qmScaleType: QmScaleType? = null
+    val msg: String
 )

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

@@ -93,8 +93,6 @@ object ScaleHub : ScaleBaseAction {
 
     private suspend fun collectConnectData() {
         scaleKit?.connectState?.collect {
-            //在这里补充电子秤类型
-            it.qmScaleType = scaleKit?.SCALE_TYPE
             _connectState.emit(it)
         }
     }
@@ -162,6 +160,10 @@ object ScaleHub : ScaleBaseAction {
         }
     }
 
+    override fun getLastScale(): ScaleInfo? {
+        return scaleKit?.getLastScale()
+    }
+
     override fun stopReadData() {
         scaleKit?.stopReadData()
         LEDHub.clearLED()

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

+package com.qmai.zqtoolkit
+
+import com.qmai.zqtoolkit.config.QmScaleType
+
+/**
+ * tongzi
+ * 2022/6/6
+ */
+data class ScaleInfo(
+    var port: String?,
+    var buad: String?,
+    var qmScaleType: QmScaleType
+)
\ No newline at end of file

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

@@ -7,6 +7,7 @@ import com.example.scaler.AclasScaler
 import com.example.scaler.AclasScaler.AclasScalerListener
 import com.qmai.zqtoolkit.ConnectState
 import com.qmai.zqtoolkit.LivingWeight
+import com.qmai.zqtoolkit.ScaleInfo
 import com.qmai.zqtoolkit.base.scale.ScaleBaseKit
 import com.qmai.zqtoolkit.config.QmScaleType
 
@@ -18,7 +19,7 @@ object AclasScaleKit : ScaleBaseKit() {
     override val TAG: String
         get() = "AclasScaleKit"
     override val SCALE_TYPE: QmScaleType
-        get() =  QmScaleType.ACLAS
+        get() = QmScaleType.ACLAS
     private var aclasScaler: AclasScaler? = null
     private var aclasScalerListener = object : AclasScalerListener {
         override fun onDisConnected() {
@@ -31,7 +32,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 ?: "", ""),
@@ -51,13 +52,20 @@ object AclasScaleKit : ScaleBaseKit() {
     }
 
     override fun connect(cxt: Context?, port: String?, buad: String?) {
+        super.connect(cxt, port, buad)
         if (aclasScaler == null) {
             cxt?.let {
                 aclasScaler = AclasScaler(AclasScaler.Type_SerialPort, it, aclasScalerListener)
             }
         }
+        var truePost = if (port?.contains("USER") == true) port else "ttyUSER0"
+        lastTryScale?.port = truePost
         val aclasConnect =
-            aclasScaler?.AclasConnect("/dev/" + (port ?: "ttyUSER0"), buad?.toInt() ?: 9600, 0)
+            aclasScaler?.AclasConnect(
+                "/dev/$truePost",
+                buad?.toInt() ?: 9600,
+                0
+            )
         Log.v(TAG, "aclasConnect:$aclasConnect")
     }
 

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

@@ -33,6 +33,7 @@ object SunmiScaleKit : ScaleBaseKit() {
         port: String?,
         buad: String?
     ) {
+        super.connect(cxt, port, buad)
         cxt?.let {
             mScaleManager = ScaleManager.getInstance(it)
             mScaleManager?.connectService(object : ScaleServiceConnection {

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

@@ -26,6 +26,7 @@ object ZqScaleKit : ScaleBaseKit() {
         get() = QmScaleType.ZQEB
     private var stableWeight = mutableListOf<String>()
     override fun connect(cxt: Context?, port: String?, buad: String?) {
+        super.connect(cxt, port, buad)
         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

 package com.qmai.zqtoolkit.base.scale
 
 import android.content.Context
+import com.qmai.zqtoolkit.ScaleInfo
 
 /**
  * tongzi
@@ -40,4 +41,6 @@ interface ScaleBaseAction {
 
     //是否可用
     fun isScaleSuccess(): Boolean
+
+    fun getLastScale(): ScaleInfo?
 }
\ No newline at end of file

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

 package com.qmai.zqtoolkit.base.scale
 
+import android.content.Context
 import com.qmai.zqtoolkit.ConnectState
 import com.qmai.zqtoolkit.LivingWeight
+import com.qmai.zqtoolkit.ScaleHub
+import com.qmai.zqtoolkit.ScaleInfo
 import com.qmai.zqtoolkit.base.scale.ScaleBaseAction
 import com.qmai.zqtoolkit.base.scale.ScaleUpdateAction
 import com.qmai.zqtoolkit.config.QmScaleType
@@ -19,6 +22,8 @@ abstract class ScaleBaseKit : ScaleBaseAction, ScaleUpdateAction {
 
     abstract val TAG: String
     abstract val SCALE_TYPE: QmScaleType
+    var lastTryScale: ScaleInfo? = null
+    private var lastConnectScale: ScaleInfo? = null
 
     val _connectState = MutableSharedFlow<ConnectState>(replay = 1)
     val connectState: SharedFlow<ConnectState> = _connectState
@@ -27,11 +32,20 @@ abstract class ScaleBaseKit : ScaleBaseAction, ScaleUpdateAction {
     val livingWeight: SharedFlow<LivingWeight> = _livingWeight
 
 
+    override fun connect(cxt: Context?, port: String?, buad: String?) {
+        lastTryScale = ScaleInfo(port, buad, SCALE_TYPE)
+    }
+
     override fun disconnect() {
         stopReadData()
-        updateState(ConnectState(false,"断开连接"))
+        updateState(ConnectState(false, "断开连接"))
     }
+
     override fun updateState(state: ConnectState) {
+        //保存连接成功的配置
+        if (state.isConnect) {
+            lastConnectScale = lastTryScale
+        } else lastTryScale = null
         GlobalScope.launch(context = Dispatchers.IO) {
             _connectState.emit(state)
         }
@@ -45,6 +59,10 @@ abstract class ScaleBaseKit : ScaleBaseAction, ScaleUpdateAction {
     }
 
 
+    override fun getLastScale(): ScaleInfo? {
+        return lastConnectScale
+    }
+
     override fun isScaleSuccess(): Boolean {
         return !_connectState.replayCache.isNullOrEmpty() && _connectState.replayCache.last().isConnect
     }