collections

take flags retrofit add images to hashmap
FunkyMuse · Jun 6, 2019 · f887afd · f887afd
1 parent 39b8bdd
commit f887afd
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/kotlinextensions/build.gradle b/kotlinextensions/build.gradle
@@ -68,7 +68,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.14.1'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.0.0-alpha02'
     implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
     implementation 'com.jakewharton.rxbinding2:rxbinding-kotlin:2.2.0'
     implementation 'androidx.core:core-ktx:1.2.0-alpha01'

diff --git a/...sions/src/main/java/com/crazylegend/kotlinextensions/collections/CollectionsExtensions.kt b/...sions/src/main/java/com/crazylegend/kotlinextensions/collections/CollectionsExtensions.kt
@@ -899,4 +899,9 @@ inline fun <T, R : Any> Iterable<T>.mapNotNullToSet(transform: (T) -> R?) =
 
 fun <T> Comparator<T>.sort(list: MutableList<T>) {
     list.sortWith(this)
-}
+}
+
+
+fun <T> listEqualsIgnoreOrder(list1: List<T>, list2: List<T>): Boolean {
+    return HashSet(list1) == HashSet(list2)
+}
diff --git a/...rc/main/java/com/crazylegend/kotlinextensions/intent/IntentPickersAndActionsExtensions.kt b/...rc/main/java/com/crazylegend/kotlinextensions/intent/IntentPickersAndActionsExtensions.kt
@@ -334,3 +334,5 @@ fun Context.dialPhoneNumber(phoneNumber: String) {
     }
 }
 
+val Intent.takeFlags: Int get() = flags and
+        (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
diff --git a/kotlinextensions/src/main/java/com/crazylegend/kotlinextensions/retrofit/RetrofitUtils.kt b/kotlinextensions/src/main/java/com/crazylegend/kotlinextensions/retrofit/RetrofitUtils.kt
@@ -1,8 +1,12 @@
 package com.crazylegend.kotlinextensions.retrofit
 
 import com.crazylegend.kotlinextensions.exhaustive
+import okhttp3.MediaType
+import okhttp3.RequestBody
 import okhttp3.ResponseBody
 import retrofit2.Retrofit
+import java.io.File
+import okhttp3.RequestBody.Companion.toRequestBody
 
 
 /**
@@ -78,3 +82,34 @@ fun <T> RetrofitResult<T>.handle(
     }.exhaustive
 }
 
+const val multiPartContentType = "multipart/form-data"
+
+fun HashMap<String,RequestBody>.addImagesToRetrofit(pathList:List<String>){
+    if (pathList.isNotEmpty()){
+        pathList.forEachIndexed { index, s ->
+            val key = String.format("%1\$s\"; filename=\"%1\$s", "photo_" + "${index+1}")
+            this[key] = File(s).toRequestBody(MediaType.parse(multiPartContentType))
+        }
+    }
+}
+
+
+/**
+ *
+ * val hashMap: HashMap<String, RequestBody> = HashMap()
+
+if (pathList.isNotEmpty()){
+hashMap.addImages(pathList.map {
+it.pathToImage
+})
+}
+ */
+/**
+ *
+ @Multipart
+@POST()
+fun postNewWaterMeterMeasurementWithImages(@Header("Authorization") token: String,
+@PartMap images: Map<String,@JvmSuppressWildcards RequestBody>): Single<Response<ResponseBody>>
+
+ *
+ */