diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 6aad0a0..945a924 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -79,7 +79,7 @@ * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ @Multipart - @POST("/upload/image") + @POST("/file/upload") suspend fun uploadImage( @Header("token") token: String, @Part file: MultipartBody.Part diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 6aad0a0..945a924 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -79,7 +79,7 @@ * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ @Multipart - @POST("/upload/image") + @POST("/file/upload") suspend fun uploadImage( @Header("token") token: String, @Part file: MultipartBody.Part diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index 72e7aaf..a566202 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -23,6 +23,7 @@ ) as String RetrofitFactory.createRetrofit(httpConfig) } + private val gson by lazy { Gson() } /** * 验证PublicKey @@ -89,7 +90,6 @@ /** * 新增事件 */ - private val gson by lazy { Gson() } private val typeToken = object : TypeToken>() {}.type suspend fun addEvent( eventTitle: String, diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt index 6aad0a0..945a924 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitService.kt @@ -79,7 +79,7 @@ * http://xx.com/static/2019-10/8050891248624f2bbefedcb196ce89cb.jpeg */ @Multipart - @POST("/upload/image") + @POST("/file/upload") suspend fun uploadImage( @Header("token") token: String, @Part file: MultipartBody.Part diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index 72e7aaf..a566202 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -23,6 +23,7 @@ ) as String RetrofitFactory.createRetrofit(httpConfig) } + private val gson by lazy { Gson() } /** * 验证PublicKey @@ -89,7 +90,6 @@ /** * 新增事件 */ - private val gson by lazy { Gson() } private val typeToken = object : TypeToken>() {}.type suspend fun addEvent( eventTitle: String, diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index cc59d26..d31ffba 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -181,11 +181,6 @@ imageModels.add(ImageModel("", "", url)) } - val imageArray = arrayOf() - imageModels.forEachIndexed { index, imageModel -> - imageArray[index] = imageModel - } - eventViewModel.addEvent( eventNameView.text.toString(), personNumberView.text.toString(), @@ -194,7 +189,7 @@ siteEditView.text.toString(), "", uploadPersonView.text.toString(), - imageArray, + imageModels.toTypedArray(), mapLocation?.latitude.toString(), ) }