diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt index 3b26f05..ac06760 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt @@ -232,7 +232,7 @@ /** * 上传自由巡检过程中发现的标识器 */ - suspend fun uploadTaskMarker(taskId: String?, models: ArrayList): String { + suspend fun uploadTaskMarker(taskId: String, models: ArrayList): String { val param = JsonObject() param.addProperty("taskId", taskId) param.addProperty("ids", models.reformat()) diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt index 3b26f05..ac06760 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt @@ -232,7 +232,7 @@ /** * 上传自由巡检过程中发现的标识器 */ - suspend fun uploadTaskMarker(taskId: String?, models: ArrayList): String { + suspend fun uploadTaskMarker(taskId: String, models: ArrayList): String { val param = JsonObject() param.addProperty("taskId", taskId) param.addProperty("ids", models.reformat()) diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt index 7637aaf..c2114ce 100644 --- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt @@ -14,8 +14,6 @@ const val PERMISSIONS_CODE = 999 const val RADIUS_SIZE = 100 //相距多少米才聚合,单位:米 - const val INSTALL_MARKER_CODE = 2024010701 - const val SEARCH_MARKER_CODE = 2024010702 const val AUTO_SAVE = "AUTO_SAVE" const val USER_ACCOUNT = "USER_ACCOUNT" diff --git a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt index 3b26f05..ac06760 100644 --- a/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/detector/retrofit/RetrofitServiceManager.kt @@ -232,7 +232,7 @@ /** * 上传自由巡检过程中发现的标识器 */ - suspend fun uploadTaskMarker(taskId: String?, models: ArrayList): String { + suspend fun uploadTaskMarker(taskId: String, models: ArrayList): String { val param = JsonObject() param.addProperty("taskId", taskId) param.addProperty("ids", models.reformat()) diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt index 7637aaf..c2114ce 100644 --- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt @@ -14,8 +14,6 @@ const val PERMISSIONS_CODE = 999 const val RADIUS_SIZE = 100 //相距多少米才聚合,单位:米 - const val INSTALL_MARKER_CODE = 2024010701 - const val SEARCH_MARKER_CODE = 2024010702 const val AUTO_SAVE = "AUTO_SAVE" const val USER_ACCOUNT = "USER_ACCOUNT" diff --git a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt index dbb83fc..800abe7 100644 --- a/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt +++ b/app/src/main/java/com/casic/detector/vm/TaskViewModel.kt @@ -39,7 +39,7 @@ it.printStackTrace() }) - fun uploadTaskMarker(taskId: String?, models: ArrayList) = launch({ + fun uploadTaskMarker(taskId: String, models: ArrayList) = launch({ val response = RetrofitServiceManager.uploadTaskMarker(taskId, models) if (response.getResponseState()) { val element = JsonParser.parseString(response)