修复asarray无效的问题

Author: wanpg

app/src/main/java/com/egeio/network/MainActivity.java

@@ -5,10 +5,14 @@
 
 import net.engine.NetEngine;
 import net.engine.NetParams;
+import net.engine.request.NetRequestArray;
+
+import java.util.List;
 
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 
 public class MainActivity extends AppCompatActivity {
@@ -24,6 +28,7 @@ protected void onCreate(Bundle savedInstanceState) {
                         .api("")
                         .get()
                         .result(String.class)
+                        .asArray()
                         .build())
                 .observable()
                 .subscribeOn(Schedulers.io())
@@ -47,6 +52,23 @@ public void onError(Throwable e) {
                     @Override
                     public void onComplete() {
 
+                    }
+                });
+        NetRequestArray<String> stringNetRequestArray = NetEngine.request(
+                NetParams.builder()
+                        .baseUrl("http://www.baidu.com")
+                        .noVersion()
+                        .api("")
+                        .get()
+                        .result(String.class)
+                        .build())
+                .asArray();
+        stringNetRequestArray
+                .observable()
+                .subscribe(new Consumer<List<String>>() {
+                    @Override
+                    public void accept(List<String> strings) throws Exception {
+
                     }
                 });
     }

library/src/main/java/net/engine/NetParams.java

@@ -6,6 +6,7 @@
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -140,6 +141,21 @@ public ResultBuilder(NetParams<T> params, Class<T> tClass) {
                 params.result(tClass);
             }
 
+            public ArrayResultBuilder<T> asArray() {
+                return new ArrayResultBuilder<>(params);
+            }
+
+            public NetParams<T> build() {
+                return params;
+            }
+        }
+
+        public static class ArrayResultBuilder<T> extends Builder {
+
+            public ArrayResultBuilder(NetParams params) {
+                super(params);
+            }
+
             public NetParams<T> build() {
                 return params;
             }
@@ -205,6 +221,22 @@ public ResultBuilder(NetParams<T> params, Class<T> tClass) {
                 params.result(tClass);
             }
 
+
+            public ArrayResultBuilder<T> asArray() {
+                return new ArrayResultBuilder<>(params);
+            }
+
+            public NetParams<T> build() {
+                return params;
+            }
+        }
+
+        public static class ArrayResultBuilder<T> extends Builder {
+
+            public ArrayResultBuilder(NetParams params) {
+                super(params);
+            }
+
             public NetParams<T> build() {
                 return params;
             }
@@ -220,6 +252,7 @@ public NetParams<T> build() {
     private Integer apiVersion = 1;
     private Class<T> resultType;
     private Method method = Method.GET;
+    private boolean asArray = false;
 
     public String getApiUrl() {
         StringBuilder builder = new StringBuilder(getBaseUrl());
@@ -300,6 +333,11 @@ protected NetParams<T> result(Class<T> tClass) {
         return this;
     }
 
+    protected NetParams<T> asArray(boolean asArray) {
+        this.asArray = asArray;
+        return this;
+    }
+
     public String getBaseUrl() {
         if (!TextUtils.isEmpty(baseUrl)) {
             return baseUrl;

library/src/main/java/net/engine/request/NetRequest.java

@@ -39,8 +39,8 @@ public NetRequest<T> json(JSONConvert jsonConvert) {
         return this;
     }
 
-    public NetRequestArray<List<T>> asArray() {
-        NetRequestArray<List<T>> requestArray = new NetRequestArray<>(target);
+    public NetRequestArray<T> asArray() {
+        NetRequestArray<T> requestArray = new NetRequestArray<>(target);
         if (jsonConvert != null) {
             requestArray.json(jsonConvert);
         }

library/src/main/java/net/engine/request/NetRequestArray.java

@@ -8,6 +8,11 @@
 
 import java.util.List;
 
+import io.reactivex.Observable;
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.schedulers.Schedulers;
+
 /**
  * Created by wangjinpeng on 2017/4/6.
  */
@@ -29,4 +34,25 @@ protected List<T> formatResult(String result) {
         //noinspection unchecked
         return (List<T>) jsonConvertTmp.parseArray(result, target.getResultClass());
     }
+
+    @Override
+    public Observable<List<T>> observable() {
+        return Observable.create(new ObservableOnSubscribe<List<T>>() {
+            @Override
+            public void subscribe(ObservableEmitter<List<T>> emitter) {
+                try {
+                    List<T> result = execute();
+                    emitter.onNext(result);
+                } catch (Throwable e) {
+                    if (e instanceof Exception) {
+                        emitter.onError(e);
+                    } else {
+                        emitter.onError(new Exception(e));
+                    }
+                } finally {
+                    emitter.onComplete();
+                }
+            }
+        }).subscribeOn(Schedulers.from(NetEngine.getExecutor()));
+    }
 }