diff --git a/app/src/main/java/com/casic/electric/detector/view/MainActivity.kt b/app/src/main/java/com/casic/electric/detector/view/MainActivity.kt index d01e912..3882a9f 100644 --- a/app/src/main/java/com/casic/electric/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/electric/detector/view/MainActivity.kt @@ -51,7 +51,6 @@ import com.pengxh.kt.lite.widget.dialog.NoNetworkDialog import kotlinx.android.synthetic.main.activity_main.* import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.flow import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import java.io.File @@ -381,22 +380,19 @@ }) aMap.setOnMapLongClickListener { - //flow异步流显示默认数据 lifecycleScope.launch { - flow { - emit(DataBaseManager.get.loadLabels() as ArrayList) - }.collect { - labels = it - //显示标签 - showLabelsOnMap() + labels = withContext(Dispatchers.IO) { + DataBaseManager.get.loadLabels() as ArrayList } + //显示标签 + showLabelsOnMap() } - //虽然不用显示附属标签,但是需要喝标签做到数据同步,所以标签重新加载数据时候附属标签也需要重新加载 + //虽然不用显示附属标签,但是需要和标签做到数据同步,所以标签重新加载数据时候附属标签也需要重新加载 lifecycleScope.launch { - flow { - emit(DataBaseManager.get.loadSmallLabels() as ArrayList) - }.collect { smallLabels = it } + smallLabels = withContext(Dispatchers.IO) { + DataBaseManager.get.loadSmallLabels() as ArrayList + } } } } @@ -632,22 +628,19 @@ override fun onResume() { super.onResume() mapView.onResume() - //flow异步流显示默认数据 lifecycleScope.launch { - flow { - emit(DataBaseManager.get.loadLabels() as ArrayList) - }.collect { - labels = it - //显示标签 - showLabelsOnMap() + labels = withContext(Dispatchers.IO) { + DataBaseManager.get.loadLabels() as ArrayList } + //显示标签 + showLabelsOnMap() } //虽然不用显示附属标签,但是需要喝标签做到数据同步,所以标签重新加载数据时候附属标签也需要重新加载 lifecycleScope.launch { - flow { - emit(DataBaseManager.get.loadSmallLabels() as ArrayList) - }.collect { smallLabels = it } + smallLabels = withContext(Dispatchers.IO) { + DataBaseManager.get.loadSmallLabels() as ArrayList + } } }