修复在主线程读取string造成的bug

tsy12321 · Dec 23, 2016 · f8d6178 · f8d6178
1 parent f334feb
commit f8d6178
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@
 ### 在app目录下的build.gradle中添加依赖
 
 ```gradle
-    compile 'com.tsy:myokhttp:1.1.0'
+    compile 'com.tsy:myokhttp:1.1.1'
 ```
 
 ## 1 总体简介

diff --git a/app/build.gradle b/app/build.gradle
@@ -31,5 +31,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
 
 //    compile project(":myokhttp")
-    compile 'com.tsy:myokhttp:1.1.0'
+    compile 'com.tsy:myokhttp:1.1.1'
 }
diff --git a/myokhttp/build.gradle b/myokhttp/build.gradle
@@ -36,7 +36,7 @@ publish {
     userOrg = 'tangsiyuan'      //bintray注册的用户名
     groupId = 'com.tsy'         //compile引用时的第1部分groupId
     artifactId = 'myokhttp'     //compile引用时的第2部分项目名
-    publishVersion = '1.1.0'    //compile引用时的第3部分版本号
+    publishVersion = '1.1.1'    //compile引用时的第3部分版本号
     desc = 'This is a okhttp3 extend library'
     website = 'https://github.com/tsy12321/MyOkHttp'
 

diff --git a/myokhttp/src/main/java/com/tsy/sdk/myokhttp/MyOkHttp.java b/myokhttp/src/main/java/com/tsy/sdk/myokhttp/MyOkHttp.java
@@ -1,5 +1,8 @@
 package com.tsy.sdk.myokhttp;
 
+import android.os.Handler;
+import android.os.Looper;
+
 import com.tsy.sdk.myokhttp.builder.DeleteBuilder;
 import com.tsy.sdk.myokhttp.builder.DownloadBuilder;
 import com.tsy.sdk.myokhttp.builder.GetBuilder;
@@ -18,6 +21,7 @@
  */
 public class MyOkHttp {
     private static OkHttpClient mOkHttpClient;
+    public static Handler mHandler = new Handler(Looper.getMainLooper());
 
     public OkHttpClient getOkHttpClient() {
         return mOkHttpClient;

diff --git a/myokhttp/src/main/java/com/tsy/sdk/myokhttp/callback/MyCallback.java b/myokhttp/src/main/java/com/tsy/sdk/myokhttp/callback/MyCallback.java
@@ -1,8 +1,6 @@
 package com.tsy.sdk.myokhttp.callback;
 
-import android.os.Handler;
-import android.os.Looper;
-
+import com.tsy.sdk.myokhttp.MyOkHttp;
 import com.tsy.sdk.myokhttp.response.IResponseHandler;
 import com.tsy.sdk.myokhttp.util.LogUtils;
 
@@ -19,8 +17,6 @@ public class MyCallback implements Callback {
 
     private IResponseHandler mResponseHandler;
 
-    private static Handler mHandler = new Handler(Looper.getMainLooper());
-
     public MyCallback(IResponseHandler responseHandler) {
         mResponseHandler = responseHandler;
     }
@@ -29,7 +25,7 @@ public MyCallback(IResponseHandler responseHandler) {
     public void onFailure(Call call, final IOException e) {
         LogUtils.e("onFailure", e);
 
-        mHandler.post(new Runnable() {
+        MyOkHttp.mHandler.post(new Runnable() {
             @Override
             public void run() {
                 mResponseHandler.onFailure(0, e.toString());
@@ -38,18 +34,13 @@ public void run() {
     }
 
     @Override
-    public void onResponse(Call call, final Response response) throws IOException {
+    public void onResponse(Call call, final Response response) {
         if(response.isSuccessful()) {
-            mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    mResponseHandler.onSuccess(response);
-                }
-            });
+            mResponseHandler.onSuccess(response);
         } else {
             LogUtils.e("onResponse fail status=" + response.code());
 
-            mHandler.post(new Runnable() {
+            MyOkHttp.mHandler.post(new Runnable() {
                 @Override
                 public void run() {
                     mResponseHandler.onFailure(response.code(), "fail status=" + response.code());

diff --git a/myokhttp/src/main/java/com/tsy/sdk/myokhttp/response/GsonResponseHandler.java b/myokhttp/src/main/java/com/tsy/sdk/myokhttp/response/GsonResponseHandler.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.internal.$Gson$Types;
+import com.tsy.sdk.myokhttp.MyOkHttp;
 import com.tsy.sdk.myokhttp.util.LogUtils;
 
 import java.io.IOException;
@@ -33,7 +34,7 @@ private Type getType() {
     }
 
     @Override
-    public final void onSuccess(Response response) {
+    public final void onSuccess(final Response response) {
         ResponseBody responseBody = response.body();
         String responseBodyStr = "";
 
@@ -42,19 +43,37 @@ public final void onSuccess(Response response) {
         } catch (IOException e) {
             e.printStackTrace();
             LogUtils.e("onResponse fail read response body");
-            onFailure(response.code(), "fail read response body");
+            MyOkHttp.mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    onFailure(response.code(), "fail read response body");
+                }
+            });
             return;
         } finally {
             responseBody.close();
         }
 
+        final String finalResponseBodyStr = responseBodyStr;
+
         try {
-            Gson gson = new Gson();
-            onSuccess(response.code(), (T) gson.fromJson(responseBodyStr, getType()));
+            MyOkHttp.mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    Gson gson = new Gson();
+                    onSuccess(response.code(), (T) gson.fromJson(finalResponseBodyStr, getType()));
+                }
+            });
         } catch (Exception e) {
             e.printStackTrace();
-            LogUtils.e("onResponse fail parse gson, body=" + responseBodyStr);
-            onFailure(response.code(), "fail parse gson, body=" + responseBodyStr);
+            LogUtils.e("onResponse fail parse gson, body=" + finalResponseBodyStr);
+            MyOkHttp.mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    onFailure(response.code(), "fail parse gson, body=" + finalResponseBodyStr);
+                }
+            });
+
         }
     }
 

diff --git a/myokhttp/src/main/java/com/tsy/sdk/myokhttp/response/JsonResponseHandler.java b/myokhttp/src/main/java/com/tsy/sdk/myokhttp/response/JsonResponseHandler.java
@@ -1,5 +1,6 @@
 package com.tsy.sdk.myokhttp.response;
 
+import com.tsy.sdk.myokhttp.MyOkHttp;
 import com.tsy.sdk.myokhttp.util.LogUtils;
 
 import org.json.JSONArray;
@@ -19,7 +20,7 @@
 public abstract class JsonResponseHandler implements IResponseHandler {
 
     @Override
-    public final void onSuccess(Response response) {
+    public final void onSuccess(final Response response) {
         ResponseBody responseBody = response.body();
         String responseBodyStr = "";
 
@@ -28,26 +29,54 @@ public final void onSuccess(Response response) {
         } catch (IOException e) {
             e.printStackTrace();
             LogUtils.e("onResponse fail read response body");
-            onFailure(response.code(), "fail read response body");
+
+            MyOkHttp.mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    onFailure(response.code(), "fail read response body");
+                }
+            });
             return;
         } finally {
             responseBody.close();
         }
 
+        final String finalResponseBodyStr = responseBodyStr;
+
         try {
-            Object result = new JSONTokener(responseBodyStr).nextValue();
+            final Object result = new JSONTokener(finalResponseBodyStr).nextValue();
             if(result instanceof JSONObject) {
-                onSuccess(response.code(), (JSONObject) result);
+                MyOkHttp.mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onSuccess(response.code(), (JSONObject) result);
+                    }
+                });
             } else if(result instanceof JSONArray) {
-                onSuccess(response.code(), (JSONArray) result);
+                MyOkHttp.mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onSuccess(response.code(), (JSONArray) result);
+                    }
+                });
             } else {
-                LogUtils.e("onResponse fail parse jsonobject, body=" + responseBodyStr);
-                onFailure(response.code(), "fail parse jsonobject, body=" + responseBodyStr);
+                LogUtils.e("onResponse fail parse jsonobject, body=" + finalResponseBodyStr);
+                MyOkHttp.mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        onFailure(response.code(), "fail parse jsonobject, body=" + finalResponseBodyStr);
+                    }
+                });
             }
         } catch (JSONException e) {
             e.printStackTrace();
-            LogUtils.e("onResponse fail parse jsonobject, body=" + responseBodyStr);
-            onFailure(response.code(), "fail parse jsonobject, body=" + responseBodyStr);
+            LogUtils.e("onResponse fail parse jsonobject, body=" + finalResponseBodyStr);
+            MyOkHttp.mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    onFailure(response.code(), "fail parse jsonobject, body=" + finalResponseBodyStr);
+                }
+            });
         }
     }
 
