merge code

app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt

@@ -111,12 +111,13 @@ class TaskUploadScope(
 
             val bodyList: MutableList<EvaluationInfo> = ArrayList()
 
-            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)
             }
+
+            taskBean.hadLinkDvoList.forEach { hadLinkDvoBean ->
+                val objects = realm.where(QsRecordBean::class.java)
+                    .equalTo("linkId", /*"84207223282277331"*/hadLinkDvoBean.linkPid).findAll()
                 if (objects != null&&objects.size>0) {
                     val copyList = realm.copyFromRealm(objects)
                     copyList.forEach {
@@ -142,6 +143,7 @@ class TaskUploadScope(
                 }
             }
 
+            if(bodyList.size>0){
                 val result = uploadManager.netApi.postRequest(bodyList)// .enqueue(object :
 //                        Callback<ResponseBody> {
                 if (result.isSuccessful) {
@@ -156,7 +158,9 @@ class TaskUploadScope(
                 } else {
                     change(FileUploadStatus.ERROR)
                 }
-
+            }else{
+                change(FileUploadStatus.NONE)
+            }
         } catch (e: Throwable) {
             change(FileUploadStatus.ERROR)
             Log.e("jingo", "数据上传出错 ${e.message}")

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 = "同步中"
+            }
         }
     }