Browse Source

提交2.0.9测试版本1

kth_win_android 2 years ago
parent
commit
f6b07ce30e

+ 5 - 6
okhttplib/src/main/java/com/benyanyi/okhttp/call/BeanCall.java

@@ -180,15 +180,14 @@ class BeanCall<T> {
      * @param emitter
      */
     private void dataReturn(String message, ObservableEmitter<T> emitter) {
+        T t;
         if (isCache) {
-            T t = dataToT(CacheUtils.getInstance(context).getCacheToLocalJson(mCacheName));
-            emitter.onNext(t);
-            emitter.onComplete();
+            t = dataToT(CacheUtils.getInstance(context).getCacheToLocalJson(mCacheName));
         } else {
-            T t = dataToT(dataProcessing(message));
-            emitter.onNext(t);
-            emitter.onComplete();
+            t = dataToT(dataProcessing(message));
         }
+        emitter.onNext(t);
+        emitter.onComplete();
     }
 
     private T dataToT(String data) {

+ 4 - 4
okhttplib/src/main/java/com/benyanyi/okhttp/listener/OnOkHttpListener.java

@@ -4,23 +4,23 @@ package com.benyanyi.okhttp.listener;
  * @author myLove
  */
 
-public interface OnOkHttpListener<T> {
+public abstract class OnOkHttpListener<T> {
     /**
      * 网络请求后
      */
-    void onCompleted();
+    public abstract void onCompleted();
 
     /**
      * 请求成功
      *
      * @param message
      */
-    void onSuccess(T message);
+    public abstract void onSuccess(T message);
 
     /**
      * 请求失败
      *
      * @param t
      */
-    void onFailure(Throwable t);
+    public abstract void onFailure(Throwable t);
 }