2019-03-28 17:55

Bug fix again
G-Corporation · Mar 28, 2019 · 3f6a6c1 · 3f6a6c1
1 parent 142c62b
commit 3f6a6c1
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 16 deletions.
diff --git a/app/src/main/java/com/gcorp/retrofithelperexample/BaseApp.kt b/app/src/main/java/com/gcorp/retrofithelperexample/BaseApp.kt
@@ -8,9 +8,8 @@ class BaseApp : Application() {
         super.onCreate()
 
         retrofitClient =
-//            RetrofitClient().setBaseUrl("http://192.168.1.2/test/")
-            RetrofitClient().setBaseUrl("http://bef0de5a.ngrok.io/api/")
-                .setUrl("salam","http://192.168.1.95:81/")
+            RetrofitClient().setBaseUrl("http://192.168.1.2/test/")
+                .setUrl("mili","http://7468e347.ngrok.io/api/")
                 .setConnectionTimeout(15)
                 .setReadingTimeout(15)
                 .addHeader("Accept", "application/json")

diff --git a/app/src/main/java/com/gcorp/retrofithelperexample/MainActivity.kt b/app/src/main/java/com/gcorp/retrofithelperexample/MainActivity.kt
@@ -3,12 +3,14 @@ package com.gcorp.retrofithelperexample
 import android.graphics.BitmapFactory
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
+import android.util.JsonReader
 import android.util.Log
 import com.gcorp.retrofithelper.RequestHandler
 import com.gcorp.retrofithelper.Response
 import com.gcorp.retrofithelperexample.BaseApp.Companion.retrofitClient
 import com.google.gson.Gson
 import java.io.Serializable
+import java.io.StringReader
 import kotlin.math.log
 
 
@@ -46,11 +48,23 @@ class MainActivity : AppCompatActivity() {
 //            })
 //            .run()
 
+//        val json =
+//            "{items=[{name=Fruit Ninja Fight, url=https://www.farsroid.com/wp-content/uploads/Fruit-Ninja-Fight-Logo-150x150.png}, {name=Trailer Park Boys, url=https://www.farsroid.com/wp-content/uploads/Trailer-Park-Boys-Greasy-Money-logo-c-150x150.png}, {name=Cradle of Empires, url=https://www.farsroid.com/wp-content/uploads/Cradle-of-Empires-logo-d-150x150.png}, {name=Disco Ducks, url=https://www.farsroid.com/wp-content/uploads/Disco-Ducks-150x150.png}, {name=Manor Cafe, url=https://www.farsroid.com/wp-content/uploads/Manor-Cafe-logo-f-150x150.png}, {name=Live or Die: Survival, url=https://www.farsroid.com/wp-content/uploads/Live-or-Die-survival-2019-logo-150x150.jpg}]}"
+//
+//
+
+//        val aa = Gson().fromJson<T3>(Gson().toJson(json), T3::class.java)
+//
+//        Log.e("Ary", "T3 -> ${aa.items!!.size}")
+//        aa.items.forEach {
+//            Log.e("Ary", "${it.name} -> ${it.url}")
+//        }
 
-        retrofitClient.Post<T,T3>()
+        retrofitClient.Get<T2>()
+            .setBaseUrlKey("mili")
             .setPath("todo/1")
-            .setRequestHandler(T3::class.java,object : RequestHandler<T3>() {
-                override fun onSuccess(response: Response<T3>) {
+            .setRequestHandler(T2::class.java, object : RequestHandler<T2>() {
+                override fun onSuccess(response: Response<T2>) {
                     super.onSuccess(response)
 
 //                    EEEERRRRRRRRRORRRRRRRRRR is hear
@@ -61,9 +75,11 @@ class MainActivity : AppCompatActivity() {
                     Log.e("Ary", "raw.body -> " + response.raw!!.body())
 
                     Log.e("Ary", "body -> " + response.body.name)
+
+
                 }
 
-                override fun onError(response: Response<T3>?) {
+                override fun onError(response: Response<T2>?) {
                     super.onError(response)
                 }
 

diff --git a/app/src/main/java/com/gcorp/retrofithelperexample/T3.kt b/app/src/main/java/com/gcorp/retrofithelperexample/T3.kt
@@ -1,6 +1,10 @@
 package com.gcorp.retrofithelperexample
 open  class T3 {
-    var id: String = "pashm"
-    var name: String = "pashm"
-    var isComplete: Boolean = false
+    val items: List<Item>? = null
+
+
+    inner class Item{
+        var name: String = ""
+        var url: String = ""
+    }
 }
diff --git a/app/src/main/java/com/gcorp/retrofithelperexample/Test.java b/app/src/main/java/com/gcorp/retrofithelperexample/Test.java
@@ -0,0 +1,17 @@
+package com.gcorp.retrofithelperexample;
+
+import android.util.JsonReader;
+import com.google.gson.Gson;
+
+import java.io.StringReader;
+
+public class Test {
+
+    void aa(){
+        String json= "{items=[{name=Fruit Ninja Fight, url=https://www.farsroid.com/wp-content/uploads/Fruit-Ninja-Fight-Logo-150x150.png}, {name=Trailer Park Boys, url=https://www.farsroid.com/wp-content/uploads/Trailer-Park-Boys-Greasy-Money-logo-c-150x150.png}, {name=Cradle of Empires, url=https://www.farsroid.com/wp-content/uploads/Cradle-of-Empires-logo-d-150x150.png}, {name=Disco Ducks, url=https://www.farsroid.com/wp-content/uploads/Disco-Ducks-150x150.png}, {name=Manor Cafe, url=https://www.farsroid.com/wp-content/uploads/Manor-Cafe-logo-f-150x150.png}, {name=Live or Die: Survival, url=https://www.farsroid.com/wp-content/uploads/Live-or-Die-survival-2019-logo-150x150.jpg}]}";
+        Gson gson = new Gson();
+        JsonReader reader = new JsonReader(new StringReader(json));
+        reader.setLenient(true);
+        T3 userinfo1 = (T3) gson.fromJson(String.valueOf(reader), T3.class);
+    }
+}
diff --git a/retrofithelper/src/main/java/com/gcorp/retrofithelper/Response.kt b/retrofithelper/src/main/java/com/gcorp/retrofithelper/Response.kt
@@ -1,12 +1,14 @@
 package com.gcorp.retrofithelper
 
+import android.util.JsonReader
 import android.util.Log
 import com.google.gson.Gson
 import retrofit2.Response
+import java.io.StringReader
 
 class Response<T>(response: Response<T>, classOfT: Class<T>) {
     var header: MutableMap<String, MutableList<String>>? = response.headers().toMultimap()
-    var body = Gson().fromJson<T>(response.body().toString(), classOfT)
+    var body = Gson().fromJson<T>(Gson().toJson(response.body()), classOfT)
     var code = response.code()
     var raw: okhttp3.Response? = response.raw()
 

diff --git a/retrofithelper/src/main/java/com/gcorp/retrofithelper/RetrofitClient.kt b/retrofithelper/src/main/java/com/gcorp/retrofithelper/RetrofitClient.kt
@@ -3,6 +3,7 @@ package com.gcorp.retrofithelper
 import android.app.Activity
 import android.graphics.Bitmap
 import android.util.Log
+import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import okhttp3.MediaType
 import okhttp3.MultipartBody
@@ -540,19 +541,15 @@ class RetrofitClient {
         override fun onNext(t: Response<T>?) {
             if (t != null) {
                 Log.e("Request", "code -> ${t.code()}")
-                Log.e("Request", "raw -> ${t.raw()}")
-                Log.e("Request", "body -> ${t.body()}")
                 Log.e("Request", "header -> ${t.headers()}")
+                Log.e("Request", "body -> ${t.body()}")
             }
 
             if (t == null) {
                 requestHandler?.onFailed(Throwable("Response in null"))
                 return
             }
 
-            Log.e("AryLib", "raw -> " + t.raw().toString())
-            Log.e("AryLib", "raw.body -> " + t.body())
-
             val res = Response(t, classOfT)
 
             if (t.code() != 200) {