xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改离线地图下载，数据下载安装

Browse Source
This commit is contained in:
squallzhjch
2023-05-08 14:26:12 +08:00
parent 94ce90b680
commit 840bd24b7c
6 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/navinfo/omqs/ui/fragment/offlinemap/OfflineMapCityListAdapter.kt
View File

@@ -68,25 +68,34 @@ class OfflineMapCityListAdapter(
val cityBean = data[position]
//tag 方便onclick里拿到数据
holder.tag = cityBean.id
changeViews(binding, cityBean)
downloadManager.addTask(cityBean)
downloadManager.observer(cityBean.id, holder, DownloadObserver(cityBean.id, binding))
downloadManager.observer(cityBean.id, holder, DownloadObserver(cityBean.id, holder))
binding.offlineMapDownloadBtn.tag = position
binding.offlineMapDownloadBtn.setOnClickListener(downloadBtnClick)
binding.offlineMapCityName.text = cityBean.name
binding.offlineMapCitySize.text = cityBean.getFileSizeText()
}
inner class DownloadObserver(val id: String, val binding: AdapterOfflineMapCityBinding) :
inner class DownloadObserver(val id: String, val holder: BaseViewHolder) :
Observer<OfflineMapCityBean> {
override fun onChanged(t: OfflineMapCityBean?) {
if (id == t?.id)
changeViews(binding, t)
override fun onChanged(offlineMapCityBean: OfflineMapCityBean?) {
offlineMapCityBean?.let { bean ->
if (id == holder.tag) {
val binding: AdapterOfflineMapCityBinding =
holder.viewBinding as AdapterOfflineMapCityBinding
Log.e("jingo", "进度条更新 $id ${bean.id} ${holder.tag} ")
changeViews(binding, bean)
}
}
}
}
private fun changeViews(binding: AdapterOfflineMapCityBinding, cityBean: OfflineMapCityBean) {
Log.e("jingo", "changeViews ${cityBean.status}")
binding.offlineMapProgress.progress =
(cityBean.currentSize * 100 / cityBean.fileSize).toInt()
when (cityBean.status) {

2
app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt
View File

@@ -59,7 +59,7 @@ class TaskListAdapter(
val taskBean = data[it.tag as Int]
Log.e("jingo", "开始上传 ${taskBean.syncStatus}")
when (taskBean.syncStatus) {
FileUploadStatus.NONE, FileUploadStatus.ERROR -> {
FileUploadStatus.NONE, FileUploadStatus.ERROR,FileUploadStatus.WAITING -> {
uploadManager.start(taskBean.id)
}
}

6
app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt
View File

@@ -74,8 +74,6 @@ class TaskListViewModel @Inject constructor(
realm.copyToRealmOrUpdate(task)
}
}
val objects = realm.where(TaskBean::class.java).findAll()
taskList = realm.copyFromRealm(objects)
}
}
@@ -94,7 +92,9 @@ class TaskListViewModel @Inject constructor(
}
is NetResult.Loading -> {}
}
val realm = Realm.getDefaultInstance()
val objects = realm.where(TaskBean::class.java).findAll()
taskList = realm.copyFromRealm(objects)
for (item in taskList) {
FileManager.checkOMDBFileInfo(item)
}