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 6fec6aa7..67be46d0 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
@@ -125,10 +125,13 @@ class TaskUploadScope(
}
taskBean.hadLinkDvoList.forEach { hadLinkDvoBean ->
+ Log.e("jingo", "数据上传遍历开始")
val linkStatus = 1
//存在原因标记未测评
if (hadLinkDvoBean.reason.isNotEmpty()) {
+ Log.e("jingo", "数据上传遍历开始0${hadLinkDvoBean.linkPid}")
+
//未测评
val linkStatus = 0
@@ -160,6 +163,8 @@ class TaskUploadScope(
} else {
+ Log.e("jingo", "数据上传遍历开始1${hadLinkDvoBean.linkPid}")
+
val linkStatus = hadLinkDvoBean.linkStatus
var s: String = "%.3f".format(hadLinkDvoBean.length)//保留一位小数(且支持四舍五入)
@@ -221,8 +226,9 @@ class TaskUploadScope(
}
}
}
- realm.close()
+ Log.e("jingo", "数据上传遍历结束")
}
+ realm.close()
if (bodyList.size > 0) {
val result = uploadManager.netApi.postRequest(bodyList)// .enqueue(object :
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 5cde34aa..de898e70 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
@@ -505,7 +505,6 @@ class TaskViewModel @Inject constructor(
}
if(result==1){
withContext(Dispatchers.Main) {
- liveDataTaskUpload.postValue(map)
val mDialog = FirstDialog(context)
mDialog.setTitle("提示？")
mDialog.setMessage("此任务中存在新增Link无问题记录，请添加至少一条记录！")
@@ -519,7 +518,6 @@ class TaskViewModel @Inject constructor(
}
}else if(result==2){
withContext(Dispatchers.Main) {
- liveDataTaskUpload.postValue(map)
val mDialog = FirstDialog(context)
mDialog.setTitle("提示？")
mDialog.setMessage("此任务中存在未测评link，请确认！")
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 0a4613e4..b284ea50 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1639,15 +1639,19 @@
-
-
+
+
+
+
+
+
+
+
+
-
-
+
@@ -1667,11 +1671,7 @@
-
-
-
-
-
+
@@ -1690,19 +1690,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
diff --git a/collect-library/src/main/assets/omdb/icon_2013_0.svg b/collect-library/src/main/assets/omdb/icon_2013_0.svg
new file mode 100644
index 00000000..bcb9b125
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2013_0.svg
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2013_1.svg b/collect-library/src/main/assets/omdb/icon_2013_1.svg
new file mode 100644
index 00000000..bd3e6b1e
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2013_1.svg
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2013_2.svg b/collect-library/src/main/assets/omdb/icon_2013_2.svg
new file mode 100644
index 00000000..eeb06059
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2013_2.svg
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2013_6.svg b/collect-library/src/main/assets/omdb/icon_2013_6.svg
new file mode 100644
index 00000000..ad834913
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2013_6.svg
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2013_7.svg b/collect-library/src/main/assets/omdb/icon_2013_7.svg
new file mode 100644
index 00000000..4528138f
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2013_7.svg
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file