From 63df01f7999a13e5c586c14d75ed5d074ec27513 Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Fri, 1 Mar 2024 17:11:07 +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 --- .../com/yinuo/safetywatcher/watcher/App.kt | 8 +++--- .../watcher/ui/HistoryVideoActivity.kt | 12 ++++++--- .../watcher/ui/QueryDataActivity.kt | 7 ++++-- .../watcher/ui/WarnDataActivity.kt | 5 +++- .../watcher/utils/ExportUtils.kt | 25 +++++++++++-------- 5 files changed, 37 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt index 2304921..2a1cdbb 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt @@ -1,5 +1,6 @@ package com.yinuo.safetywatcher.watcher +import android.util.Log import com.common.commonlib.CommonApplication import com.common.commonlib.db.DBUtils import com.common.commonlib.db.entity.Warning @@ -47,18 +48,19 @@ class App : CommonApplication() { } } - // 修复视频数据 + /*// 修复视频数据 val videoAsync = async(Dispatchers.IO) { val videoDao = DBUtils.videoDao() val videoList = videoDao.getAll() videoList.onEach { video -> if (!File(video.path).exists()) { + Log.d("cyy", "删除视频: ${video.path}") videoDao.delete(video) } } - } + }*/ warningAsync.await() - videoAsync.await() +// videoAsync.await() } } 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 ce8913e..d3e5c97 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 @@ -3,6 +3,7 @@ package com.yinuo.safetywatcher.watcher.ui import android.content.Intent import android.view.View import androidx.activity.result.contract.ActivityResultContracts +import androidx.core.view.postDelayed import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import com.common.commonlib.db.DBUtils @@ -135,13 +136,18 @@ class HistoryVideoActivity : BaseActivity() { showLoadingDialog(R.string.export_data_tip) GlobalScope.launch(Dispatchers.IO) { ExportUtils.testCopyVideo( - this@HistoryVideoActivity, usbPath, mAdapter._data, - loadingDialog ) launch(Dispatchers.Main) { - showToast(getString(R.string.export_success)) + var delayTime = mAdapter._data.size * 3000 + if (delayTime > 30) { + delayTime = 30 + } + mBinding.root.postDelayed(delayTime.toLong()) { + closeLoadingDialog() + showToast(getString(R.string.export_success)) + } } } } 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 6743d87..6064a96 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 @@ -26,6 +26,7 @@ import com.yinuo.safetywatcher.watcher.utils.DateUtils import com.yinuo.safetywatcher.watcher.utils.ExportUtils import com.yinuo.safetywatcher.watcher.utils.showToast import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay import kotlinx.coroutines.launch class QueryDataActivity : BaseActivity() { @@ -72,7 +73,7 @@ class QueryDataActivity : BaseActivity() { private var startTime = -1L private var endTime = -1L private var timeStep = TimeStep.SECOND_30 - private val mAdapter = HistoryDataAdapter{ + private val mAdapter = HistoryDataAdapter { tryFocusBackArea() } @@ -242,8 +243,10 @@ class QueryDataActivity : BaseActivity() { this@QueryDataActivity, usbPath, mAdapter._data, - loadingDialog ) + val delayTime: Int = (mAdapter._data.size / 10) * 35 + delay(delayTime.toLong()) + closeLoadingDialog() launch(Dispatchers.Main) { val showTxt = if (TextUtils.isEmpty(exportGasExcelPath)) "气体数据导出失败！" else getString(R.string.export_success) 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 8a68820..c889d9b 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 @@ -18,6 +18,7 @@ import com.yinuo.safetywatcher.watcher.utils.DateUtils import com.yinuo.safetywatcher.watcher.utils.ExportUtils import com.yinuo.safetywatcher.watcher.utils.showToast import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay import kotlinx.coroutines.launch class WarnDataActivity : BaseActivity() { @@ -134,8 +135,10 @@ class WarnDataActivity : BaseActivity() { this@WarnDataActivity, usbPath, mAdapter._data, - loadingDialog ) + val delayTime: Int = (mAdapter._data.size / 10) * 35 + delay(delayTime.toLong()) + closeLoadingDialog() launch(Dispatchers.Main) { val showTxt = if (TextUtils.isEmpty(exportWarnExcelPath)) "告警数据导出失败！" else getString(R.string.export_success) diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/ExportUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/ExportUtils.kt index d02bcbe..dfbd159 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/ExportUtils.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/ExportUtils.kt @@ -18,7 +18,6 @@ object ExportUtils { context: Context, usbPath: String, datas: MutableList, - commonDialog: CommonDialog? ): String? { val allData = mutableListOf>() datas.forEach { @@ -31,7 +30,6 @@ object ExportUtils { } LogUtils.w("testExportExcel ori data size = ${datas.size}, cell data size = ${allData.size}") val excelPath = ExcelUtils.writeStringListToExcel(allData, usbPath, context) - commonDialog?.dismiss() return excelPath } @@ -40,7 +38,6 @@ object ExportUtils { context: Context, usbPath: String, datas: MutableList, - loadingDialog: CommonDialog? ): String? { val allData = mutableListOf>() datas.forEach { @@ -53,15 +50,12 @@ object ExportUtils { } LogUtils.w("testExportWarnExcel ori data size = ${datas.size}, cell data size = ${allData.size}") val excelPath = ExcelUtils.writeStringListToExcel(allData, usbPath, context, true) - loadingDialog?.dismiss() return excelPath } fun testCopyVideo( - context: Context, usbPath: String, datas: MutableList