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 d4e18612..c0c49de6 100644 --- a/app/src/main/java/com/navinfo/omqs/bean/EvaluationInfo.kt +++ b/app/src/main/java/com/navinfo/omqs/bean/EvaluationInfo.kt @@ -51,10 +51,10 @@ data class EvaluationInfo( val evaluationWay: Int = 2,//测评方式 1生产测评 2现场测评 服务字段定义为Integer,使用包装类,对应无值情况为空 @SerializedName("roadClassfcation") - val roadClassfcation: String = "",//道路种别 + val roadClassfcation: Int = 1,//道路种别 @SerializedName("roadFunctionGrade") - val roadFunctionGrade: Int = 3,//道路功能等级 + val roadFunctionGrade: Int = 1,//道路功能等级 @SerializedName("noEvaluationreason") val noEvaluationreason: String = "",//未测评原因 @@ -63,7 +63,7 @@ data class EvaluationInfo( val linkLength: Double = 0.0,//link长度(m 保留3位小数) @SerializedName("dataLevel") - val dataLevel: Int = 3,//数据级别 + val dataLevel: Int = 1,//数据级别 @SerializedName("linstringLength") val linstringLength: Double = 0.0,//错误要素长度(m) 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 fbbac726..2da98af0 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 @@ -146,7 +146,7 @@ class TaskUploadScope( evaluatorName = "", evaluationDate = "", evaluationWay = 2, - roadClassfcation = "", + roadClassfcation = 1, roadFunctionGrade = 0, noEvaluationreason = hadLinkDvoBean.reason, linkLength = 0.0, @@ -192,7 +192,7 @@ class TaskUploadScope( evaluatorName = it.checkUserId, evaluationDate = it.checkTime, evaluationWay = evaluationWay, - roadClassfcation = "", + roadClassfcation = 1, roadFunctionGrade = 3, noEvaluationreason = "", linkLength = s.toDouble(), diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index 26386fb9..427a2321 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -168,6 +168,7 @@ class MainViewModel @Inject constructor( initTaskData() initQsRecordData() initNoteData() + initNILocationData() } } @@ -218,6 +219,18 @@ class MainViewModel @Inject constructor( } } + private suspend fun initNILocationData() { + //加载轨迹数据 + val id = sharedPreferences.getInt(Constant.SELECT_TASK_ID, -1) + val list: List? = TraceDataBase.getDatabase( + mapController.mMapView.context, + Constant.USER_DATA_PATH + ).niLocationDao.findToTaskIdAll(id.toString()) + list!!.forEach { + mapController.markerHandle.addNiLocationMarkerItem(it) + } + } + /** * 初始化定位信息 */ @@ -284,18 +297,6 @@ class MainViewModel @Inject constructor( } } - //加载轨迹数据 - viewModelScope.launch(Dispatchers.IO) { - val id = sharedPreferences.getInt(Constant.SELECT_TASK_ID, -1) - val list: List? = TraceDataBase.getDatabase( - mapController.mMapView.context, - Constant.USER_DATA_PATH - ).niLocationDao.findToTaskIdAll(id.toString()) - list!!.forEach { - mapController.markerHandle.addNiLocationMarkerItem(it) - } - } - //显示轨迹图层 mapController.layerManagerHandler.showNiLocationLayer()