From c7d0809662b67eebdf00b7cbd1611de1a741ea2f Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Mon, 18 Dec 2023 09:41:32 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E6=B0=94=E4=BD=93=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=B0=94=E4=BD=93=E6=98=B5=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yinuo/safetywatcher/watcher/ui/GasListActivity.kt     | 3 ++-
 .../yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt   | 4 ++--
 .../src/main/java/com/common/commonlib/utils/KtExtensions.kt  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/GasListActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/GasListActivity.kt
index a2a7df4..a07175c 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/GasListActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/GasListActivity.kt
@@ -2,6 +2,7 @@ package com.yinuo.safetywatcher.watcher.ui
 
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.common.commonlib.utils.getGasShowName
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivitySensorBinding
 import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
@@ -37,7 +38,7 @@ class GasListActivity : NoOptionsActivity() {
         val mapData = ChartBridge.getMapData()
         val list = arrayListOf<String>()
         mapData?.forEach { (t, u) ->
-            list.add(t)
+            list.add(t.getGasShowName())
         }
         mAdapter.setData(list)
     }
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt
index dd8e16c..28b84c5 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/SensorSettingActivity.kt
@@ -6,7 +6,7 @@ import android.view.View
 import androidx.lifecycle.lifecycleScope
 import com.common.commonlib.db.DBUtils
 import com.common.commonlib.utils.MMKVUtils
-import com.common.commonlib.utils.getGasNickName
+import com.common.commonlib.utils.getGasShowName
 import com.common.commonlib.utils.saveGasNickName
 import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivitySensorSettingBinding
@@ -90,7 +90,7 @@ class SensorSettingActivity : NoOptionsActivity() {
         lifecycleScope.launch(Dispatchers.IO) {
 //            val typeDao = DBUtils.gasTypeDao()
 //            val gasType = typeDao.getByName(gasName)
-            val gasNickName = getGasNickName(gasName)
+            val gasNickName = gasName.getGasShowName()
             val sensorNickName = getSensorNickName(gasName)
             val gasRange = ParseHelper.getGasRangeMax(gasName)
             launch(Dispatchers.Main) {
diff --git a/library-common/src/main/java/com/common/commonlib/utils/KtExtensions.kt b/library-common/src/main/java/com/common/commonlib/utils/KtExtensions.kt
index d537a19..ddf0f53 100644
--- a/library-common/src/main/java/com/common/commonlib/utils/KtExtensions.kt
+++ b/library-common/src/main/java/com/common/commonlib/utils/KtExtensions.kt
@@ -52,7 +52,7 @@ fun String.getGasShowName(): String {
     return getGasNickName(this)
 }
 
-fun getGasNickName(gasType: String): String {
+private fun getGasNickName(gasType: String): String {
     val string = MMKVUtils.getString("${gasType}_gas_nickname")
     if (!TextUtils.isEmpty(string)){
         return string!!