laraver-core/build.gradle

@@ -82,4 +82,5 @@ dependencies {
     compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
     compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
 
+
 }

laraver-core/src/main/java/com/kuxuan/laraver/delegates/web/client/WebViewClientImpl.java

@@ -10,7 +10,8 @@ import com.kuxuan.laraver.app.Laraver;
 import com.kuxuan.laraver.delegates.IPageLoadListener;
 import com.kuxuan.laraver.delegates.web.WebDelegate;
 import com.kuxuan.laraver.delegates.web.route.Router;
-import com.kuxuan.laraver.ui.LaraverLoader;
+
+import com.kuxuan.laraver.ui.loader.LaraverLoader;
 import com.kuxuan.laraver.util.log.LaraverLogger;
 import com.kuxuan.laraver.util.storage.LaraverPreference;
 

laraver-core/src/main/java/com/kuxuan/laraver/net/RestClient.java

@@ -9,8 +9,9 @@ import com.kuxuan.laraver.net.callback.IRequest;
 import com.kuxuan.laraver.net.callback.ISuccess;
 import com.kuxuan.laraver.net.callback.RequestCallbacks;
 import com.kuxuan.laraver.net.download.DownloadHandler;
-import com.kuxuan.laraver.ui.LaraverLoader;
-import com.kuxuan.laraver.ui.LoaderStyle;
+import com.kuxuan.laraver.ui.loader.LaraverLoader;
+import com.kuxuan.laraver.ui.loader.LoaderStyle;
+
 
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;

laraver-core/src/main/java/com/kuxuan/laraver/net/RestClientBuilder.java

@@ -6,7 +6,8 @@ import com.kuxuan.laraver.net.callback.IError;
 import com.kuxuan.laraver.net.callback.IFailure;
 import com.kuxuan.laraver.net.callback.IRequest;
 import com.kuxuan.laraver.net.callback.ISuccess;
-import com.kuxuan.laraver.ui.LoaderStyle;
+import com.kuxuan.laraver.ui.loader.LoaderStyle;
+
 
 import java.io.File;
 import java.util.Map;

laraver-core/src/main/java/com/kuxuan/laraver/net/RestCreator.java

@@ -2,6 +2,7 @@ package com.kuxuan.laraver.net;
 
 import com.kuxuan.laraver.app.ConfigKeys;
 import com.kuxuan.laraver.app.Laraver;
+import com.kuxuan.laraver.net.interceptors.ReleaseInterceptor;
 import com.kuxuan.laraver.net.rx.RxRestService;
 
 import java.util.ArrayList;
