From 9f8349506ae9c8e085654a0885dd22468d4730b1 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Mon, 8 May 2023 11:11:12 +0800
Subject: [PATCH] merge code
---
.../omqs/http/taskupload/TaskUploadScope.kt | 30 +++++++++++--------
.../ui/fragment/tasklist/TaskListAdapter.kt | 3 ++
2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
index 32449353..dbcbb4de 100644
--- a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
+++ b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
@@ -111,12 +111,13 @@ class TaskUploadScope(
val bodyList: MutableList<EvaluationInfo> = ArrayList()
+ if (taskBean.syncStatus == FileUploadStatus.WAITING){
+ change(FileUploadStatus.UPLOADING)
+ }
+
taskBean.hadLinkDvoList.forEach { hadLinkDvoBean ->
val objects = realm.where(QsRecordBean::class.java)
.equalTo("linkId", /*"84207223282277331"*/hadLinkDvoBean.linkPid).findAll()
- if (taskBean.syncStatus == FileUploadStatus.WAITING){
- change(FileUploadStatus.UPLOADING)
- }
if (objects != null&&objects.size>0) {
val copyList = realm.copyFromRealm(objects)
copyList.forEach {
@@ -142,21 +143,24 @@ class TaskUploadScope(
}
}
- val result = uploadManager.netApi.postRequest(bodyList)// .enqueue(object :
+ if(bodyList.size>0){
+ val result = uploadManager.netApi.postRequest(bodyList)// .enqueue(object :
// Callback<ResponseBody> {
- if (result.isSuccessful) {
- if (result.code() == 200) {
- taskBean.syncStatus = FileUploadStatus.DONE
- // handle the response
- change(FileUploadStatus.DONE)
+ if (result.isSuccessful) {
+ if (result.code() == 200) {
+ taskBean.syncStatus = FileUploadStatus.DONE
+ // handle the response
+ change(FileUploadStatus.DONE)
+ } else {
+ // handle the failure
+ change(FileUploadStatus.ERROR)
+ }
} else {
- // handle the failure
change(FileUploadStatus.ERROR)
}
- } else {
- change(FileUploadStatus.ERROR)
+ }else{
+ change(FileUploadStatus.NONE)
}
-
} catch (e: Throwable) {
change(FileUploadStatus.ERROR)
Log.e("jingo", "数据上传出错 ${e.message}")
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 1d52bf00..b9f51fec 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
@@ -124,6 +124,9 @@ class TaskListAdapter(
FileUploadStatus.WAITING -> {
binding.taskUploadBtn.text = "等待同步"
}
+ FileUploadStatus.UPLOADING -> {
+ binding.taskUploadBtn.text = "同步中"
+ }
}
}