@@ -63,4 +92,4 @@ public void onSuccess(int statusCode, JSONArray response) {
     public void onProgress(long currentBytes, long totalBytes) {
 
     }
-}
+}
diff --git a/myokhttp/src/main/java/com/tsy/sdk/myokhttp/response/RawResponseHandler.java b/myokhttp/src/main/java/com/tsy/sdk/myokhttp/response/RawResponseHandler.java
@@ -1,5 +1,6 @@
 package com.tsy.sdk.myokhttp.response;
 
+import com.tsy.sdk.myokhttp.MyOkHttp;
 import com.tsy.sdk.myokhttp.util.LogUtils;
 
 import java.io.IOException;
@@ -14,7 +15,7 @@
 public abstract class RawResponseHandler implements IResponseHandler {
 
     @Override
-    public final void onSuccess(Response response) {
+    public final void onSuccess(final Response response) {
         ResponseBody responseBody = response.body();
         String responseBodyStr = "";
 
@@ -23,13 +24,25 @@ public final void onSuccess(Response response) {
         } catch (IOException e) {
             e.printStackTrace();
             LogUtils.e("onResponse fail read response body");
-            onFailure(response.code(), "fail read response body");
+            MyOkHttp.mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    onFailure(response.code(), "fail read response body");
+                }
+            });
             return;
         } finally {
             responseBody.close();
         }
 
-        onSuccess(response.code(), responseBodyStr);
+        final String finalResponseBodyStr = responseBodyStr;
+        MyOkHttp.mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                onSuccess(response.code(), finalResponseBodyStr);
+            }
+        });
+
     }
 
     public abstract void onSuccess(int statusCode, String response);