From aac7bcbcfee6c07cdcf6ac9a3f40e06c532daf4f Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Fri, 1 Mar 2024 17:28:22 +0800 Subject: [PATCH] =?UTF-8?q?desc:=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=95=85=E9=9A=9C=EF=BC=9A=20=20=20=20=20=201.=E4=BC=A0?= =?UTF-8?q?=E6=84=9F=E5=99=A8=E6=B0=94=E4=BD=93=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=95=85=E9=9A=9C=20=20=20=20=20=202.=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA=E6=95=85=E9=9A=9C?= =?UTF-8?q?=20=20=20=20=20=203.=E8=A7=86=E9=A2=91=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt | 4 ++-- .../com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt | 5 ++++- .../com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt index d3e5c97..71f7a15 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt @@ -141,8 +141,8 @@ class HistoryVideoActivity : BaseActivity() { ) launch(Dispatchers.Main) { var delayTime = mAdapter._data.size * 3000 - if (delayTime > 30) { - delayTime = 30 + if (delayTime > 30000) { + delayTime = 30000 } mBinding.root.postDelayed(delayTime.toLong()) { closeLoadingDialog() diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt index 6064a96..6b24c17 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt @@ -244,7 +244,10 @@ class QueryDataActivity : BaseActivity() { usbPath, mAdapter._data, ) - val delayTime: Int = (mAdapter._data.size / 10) * 35 + var delayTime: Int = (mAdapter._data.size / 10) * 35 + if (delayTime < 9000) { + delayTime = 9000 + } delay(delayTime.toLong()) closeLoadingDialog() launch(Dispatchers.Main) { diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt index c889d9b..cc161f3 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt @@ -136,7 +136,10 @@ class WarnDataActivity : BaseActivity() { usbPath, mAdapter._data, ) - val delayTime: Int = (mAdapter._data.size / 10) * 35 + var delayTime: Int = (mAdapter._data.size / 10) * 35 + if (delayTime < 9000) { + delayTime = 9000 + } delay(delayTime.toLong()) closeLoadingDialog() launch(Dispatchers.Main) {