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

merge code

Browse Source
This commit is contained in:
qiji4215
2023-10-09 14:18:31 +08:00
parent 0fce93ecc9
commit 92ae4af99e
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
View File

@@ -283,10 +283,13 @@ class LoginViewModel @Inject constructor(
task.status = item.status task.status = item.status
task.currentSize = item.currentSize task.currentSize = item.currentSize
task.hadLinkDvoList = item.hadLinkDvoList task.hadLinkDvoList = item.hadLinkDvoList
task.syncStatus = item.syncStatus
//已上传后不在更新操作时间 //已上传后不在更新操作时间
if (task.syncStatus != FileManager.Companion.FileUploadStatus.DONE) { if (task.syncStatus != FileManager.Companion.FileUploadStatus.DONE) {
//赋值时间，用于查询过滤 //赋值时间，用于查询过滤
task.operationTime = DateTimeUtil.getNowDate().time task.operationTime = DateTimeUtil.getNowDate().time
}else{
continue
} }
} else { } else {
for (hadLink in task.hadLinkDvoList) { for (hadLink in task.hadLinkDvoList) {

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

@@ -220,6 +220,7 @@ class TaskListAdapter(
binding.taskUploadBtn.isEnabled = false binding.taskUploadBtn.isEnabled = false
binding.taskUploadBtn.setProgress(0) binding.taskUploadBtn.setProgress(0)
binding.taskUploadBtn.setBackgroundColor(binding.root.resources.getColor(R.color.gray_121)) binding.taskUploadBtn.setBackgroundColor(binding.root.resources.getColor(R.color.gray_121))
Log.e("qj","${taskBean.id}===changeUploadTxtViews===已上传")
} }
FileUploadStatus.ERROR -> { FileUploadStatus.ERROR -> {
@@ -234,6 +235,7 @@ class TaskListAdapter(
FileUploadStatus.NONE -> { FileUploadStatus.NONE -> {
binding.taskUploadBtn.setText("未上传") binding.taskUploadBtn.setText("未上传")
binding.taskUploadBtn.setProgress(0) binding.taskUploadBtn.setProgress(0)
Log.e("qj","${taskBean.id}===changeUploadTxtViews===未上传")
} }
FileUploadStatus.WAITING -> { FileUploadStatus.WAITING -> {

3
app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
View File

@@ -200,10 +200,13 @@ class TaskViewModel @Inject constructor(
task.status = item.status task.status = item.status
task.currentSize = item.currentSize task.currentSize = item.currentSize
task.hadLinkDvoList = item.hadLinkDvoList task.hadLinkDvoList = item.hadLinkDvoList
task.syncStatus = item.syncStatus
//已上传后不在更新操作时间 //已上传后不在更新操作时间
if (task.syncStatus != FileManager.Companion.FileUploadStatus.DONE) { if (task.syncStatus != FileManager.Companion.FileUploadStatus.DONE) {
//赋值时间，用于查询过滤 //赋值时间，用于查询过滤
task.operationTime = DateTimeUtil.getNowDate().time task.operationTime = DateTimeUtil.getNowDate().time
}else{//已上传数据不做更新
continue
} }
} else { } else {
for (hadLink in task.hadLinkDvoList) { for (hadLink in task.hadLinkDvoList) {