diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt index 1d1736b8..037b2e97 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt @@ -283,10 +283,13 @@ class LoginViewModel @Inject constructor( task.status = item.status task.currentSize = item.currentSize task.hadLinkDvoList = item.hadLinkDvoList + task.syncStatus = item.syncStatus //已上传后不在更新操作时间 if (task.syncStatus != FileManager.Companion.FileUploadStatus.DONE) { //赋值时间,用于查询过滤 task.operationTime = DateTimeUtil.getNowDate().time + }else{ + continue } } else { for (hadLink in task.hadLinkDvoList) { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt index 5a8e1e91..e94c23c8 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt @@ -227,6 +227,7 @@ class TaskListAdapter( binding.taskUploadBtn.isEnabled = false binding.taskUploadBtn.setProgress(0) binding.taskUploadBtn.setBackgroundColor(binding.root.resources.getColor(R.color.gray_121)) + Log.e("qj","${taskBean.id}===changeUploadTxtViews===已上传") } FileUploadStatus.ERROR -> { @@ -241,6 +242,7 @@ class TaskListAdapter( FileUploadStatus.NONE -> { binding.taskUploadBtn.setText("未上传") binding.taskUploadBtn.setProgress(0) + Log.e("qj","${taskBean.id}===changeUploadTxtViews===未上传") } FileUploadStatus.WAITING -> { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt index 8160f065..358f63c7 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt @@ -179,10 +179,13 @@ class TaskViewModel @Inject constructor( task.status = item.status task.currentSize = item.currentSize task.hadLinkDvoList = item.hadLinkDvoList + task.syncStatus = item.syncStatus //已上传后不在更新操作时间 if (task.syncStatus != FileManager.Companion.FileUploadStatus.DONE) { //赋值时间,用于查询过滤 task.operationTime = DateTimeUtil.getNowDate().time + }else{//已上传数据不做更新 + continue } } else { for (hadLink in task.hadLinkDvoList) { diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml index 863bb5fd..c86b5c0b 100644 --- a/app/src/main/res/menu/personal_center_menu.xml +++ b/app/src/main/res/menu/personal_center_menu.xml @@ -59,7 +59,7 @@ + android:title="版本:23QE4_V1.5.6_20230928_A" /> diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 6f995238..47974f40 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2020,7 +2020,7 @@ - +