From d6d781495e06b53300e6dfc52b4e82fdfc870c42 Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Wed, 22 Nov 2023 10:37:18 +0800 Subject: [PATCH] =?UTF-8?q?desc:=E6=99=9A=E4=B8=8A=E4=BC=A0=E6=84=9F?= =?UTF-8?q?=E5=99=A8=E6=95=B0=E6=8D=AE=E4=B8=8A=E4=BC=A0=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8F=82=E6=95=B0=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yinuo/safetywatcher/watcher/port/GasCache.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasCache.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasCache.kt index 2bffe25..1942c46 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasCache.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasCache.kt @@ -10,7 +10,7 @@ import kotlinx.coroutines.launch @OptIn(DelicateCoroutinesApi::class) object GasCache { private val statusCache = HashMap() - private val nicknameCache = HashMap() + private val nicknameCache = HashMap() init { GlobalScope.launch(Dispatchers.IO) { @@ -18,21 +18,21 @@ object GasCache { val all = typeDao.getAll() val context = CommonApplication.getContext() all.forEach { - setNickname(it.type, it.nickName ?: "") + setNickname(it.type, it.nickName ?: "${it.type}传感器") setStatus(it.type, getShowStatus(context, it.status)) } } } fun getNickname(gas: String): String { - return nicknameCache[gas] ?: "" + return nicknameCache[gas] ?: "${gas}传感器" } fun getStatus(gas: String): String { return statusCache[gas] ?: "" } - fun setNickname(gas: String, nickname: String) { + fun setNickname(gas: String, nickname: String?) { nicknameCache[gas] = nickname }