@@ -38,7 +39,17 @@ public final class RestCreator {
     private static final class OKHttpHolder {
         private static final int TIME_OUT = 60;
         private static final OkHttpClient.Builder BUILDER = new OkHttpClient.Builder();
-        private static final ArrayList<Interceptor> INTERCEPTORS = Laraver.getConfiguration(ConfigKeys.INTERCEPTOR);
+        //private static final ArrayList<Interceptor> INTERCEPTORS = Laraver.getConfiguration(ConfigKeys.INTERCEPTOR);
+        private static  ArrayList<Interceptor> INTERCEPTORS =null;
+
+        {
+            if(Laraver.getConfiguration(ConfigKeys.INTERCEPTOR)!=null){
+                INTERCEPTORS = Laraver.getConfiguration(ConfigKeys.INTERCEPTOR);
+            }else{
+                INTERCEPTORS = new ArrayList<>();
+                INTERCEPTORS.add(new ReleaseInterceptor());
+            }
+        }
 
         private static OkHttpClient.Builder addInterceptor() {
             if (INTERCEPTORS != null && !INTERCEPTORS.isEmpty()) {

laraver-core/src/main/java/com/kuxuan/laraver/net/callback/RequestCallbacks.java

@@ -3,8 +3,8 @@ package com.kuxuan.laraver.net.callback;
 import android.os.Handler;
 
 
-import com.kuxuan.laraver.ui.LaraverLoader;
-import com.kuxuan.laraver.ui.LoaderStyle;
+import com.kuxuan.laraver.ui.loader.LaraverLoader;
+import com.kuxuan.laraver.ui.loader.LoaderStyle;
 
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -63,12 +63,9 @@ public final class RequestCallbacks implements Callback<String> {
 
     private void stopLoading() {
         if (LOADER_STYLE != null) {
-            HANDLER.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    LaraverLoader.stopLoading();
-                }
-            }, 1000);
+
+            LaraverLoader.stopLoading();
+
         }
     }
 

laraver-core/src/main/java/com/kuxuan/laraver/net/callback/RxCallBack.java

@@ -0,0 +1,40 @@
+package com.kuxuan.laraver.net.callback;
+
+import android.widget.Toast;
+
+import com.kuxuan.laraver.app.Laraver;
+import com.kuxuan.laraver.ui.loader.LaraverLoader;
+
+
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
+
+/**
+ *
+ * @author huangfuruixin
+ * @date 2017/12/13
+ */
+
+public class RxCallBack implements Observer<String> {
+
+    @Override
+    public void onSubscribe(Disposable d) {
+
+    }
+
+    @Override
+    public void onNext(String s) {
+
+    }
+
+    @Override
+    public void onError(Throwable e) {
+        Toast.makeText(Laraver.getApplicationContext(),e.getMessage() , Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public void onComplete() {
+
+        LaraverLoader.stopLoading();
+    }
+}

laraver-core/src/main/java/com/kuxuan/laraver/net/interceptors/ReleaseInterceptor.java

@@ -5,6 +5,7 @@ import com.kuxuan.laraver.util.storage.LaraverPreference;
 import java.io.IOException;
 
 import io.reactivex.functions.Consumer;
+import okhttp3.Interceptor;
 import okhttp3.Request;
 import okhttp3.Response;
 

laraver-core/src/main/java/com/kuxuan/laraver/net/rx/RxRestClient.java

@@ -3,17 +3,11 @@ package com.kuxuan.laraver.net.rx;
 import android.content.Context;
 
 import com.kuxuan.laraver.net.HttpMethod;
-import com.kuxuan.laraver.net.RestClientBuilder;
+
 import com.kuxuan.laraver.net.RestCreator;
-import com.kuxuan.laraver.net.RestService;
-import com.kuxuan.laraver.net.callback.IError;
-import com.kuxuan.laraver.net.callback.IFailure;
-import com.kuxuan.laraver.net.callback.IRequest;
-import com.kuxuan.laraver.net.callback.ISuccess;
-import com.kuxuan.laraver.net.callback.RequestCallbacks;
-import com.kuxuan.laraver.net.download.DownloadHandler;
-import com.kuxuan.laraver.ui.LaraverLoader;
-import com.kuxuan.laraver.ui.LoaderStyle;
+import com.kuxuan.laraver.ui.loader.LaraverLoader;
+import com.kuxuan.laraver.ui.loader.LoaderStyle;
+
 
 import java.io.File;
 import java.util.Map;

laraver-core/src/main/java/com/kuxuan/laraver/net/rx/RxRestClientBuilder.java

@@ -2,13 +2,10 @@ package com.kuxuan.laraver.net.rx;
 
 import android.content.Context;
 
-import com.kuxuan.laraver.net.RestClient;
+
 import com.kuxuan.laraver.net.RestCreator;
-import com.kuxuan.laraver.net.callback.IError;
-import com.kuxuan.laraver.net.callback.IFailure;
-import com.kuxuan.laraver.net.callback.IRequest;
-import com.kuxuan.laraver.net.callback.ISuccess;
-import com.kuxuan.laraver.ui.LoaderStyle;
+import com.kuxuan.laraver.ui.loader.LoaderStyle;
+
 
 import java.io.File;
 import java.util.WeakHashMap;

laraver-core/src/main/java/com/kuxuan/laraver/ui/loader/LaraverLoader.java

@@ -0,0 +1,71 @@
+package com.kuxuan.laraver.ui.loader;
+
+import android.content.Context;
+import android.support.v7.app.AppCompatDialog;
+import android.view.Gravity;
+import android.view.Window;
+import android.view.WindowManager;
+
+import com.kuxuan.laraver.R;
+import com.kuxuan.laraver.util.dimen.DimenUtil;
+import com.wang.avi.AVLoadingIndicatorView;
+
+import java.util.ArrayList;
+
+
+/**
+ *
+ * @author huangfuruixin
+ * @date 2017/12/6
+ */
+
+public class LaraverLoader {
+    private static final int LOADER_SIZE_SCALE = 8;
+    private static final int LOADER_OFFSET_SCALE = 10;
+
+    private static final ArrayList<AppCompatDialog> LOADERS = new ArrayList<>();
+
+    private static final String DEFAULT_LOADER = LoaderStyle.BallClipRotatePulseIndicator.name();
+
+    public static void showLoading(Context context, Enum<LoaderStyle> type) {
+        showLoading(context, type.name());
+    }
+
+    public static void showLoading(Context context, String type) {
+
+        final AppCompatDialog dialog = new AppCompatDialog(context, R.style.dialog);
+
+        final AVLoadingIndicatorView avLoadingIndicatorView = LoaderCreator.create(type, context);
+        dialog.setContentView(avLoadingIndicatorView);
+
+        int deviceWidth = DimenUtil.getScreenWidth();
+        int deviceHeight = DimenUtil.getScreenHeight();
+
+        final Window dialogWindow = dialog.getWindow();
+
+        if (dialogWindow != null) {
+            final WindowManager.LayoutParams lp = dialogWindow.getAttributes();
+            lp.width = deviceWidth / LOADER_SIZE_SCALE;
+            lp.height = deviceHeight / LOADER_SIZE_SCALE;
+            lp.height = lp.height + deviceHeight / LOADER_OFFSET_SCALE;
+            lp.gravity = Gravity.CENTER;
+        }
+        LOADERS.add(dialog);
+        dialog.show();
+    }
+
+    public static void showLoading(Context context) {
+        showLoading(context, DEFAULT_LOADER);
+    }
+
+    public static void stopLoading() {
+        for (AppCompatDialog dialog : LOADERS) {
+            if (dialog != null) {
+                if (dialog.isShowing()) {
+                    dialog.cancel();
+                }
+            }
+        }
+    }
+
+}

laraver-core/src/main/java/com/kuxuan/laraver/ui/loader/LoaderCreator.java

@@ -0,0 +1,51 @@
+package com.kuxuan.laraver.ui.loader;
+
+import android.content.Context;
+
+import com.wang.avi.AVLoadingIndicatorView;
+import com.wang.avi.Indicator;
+
+import java.util.WeakHashMap;
+
+/**
+ * 为反射创建缓存，提高性能
+ * @author huangfuruixin
+ * @date 2017/12/6
+ */
+
+public class LoaderCreator {
+    private static final WeakHashMap<String,Indicator> LOADING_MAP = new WeakHashMap<>();
+
+
+    static AVLoadingIndicatorView create(String type,Context context){
+        final AVLoadingIndicatorView avLoadingIndicatorView = new AVLoadingIndicatorView(context);
+        if (LOADING_MAP.get(type) == null){
+            final Indicator indicator = getIndicator(type);
+            LOADING_MAP.put(type,indicator);
+        }
+        avLoadingIndicatorView.setIndicator(LOADING_MAP.get(type));
+        return avLoadingIndicatorView;
+    }
+
+    private static Indicator getIndicator(String name){
+        if(name ==null||name.isEmpty()){
+            return null;
+        }
+        final StringBuilder drawableClassName = new StringBuilder();
+        if(!name.contains(".")){
+            final String defaultPackName = AVLoadingIndicatorView.class.getPackage().getName();
+            drawableClassName.append(defaultPackName)
+                    .append(".indicators")
+                    .append(".");
+        }
+
+        drawableClassName.append(name);
+        try {
+            final Class<?> drawableClass = Class.forName(drawableClassName.toString());
+            return (Indicator) drawableClass.newInstance();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

laraver-core/src/main/java/com/kuxuan/laraver/ui/loader/LoaderStyle.java

@@ -0,0 +1,40 @@
+package com.kuxuan.laraver.ui.loader;
+
+/**
+ *
+ * @author huangfuruixin
+ * @date 2017/12/6
+ */
+
+@SuppressWarnings("unused")
+public enum LoaderStyle {
+    BallPulseIndicator,
+    BallGridPulseIndicator,
+    BallClipRotateIndicator,
+    BallClipRotatePulseIndicator,
+    SquareSpinIndicator,
+    BallClipRotateMultipleIndicator,
+    BallPulseRiseIndicator,
+    BallRotateIndicator,
+    CubeTransitionIndicator,
+    BallZigZagIndicator,
+    BallZigZagDeflectIndicator,
+    BallTrianglePathIndicator,
+    BallScaleIndicator,
+    LineScaleIndicator,
+    LineScalePartyIndicator,
+    BallScaleMultipleIndicator,
+    BallPulseSyncIndicator,
+    BallBeatIndicator,
+    LineScalePulseOutIndicator,
+    LineScalePulseOutRapidIndicator,
+    BallScaleRippleIndicator,
+    BallScaleRippleMultipleIndicator,
+    BallSpinFadeLoaderIndicator,
+    LineSpinFadeLoaderIndicator,
+    TriangleSkewSpinIndicator,
+    PacmanIndicator,
+    BallGridBeatIndicator,
+    SemiCircleSpinIndicator,
+    CustomIndicator
+}