Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
Widget
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Android Widget
Widget
Commits
913e9a2b
Commit
913e9a2b
authored
Feb 23, 2022
by
fanghaitong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加reply
parent
416cdaa4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
17 deletions
+18
-17
ZqToolActivity.kt
app/src/main/java/com/qimai/android/widget/ZqToolActivity.kt
+6
-6
ZqScaleKit.kt
zqtoolkit/src/main/java/com/qmai/zqtoolkit/ZqScaleKit.kt
+12
-11
No files found.
app/src/main/java/com/qimai/android/widget/ZqToolActivity.kt
View file @
913e9a2b
...
...
@@ -164,12 +164,12 @@ class ZqToolActivity : AppCompatActivity() {
override
fun
onPause
()
{
super
.
onPause
()
ZqScaleKit
.
instance
.
stopReadData
()
//
m_bThreadAutoReadExit = true
//
if (m_bConnected) {
//
m_bConnected = false
//
ZqScaleKit.instance.disconnect()
//
butConnect!!.text = "连接"
//
}
m_bThreadAutoReadExit
=
true
if
(
m_bConnected
)
{
m_bConnected
=
false
ZqScaleKit
.
instance
.
disconnect
()
butConnect
!!
.
text
=
"连接"
}
}
private
val
MyClickListener
=
...
...
zqtoolkit/src/main/java/com/qmai/zqtoolkit/ZqScaleKit.kt
View file @
913e9a2b
...
...
@@ -27,10 +27,7 @@ class ZqScaleKit private constructor() {
zqebsdk
()
}
private
var
stableWeight
=
mutableListOf
<
String
>()
private
val
_connectState
=
MutableSharedFlow
<
ConnectState
>(
replay
=
1
,
extraBufferCapacity
=
0
,
onBufferOverflow
=
BufferOverflow
.
SUSPEND
)
private
val
_connectState
=
MutableSharedFlow
<
ConnectState
>(
replay
=
1
)
val
connectState
:
SharedFlow
<
ConnectState
>
=
_connectState
private
val
_livingWeight
=
MutableSharedFlow
<
LivingWeight
>()
val
livingWeight
:
SharedFlow
<
LivingWeight
>
=
_livingWeight
...
...
@@ -64,24 +61,28 @@ class ZqScaleKit private constructor() {
fun
disconnect
()
{
// stopReadData()
zqeb
.
EB_Disconnect
()
val
ebDisconnect
=
zqeb
.
EB_Disconnect
()
Log
.
v
(
"ZqScaleKit"
,
String
.
format
(
"ebDisconnect: %s"
,
ebDisconnect
))
}
fun
setZero
()
{
if
(
_connectState
.
replayCache
.
isNullOrEmpty
()
&&
_connectState
.
replayCache
.
last
().
isConnect
)
{
zqeb
.
EB_SetZero
()
if
(!
_connectState
.
replayCache
.
isNullOrEmpty
()
&&
_connectState
.
replayCache
.
last
().
isConnect
)
{
val
ebSetzero
=
zqeb
.
EB_SetZero
()
Log
.
v
(
"ZqScaleKit"
,
String
.
format
(
"ebSetzero: %s"
,
ebSetzero
))
}
}
fun
setNetWeight
()
{
if
(
_connectState
.
replayCache
.
isNullOrEmpty
()
&&
_connectState
.
replayCache
.
last
().
isConnect
)
{
zqeb
.
EB_SetNetWeight
()
if
(!
_connectState
.
replayCache
.
isNullOrEmpty
()
&&
_connectState
.
replayCache
.
last
().
isConnect
)
{
val
ebSetnetweight
=
zqeb
.
EB_SetNetWeight
()
Log
.
v
(
"ZqScaleKit"
,
String
.
format
(
"ebSetnetweight: %s"
,
ebSetnetweight
))
}
}
fun
clearTare
()
{
if
(
_connectState
.
replayCache
.
isNullOrEmpty
()
&&
_connectState
.
replayCache
.
last
().
isConnect
)
{
zqeb
.
EB_ClearTare
()
if
(!
_connectState
.
replayCache
.
isNullOrEmpty
()
&&
_connectState
.
replayCache
.
last
().
isConnect
)
{
val
ebCleartare
=
zqeb
.
EB_ClearTare
()
Log
.
v
(
"ZqScaleKit"
,
String
.
format
(
"ebCleartare: %s"
,
ebCleartare
))
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment