Commit ddb71c75 authored by fanghaitong's avatar fanghaitong

fix

parent fd5c0dfd
package com.qimai.android.widget package com.qimai.android.widget
import android.content.Context
import android.content.SharedPreferences import android.content.SharedPreferences
import android.graphics.Color import android.graphics.Color
import android.os.Bundle import android.os.Bundle
...@@ -12,6 +13,7 @@ import androidx.lifecycle.ViewModel ...@@ -12,6 +13,7 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.qmai.zqtoolkit.ZqScaleKit import com.qmai.zqtoolkit.ZqScaleKit
import com.qmai.zqtoolkit.ZqWeightX
import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
...@@ -41,15 +43,20 @@ class ZqToolActivity : AppCompatActivity() { ...@@ -41,15 +43,20 @@ class ZqToolActivity : AppCompatActivity() {
private var m_bConnected = false private var m_bConnected = false
private var m_bThreadAutoReadExit = true private var m_bThreadAutoReadExit = true
private val zqScaleVm by lazy { // private val ZqScaleKit.instance by lazy {
ViewModelProvider(this).get(ZqScaleKit::class.java) // ViewModelProvider(this).get(ZqScaleKit::class.java)
// }
private val mv by lazy {
ViewModelProvider(this).get(ZqWeightX::class.java)
} }
private var mContext:Context? = null
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_zqtool) setContentView(R.layout.activity_zqtool)
// //
mContext = this
// //
// //
...@@ -129,7 +136,7 @@ class ZqToolActivity : AppCompatActivity() { ...@@ -129,7 +136,7 @@ class ZqToolActivity : AppCompatActivity() {
lifecycleScope.launch { lifecycleScope.launch {
zqScaleVm.connectState.collect { ZqScaleKit.instance.connectState.collect {
if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) { if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
m_bConnected = it.isConnect m_bConnected = it.isConnect
if (m_bConnected) { if (m_bConnected) {
...@@ -138,10 +145,9 @@ class ZqToolActivity : AppCompatActivity() { ...@@ -138,10 +145,9 @@ class ZqToolActivity : AppCompatActivity() {
Log.d(TAG, it.toString()) Log.d(TAG, it.toString())
} }
} }
}
}
lifecycleScope.launch { lifecycleScope.launch {
zqScaleVm.livingWeight.collect { ZqScaleKit.instance.livingWeight.collect {
if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) { if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
Log.d(TAG, it.toString()) Log.d(TAG, it.toString())
if (it.isStable) { if (it.isStable) {
...@@ -161,11 +167,11 @@ class ZqToolActivity : AppCompatActivity() { ...@@ -161,11 +167,11 @@ class ZqToolActivity : AppCompatActivity() {
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
zqScaleVm.stopReadData() ZqScaleKit.instance.stopReadData()
m_bThreadAutoReadExit = true m_bThreadAutoReadExit = true
if (m_bConnected) { if (m_bConnected) {
m_bConnected = false m_bConnected = false
zqScaleVm.disconnect() ZqScaleKit.instance.disconnect()
butConnect!!.text = "连接" butConnect!!.text = "连接"
} }
} }
...@@ -176,7 +182,7 @@ class ZqToolActivity : AppCompatActivity() { ...@@ -176,7 +182,7 @@ class ZqToolActivity : AppCompatActivity() {
when (v.id) { when (v.id) {
R.id.ButConnect -> { R.id.ButConnect -> {
if (!m_bConnected) { if (!m_bConnected) {
zqScaleVm.connect(v.context) ZqScaleKit.instance.connect(v.context)
// Thread { // Thread {
// if (zqeb.EB_Connect( // if (zqeb.EB_Connect(
// String.format( // String.format(
...@@ -193,24 +199,24 @@ class ZqToolActivity : AppCompatActivity() { ...@@ -193,24 +199,24 @@ class ZqToolActivity : AppCompatActivity() {
// }.start() // }.start()
} else { } else {
m_bThreadAutoReadExit = true m_bThreadAutoReadExit = true
zqScaleVm.disconnect() ZqScaleKit.instance.disconnect()
m_bConnected = false m_bConnected = false
butConnect!!.text = "连接" butConnect!!.text = "连接"
} }
} }
R.id.ButSetZero -> { R.id.ButSetZero -> {
if (m_bConnected) { if (m_bConnected) {
zqScaleVm.setZero() ZqScaleKit.instance.setZero()
} }
} }
R.id.ButNetweight -> { R.id.ButNetweight -> {
if (m_bConnected) { if (m_bConnected) {
zqScaleVm.setNetWeight() ZqScaleKit.instance.setNetWeight()
} }
} }
R.id.ButClearTare -> { R.id.ButClearTare -> {
if (m_bConnected) { if (m_bConnected) {
zqScaleVm.clearTare() ZqScaleKit.instance.clearTare()
} }
} }
R.id.ButSetTare -> { R.id.ButSetTare -> {
...@@ -220,12 +226,12 @@ class ZqToolActivity : AppCompatActivity() { ...@@ -220,12 +226,12 @@ class ZqToolActivity : AppCompatActivity() {
} }
R.id.ButAutoRead -> { R.id.ButAutoRead -> {
if (m_bConnected) { if (m_bConnected) {
zqScaleVm.readData() ZqScaleKit.instance.readData()
} }
} }
R.id.ButAutoStopRead -> { R.id.ButAutoStopRead -> {
if (m_bConnected) { if (m_bConnected) {
zqScaleVm.stopReadData() ZqScaleKit.instance.stopReadData()
} }
// val strText = butAutoRead!!.text.toString() // val strText = butAutoRead!!.text.toString()
// if (strText == "开始读数") { // if (strText == "开始读数") {
......
...@@ -30,7 +30,7 @@ android { ...@@ -30,7 +30,7 @@ android {
} }
} }
group 'com.qmai.android.zqtoolkit' group 'com.qmai.android.zqtoolkit'
version '1.0.2.1' version '1.0.4'
gradlePublish { gradlePublish {
......
...@@ -13,7 +13,14 @@ import kotlinx.coroutines.flow.* ...@@ -13,7 +13,14 @@ import kotlinx.coroutines.flow.*
* date : 2022/2/10 14:18 * date : 2022/2/10 14:18
* description : * description :
*/ */
class ZqScaleKit : ViewModel() { class ZqScaleKit private constructor() {
companion object {
val instance = Helper.instance
}
private object Helper {
val instance = ZqScaleKit()
}
private val zqeb by lazy { private val zqeb by lazy {
zqebsdk() zqebsdk()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment