From 4b91feca229167da36d93e741b297ad747c22742 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Mon, 25 Sep 2023 14:37:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A6=E9=81=93=E8=BE=B9?= =?UTF-8?q?=E7=95=8C=E7=B1=BB=E5=9E=8B=E5=AE=9E=E7=BA=BF=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F2.=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=B8=8A=E4=BC=A0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../omqs/http/taskupload/TaskUploadScope.kt | 8 ++- .../ui/fragment/tasklist/TaskViewModel.kt | 2 - .../src/main/assets/editormarker.xml | 71 +++++++++++++------ .../src/main/assets/omdb/icon_2013_0.svg | 11 +++ .../src/main/assets/omdb/icon_2013_1.svg | 11 +++ .../src/main/assets/omdb/icon_2013_2.svg | 11 +++ .../src/main/assets/omdb/icon_2013_6.svg | 11 +++ .../src/main/assets/omdb/icon_2013_7.svg | 11 +++ 8 files changed, 113 insertions(+), 23 deletions(-) create mode 100644 collect-library/src/main/assets/omdb/icon_2013_0.svg create mode 100644 collect-library/src/main/assets/omdb/icon_2013_1.svg create mode 100644 collect-library/src/main/assets/omdb/icon_2013_2.svg create mode 100644 collect-library/src/main/assets/omdb/icon_2013_6.svg create mode 100644 collect-library/src/main/assets/omdb/icon_2013_7.svg 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