From 3135311b8c82482c1eacd25b7a06aaa92f95d4c4 Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Thu, 7 Sep 2023 10:29:27 +0800 Subject: [PATCH] =?UTF-8?q?desc:crash=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yinuo/safetywatcher/watcher/ui/ChartActivity.kt | 5 +++-- .../src/main/java/com/yinuo/library/vlc/TxtOverlay.kt | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChartActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChartActivity.kt index 68cfe4c..b2214ca 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChartActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/ChartActivity.kt @@ -114,8 +114,9 @@ class ChartActivity : NoOptionsActivity() { granularity = 1f; // 设置X轴坐标之间的最小间隔 valueFormatter = object : IndexAxisValueFormatter() { override fun getFormattedValue(value: Float): String { - if (value < (mGases?.size ?: 0)) { - val baseTime = mGases?.get(value.toInt())?.time + val index = value.toInt(); + if (index >= 0 && index < (mGases?.size ?: 0)) { + val baseTime = mGases?.get(index)?.time return dataFormat.format(baseTime) } return "" diff --git a/library-vlc/src/main/java/com/yinuo/library/vlc/TxtOverlay.kt b/library-vlc/src/main/java/com/yinuo/library/vlc/TxtOverlay.kt index 8abbedd..e1ae621 100644 --- a/library-vlc/src/main/java/com/yinuo/library/vlc/TxtOverlay.kt +++ b/library-vlc/src/main/java/com/yinuo/library/vlc/TxtOverlay.kt @@ -45,8 +45,8 @@ object TxtOverlay { // 记录更新时间和上一次的文字 lastTipUpdateTime = currentTimeMillis mLastShowTip = mToDoShowTip - // 回收内存 - bmp?.recycle() +// // 回收内存 +// bmp?.recycle() // 文字转bitmap bmp = YUVUtils.generateBitmap( dateFormat.format(lastTipUpdateTime) + "@" + mToDoShowTip, 40, Color.WHITE