desc:气体列表显示气体昵称

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)
     }

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) {

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!!