2019-04-12 21:30

Bug fix V1.1.3
G-Corporation · Apr 12, 2019 · f769ccf · f769ccf
1 parent f444f86
commit f769ccf
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/app/src/main/java/com/gcorp/retrofithelperexample/BaseApp.kt b/app/src/main/java/com/gcorp/retrofithelperexample/BaseApp.kt
@@ -10,7 +10,7 @@ class BaseApp : Application() {
         retrofitClient =
             RetrofitClient.instance.setBaseUrl("http://192.168.1.2/test/")
                 .setUrl("mili","http://7468e347.ngrok.io/api/")
-                .setConnectionTimeout(15)
+                .setConnectionTimeout(4)
                 .enableCaching(this)
                 .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
@@ -89,12 +89,19 @@ class MainActivity : AppCompatActivity() {
 
                 override fun onError(response: Response<T3>?) {
                     super.onError(response)
+                    Log.e("Error", ":DDD errrrror -> onError")
                 }
 
                 override fun onFailed(e: Throwable?) {
                     super.onFailed(e)
                     Log.e("Error", ":DDD errrrror -> ${e!!.message}")
                 }
+
+                override fun onComplete() {
+                    super.onComplete()
+
+                    Log.e("Ari","onComplete :DDDDDDDDDDDDDDDDDD")
+                }
             })
             .run(this)
     }

diff --git a/retrofithelper/build.gradle b/retrofithelper/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 28
         versionCode 2
-        versionName "1.1.1"
+        versionName "1.1.3"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/retrofithelper/src/main/java/com/gcorp/retrofithelper/RequestHandler.kt b/retrofithelper/src/main/java/com/gcorp/retrofithelper/RequestHandler.kt
@@ -1,5 +1,7 @@
 package com.gcorp.retrofithelper
 
+import android.util.Log
+
 
 open class RequestHandler<T> : RequestInterface<T> {
     override fun onBeforeSend() {
@@ -8,17 +10,20 @@ open class RequestHandler<T> : RequestInterface<T> {
 
     override fun onSuccess(response: Response<T>) {
         super.onSuccess(response)
-    }
-
-    override fun onComplete() {
-        super.onComplete()
+        onComplete()
     }
 
     override fun onError(response: Response<T>?) {
         super.onError(response)
+        onComplete()
     }
 
     override fun onFailed(e: Throwable?) {
         super.onFailed(e)
+        onComplete()
+    }
+
+    override fun onComplete() {
+        super.onComplete()
     }
 }
diff --git a/retrofithelper/src/main/java/com/gcorp/retrofithelper/RetrofitClient.kt b/retrofithelper/src/main/java/com/gcorp/retrofithelper/RetrofitClient.kt
@@ -641,21 +641,20 @@ open class RetrofitClient {
 
             val res = Response(t, classOfT)
 
-            if (t.code() != 200) {
+            if (t.code() != 202) {
                 requestHandler?.onError(res)
                 return
             }
             requestHandler?.onSuccess(res)
-
         }
 
         override fun onCompleted() {
-            requestHandler?.onComplete()
         }
 
         override fun onError(e: Throwable?) {
-            requestHandler?.onFailed(e)
             e?.printStackTrace()
+            requestHandler?.onFailed(e)
+
         }
     }