2019-03-28 16:30

Bug fix
G-Corporation · Mar 28, 2019 · 47691d0 · 47691d0
1 parent 37e1599
commit 47691d0
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 100 deletions.
diff --git a/app/src/main/java/com/gcorp/retrofithelperexample/BaseApp.kt b/app/src/main/java/com/gcorp/retrofithelperexample/BaseApp.kt
@@ -8,7 +8,8 @@ class BaseApp : Application() {
         super.onCreate()
 
         retrofitClient =
-            RetrofitClient().setBaseUrl("http://192.168.1.97/")
+//            RetrofitClient().setBaseUrl("http://192.168.1.2/test/")
+            RetrofitClient().setBaseUrl("http://bef0de5a.ngrok.io/api/")
                 .setUrl("salam","http://192.168.1.95:81/")
                 .setConnectionTimeout(15)
                 .setReadingTimeout(15)

diff --git a/app/src/main/java/com/gcorp/retrofithelperexample/MainActivity.kt b/app/src/main/java/com/gcorp/retrofithelperexample/MainActivity.kt
@@ -7,38 +7,69 @@ 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 kotlin.math.log
 
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+//
+//        retrofitClient.Put<T,T2>()
+//            .setBaseUrlKey("salam")
+//            .setRequestHeader("tcl", "salam2")
+//            .setRequestHeader("vcl", "vcl1")
+//            .setPath("test")
+//            .setUrlParams("param1", "Salam")
+//            .setRequest(T())
+//            .setRequestHandler(object : RequestHandler<T2>(){
+//                override fun onSuccess(response: Response<T2>) {
+//                    super.onSuccess(response)
+//                    retrofitClient.Put<T,T2>()
+//                        .setBaseUrlKey("salam")
+//                        .setRequestHeader("vcl2", "vcl2")
+//                        .setPath("test")
+//                        .setUrlParams("param1", "Salam")
+//                        .setRequest(T())
+//                        .setRequestHandler(object : RequestHandler<T2>(){
+//                            override fun onSuccess(response: Response<T2>) {
+//                                super.onSuccess(response)
+//
+//                            }
+//
+//                        })
+//                        .run()
+//                }
+//            })
+//            .run()
 
-        retrofitClient.Put<T,T2>()
-            .setBaseUrlKey("salam")
-            .setRequestHeader("tcl", "salam2")
-            .setRequestHeader("vcl", "vcl1")
-            .setPath("test")
-            .setUrlParams("param1", "Salam")
-            .setRequest(T())
-            .setRequestHandler(object : RequestHandler<T2>(){
-                override fun onSuccess(response: Response<T2>) {
+
+        retrofitClient.Post<T,T3>()
+            .setPath("todo/1")
+            .setRequestHandler(T3::class.java,object : RequestHandler<T3>() {
+                override fun onSuccess(response: Response<T3>) {
                     super.onSuccess(response)
-                    retrofitClient.Put<T,T2>()
-                        .setBaseUrlKey("salam")
-                        .setRequestHeader("vcl2", "vcl2")
-                        .setPath("test")
-                        .setUrlParams("param1", "Salam")
-                        .setRequest(T())
-                        .setRequestHandler(object : RequestHandler<T2>(){
-                            override fun onSuccess(response: Response<T2>) {
-                                super.onSuccess(response)
-
-                            }
-
-                        })
-                        .run()
+
+//                    EEEERRRRRRRRRORRRRRRRRRR is hear
+//                            ||||||||||||||||||
+//                            >>>>>>>>>>>>>>>
+
+                    Log.e("Ary", "raw -> " + response.raw!!.toString())
+                    Log.e("Ary", "raw.body -> " + response.raw!!.body())
+
+                    Log.e("Ary", "body -> " + response.body.name)
+                }
+
+                override fun onError(response: Response<T3>?) {
+                    super.onError(response)
+                }
+
+                override fun onFailed(e: Throwable?) {
+                    super.onFailed(e)
+                    Log.e("Error", ":DDD errrrror -> ${e!!.message}")
                 }
             })
             .run()
@@ -48,7 +79,9 @@ class MainActivity : AppCompatActivity() {
         var bye: String = ":DDDDDDD"
     }
 
-    inner class T2 {
-        var min_version:String = "pashm"
+    open inner class T2 {
+        var id: String = "pashm"
+        var name: String = "pashm"
+        var isComplete: Boolean = false
     }
 }
diff --git a/app/src/main/java/com/gcorp/retrofithelperexample/T3.kt b/app/src/main/java/com/gcorp/retrofithelperexample/T3.kt
@@ -0,0 +1,6 @@
+package com.gcorp.retrofithelperexample
+open  class T3 {
+    var id: String = "pashm"
+    var name: String = "pashm"
+    var isComplete: Boolean = false
+}
diff --git a/retrofithelper/build.gradle b/retrofithelper/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 28
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/retrofithelper/src/main/java/com/gcorp/retrofithelper/ApiInterface.kt b/retrofithelper/src/main/java/com/gcorp/retrofithelper/ApiInterface.kt
@@ -8,7 +8,7 @@ import rx.Observable
 
 interface ApiInterface {
     @GET
-    fun get(@Url url: String, @QueryMap urlParams: Any?): Observable<Response<Any?>>
+    fun get(@Url url: String, @QueryMap urlParams: HashMap<String, String>?): Observable<Response<Any?>>
 
     @POST
     fun post(@Url url: String, @QueryMap urlParams: HashMap<String, String>?, @Body request: Any?): Observable<Response<Any?>>

diff --git a/retrofithelper/src/main/java/com/gcorp/retrofithelper/MySubscriber.kt b/retrofithelper/src/main/java/com/gcorp/retrofithelper/MySubscriber.kt
diff --git a/retrofithelper/src/main/java/com/gcorp/retrofithelper/Response.kt b/retrofithelper/src/main/java/com/gcorp/retrofithelper/Response.kt
@@ -1,11 +1,13 @@
 package com.gcorp.retrofithelper
 
 import android.util.Log
+import com.google.gson.Gson
 import retrofit2.Response
 
-class Response<T>(response: Response<T>) {
-    var header = response.headers().toMultimap()
-    var body = response.body()
+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 code = response.code()
+    var raw: okhttp3.Response? = response.raw()
 
 }