From f6b4c7543a3e3573a265929df5fab1fc0dfc9636 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Wed, 28 Jun 2023 11:13:03 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=8F=8F=E8=BF=B02=E3=80=81=E4=BF=AE=E6=94=B9=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E9=80=82=E9=85=8D=E8=BE=83=E4=BD=8E=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/omqs/bean/EvaluationInfo.kt | 4 +- .../omqs/http/taskupload/TaskUploadScope.kt | 4 +- .../ui/fragment/tasklist/TaskViewModel.kt | 89 ++++++++++--------- .../res/layout/fragment_evaluation_result.xml | 2 +- .../library/data/entity/QsRecordBean.kt | 1 + 5 files changed, 53 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/bean/EvaluationInfo.kt b/app/src/main/java/com/navinfo/omqs/bean/EvaluationInfo.kt index 7f257d6e..b1418d1d 100644 --- a/app/src/main/java/com/navinfo/omqs/bean/EvaluationInfo.kt +++ b/app/src/main/java/com/navinfo/omqs/bean/EvaluationInfo.kt @@ -38,8 +38,8 @@ data class EvaluationInfo( @SerializedName("problemLink") val problemLink: String = "",//问题环节 - @SerializedName("problemReason") - val problemReason: String = "",//问题原因 + @SerializedName("preliminaryAnalysis") + val preliminaryAnalysis: String = "",//初步分析 @SerializedName("evaluatorName") val evaluatorName: String = "",//测评人名称 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 e7534861..33686595 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 @@ -151,7 +151,7 @@ class TaskUploadScope( problemPhenomenon = it.phenomenon, problemDesc = it.description, problemLink = it.problemLink, - problemReason = it.cause, + preliminaryAnalysis = it.cause, evaluatorName = it.checkUserId, evaluationDate = it.checkTime, evaluationWay = evaluationWay, @@ -178,7 +178,7 @@ class TaskUploadScope( problemPhenomenon = "", problemDesc = "", problemLink = "", - problemReason = "", + preliminaryAnalysis = "", evaluatorName = "", evaluationDate = "", evaluationWay = 2, 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 3bf42632..e3c4e290 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 @@ -4,6 +4,7 @@ import android.content.Context import android.graphics.Color import android.os.Build import android.widget.Toast +import androidx.annotation.RequiresApi import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -95,18 +96,21 @@ class TaskViewModel @Inject constructor( } } } + is NetResult.Error<*> -> { withContext(Dispatchers.Main) { Toast.makeText(context, "${result.exception.message}", Toast.LENGTH_SHORT) .show() } } + is NetResult.Failure<*> -> { withContext(Dispatchers.Main) { Toast.makeText(context, "${result.code}:${result.msg}", Toast.LENGTH_SHORT) .show() } } + is NetResult.Loading -> {} } val realm = Realm.getDefaultInstance() @@ -139,41 +143,42 @@ class TaskViewModel @Inject constructor( /** * 设置当前选择的任务，并高亮当前任务的所有link */ + @RequiresApi(Build.VERSION_CODES.M) fun setSelectTaskBean(taskBean: TaskBean) { currentSelectTaskBean = taskBean + liveDataTaskLinks.value = taskBean.hadLinkDvoList - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - mapController.lineHandler.omdbTaskLinkLayer.removeAll() - if(taskBean.hadLinkDvoList.isNotEmpty()){ - mapController.lineHandler.omdbTaskLinkLayer.addLineList(taskBean.hadLinkDvoList) - var maxX = 0.0 - var maxY = 0.0 - var minX = 0.0 - var minY = 0.0 - for (item in taskBean.hadLinkDvoList) { - val geometry = GeometryTools.createGeometry(item.geometry) - if(geometry!=null){ - val envelope = geometry.envelopeInternal - if (envelope.maxX > maxX) { - maxX = envelope.maxX - } - if (envelope.maxY > maxY) { - maxY = envelope.maxY - } - if (envelope.minX < minX || minX == 0.0) { - minX = envelope.minX - } - if (envelope.minY < minY || minY == 0.0) { - minY = envelope.minY - } + + mapController.lineHandler.omdbTaskLinkLayer.removeAll() + if (taskBean.hadLinkDvoList.isNotEmpty()) { + mapController.lineHandler.omdbTaskLinkLayer.addLineList(taskBean.hadLinkDvoList) + var maxX = 0.0 + var maxY = 0.0 + var minX = 0.0 + var minY = 0.0 + for (item in taskBean.hadLinkDvoList) { + val geometry = GeometryTools.createGeometry(item.geometry) + if (geometry != null) { + val envelope = geometry.envelopeInternal + if (envelope.maxX > maxX) { + maxX = envelope.maxX + } + if (envelope.maxY > maxY) { + maxY = envelope.maxY + } + if (envelope.minX < minX || minX == 0.0) { + minX = envelope.minX + } + if (envelope.minY < minY || minY == 0.0) { + minY = envelope.minY } } - //增加异常数据判断 - if(maxX!=0.0&&maxY!=0.0&&minX!=0.0&&minY!=0.0){ - mapController.animationHandler.animateToBox( - maxX = maxX, maxY = maxY, minX = minX, minY = minY - ) - } + } + //增加异常数据判断 + if (maxX != 0.0 && maxY != 0.0 && minX != 0.0 && minY != 0.0) { + mapController.animationHandler.animateToBox( + maxX = maxX, maxY = maxY, minX = minX, minY = minY + ) } } } @@ -181,20 +186,20 @@ class TaskViewModel @Inject constructor( /** * 高亮当前选中的link */ + @RequiresApi(Build.VERSION_CODES.M) fun showCurrentLink(link: HadLinkDvoBean) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - mapController.lineHandler.omdbTaskLinkLayer.showSelectLine(link) - val geometry = GeometryTools.createGeometry(link.geometry) - if(geometry!=null){ - val envelope = geometry.envelopeInternal - mapController.animationHandler.animateToBox( - maxX = envelope.maxX, - maxY = envelope.maxY, - minX = envelope.minX, - minY = envelope.minY - ) - } + mapController.lineHandler.omdbTaskLinkLayer.showSelectLine(link) + val geometry = GeometryTools.createGeometry(link.geometry) + if (geometry != null) { + val envelope = geometry.envelopeInternal + mapController.animationHandler.animateToBox( + maxX = envelope.maxX, + maxY = envelope.maxY, + minX = envelope.minX, + minY = envelope.minY + ) } + } override fun onCleared() { diff --git a/app/src/main/res/layout/fragment_evaluation_result.xml b/app/src/main/res/layout/fragment_evaluation_result.xml index 5fc689b2..0bd24bef 100644 --- a/app/src/main/res/layout/fragment_evaluation_result.xml +++ b/app/src/main/res/layout/fragment_evaluation_result.xml @@ -167,7 +167,7 @@ + android:text="初步分析" />