desc:气体数据和告警数据界面，体验微调

app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseRvAdapter.kt

@@ -27,6 +27,11 @@ abstract class BaseRvAdapter<T, B : ViewBinding, VH : BaseRvAdapter.BaseViewHold
         holder.bindView(mDatas[position])
     }
 
+    fun clear(){
+        mDatas.clear()
+        notifyDataSetChanged()
+    }
+
 
     abstract class BaseViewHolder<T, B : ViewBinding>(binding: B) : ViewHolder(binding.root) {
         abstract fun bindView(data: T)

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/QueryDataActivity.kt

@@ -80,6 +80,7 @@ class QueryDataActivity : BaseActivity() {
                     endTime = getLongExtra(ChooseParamsActivity.END_TIME, endTime)
                     timeStep = getIntExtra(ChooseParamsActivity.TIME_STEP, timeStep)
                     initDefaultParamsUi()
+                    mAdapter.clear()
                     queryData()
                 }
             }
@@ -127,6 +128,7 @@ class QueryDataActivity : BaseActivity() {
     }
 
     private fun queryData() {
+        showLoadingDialog(R.string.loading, false)
         lifecycleScope.launch {
             // 根据步长，多个数据合一。间隔时长
             val intervalMs = when (timeStep) {
@@ -207,6 +209,7 @@ class QueryDataActivity : BaseActivity() {
             }
             launch(Dispatchers.Main) {
                 mAdapter.setData(newList)
+                closeLoadingDialog()
             }
         }
     }

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt

@@ -60,6 +60,7 @@ class WarnDataActivity : BaseActivity() {
                     startTime = getLongExtra(ChooseParamsActivity.START_TIME, startTime)
                     endTime = getLongExtra(ChooseParamsActivity.END_TIME, endTime)
                     initDefaultParamsUi()
+                    mAdapter.clear()
                     queryData()
                 }
             }
@@ -99,6 +100,7 @@ class WarnDataActivity : BaseActivity() {
     }
 
     private fun queryData() {
+        showLoadingDialog(R.string.loading, false)
         lifecycleScope.launch {
             val warningDao = DBUtils.warningDao()
             val warnings = warningDao.findAllByTime(startTime, endTime)
@@ -112,6 +114,7 @@ class WarnDataActivity : BaseActivity() {
                     }
                 }
                 mAdapter.setData(sortList)
+                closeLoadingDialog()
             }
         }
     }

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/adapter/WarnDataAdapter.kt

@@ -14,7 +14,7 @@ class WarnDataAdapter :
         BaseRvAdapter.BaseViewHolder<Warning, LayoutItemWarnBinding>(binding) {
         override fun bindView(data: Warning) {
             binding.tvTime.text = formatTime(data.startTime)
-            binding.tvSensor.text = data.gasName
+            binding.tvSensor.text = "${data.gasName}浓度异常，${data.gasValue} ${data.unit}"
         }
 
         private fun formatTime(time: Long): CharSequence? {

app/src/main/res/values/strings.xml

@@ -70,4 +70,5 @@
     <string name="unit_ppm">ppm</string>
     <string name="unit_mg_m3">mg/m3</string>
     <string name="unit_vol">%VOL</string>
+    <string name="loading">加载中…</string>
 </resources>