新增:FastStackUtil 退出程序是否杀死程序exit(boolean kill)

新增:FastRetryWhen 检查联网状态以操作重试机制

Author: AriesHoo

app/src/main/java/com/aries/library/fast/demo/impl/ActivityControlImpl.java

@@ -7,6 +7,7 @@
 import android.graphics.Color;
 import android.media.AudioManager;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
@@ -309,6 +310,12 @@ public void onFragmentPaused(FragmentManager fm, Fragment f) {
                 LoggerManager.i(TAG, "onFragmentPaused:统计Fragment:" + f.getClass().getSimpleName());
                 MobclickAgent.onPageEnd(f.getClass().getSimpleName());
             }
+
+            @Override
+            public void onFragmentDestroyed(@NonNull FragmentManager fm, @NonNull Fragment f) {
+                super.onFragmentDestroyed(fm, f);
+                LoggerManager.i(TAG, "onFragmentDestroyed:" + f.getClass().getSimpleName());
+            }
         };
     }
 

app/src/main/java/com/aries/library/fast/demo/impl/AppImpl.java

@@ -202,7 +202,7 @@ public long quipApp(boolean isFirst, Activity activity) {
         if (isFirst) {
             ToastUtil.show(R.string.fast_quit_app);
         } else {
-            FastStackUtil.getInstance().exit();
+            FastStackUtil.getInstance().exit(false);
         }
         return 2000;
     }

library/src/main/java/com/aries/library/fast/retrofit/FastRetryWhen.java

@@ -1,7 +1,10 @@
 package com.aries.library.fast.retrofit;
 
 
+import android.content.Context;
+
 import com.aries.library.fast.manager.LoggerManager;
+import com.aries.library.fast.util.NetworkUtil;
 
 import java.net.ConnectException;
 import java.net.SocketException;
@@ -18,30 +21,59 @@
  * @Author: AriesHoo on 2018/10/10 15:42
  * @E-Mail: AriesHoo@126.com
  * @Function: RxJava 重试机制--retryWhen操作符{@link Observable#retryWhen(Function)}
- * @Description:
+ * @Description: 1、2019-1-7 17:57:09 新增Context参数以检查网络连接状态定向重试机制
  */
 public class FastRetryWhen implements Function<Observable<? extends Throwable>, ObservableSource<?>> {
+
+    private Context mContext;
     /**
      * 最大尝试次数--不包含原始请求次数
      */
-    private final int mRetryMaxTime;
+    private int mRetryMaxTime;
     /**
      * 尝试时间间隔ms
      */
-    private final long mRetryDelay;
+    private long mRetryDelay;
     /**
      * 记录已尝试次数
      */
     private int mRetryCount;
     private String TAG = getClass().getSimpleName();
 
-    public FastRetryWhen(int retryMaxTime, long retryDelay) {
+    public FastRetryWhen(Context context, int retryMaxTime, long retryDelay) {
+        this.mContext = context;
         this.mRetryMaxTime = retryMaxTime;
         this.mRetryDelay = retryDelay;
     }
 
+    public FastRetryWhen(Context context) {
+        this(context, 3, 500);
+    }
+
     public FastRetryWhen() {
-        this(3, 500);
+        this(null);
+    }
+
+    /**
+     * 重试间隔
+     *
+     * @param delay
+     * @return
+     */
+    public FastRetryWhen setRetryDelay(long delay) {
+        mRetryDelay = delay;
+        return this;
+    }
+
+    /**
+     * 重试次数
+     *
+     * @param time
+     * @return
+     */
+    public FastRetryWhen setRetryMaxTime(int time) {
+        mRetryMaxTime = time;
+        return this;
     }
 
     /**
@@ -55,6 +87,10 @@ public Observable<?> apply(Observable<? extends Throwable> observable) {
         return observable.flatMap(new Function<Throwable, ObservableSource<?>>() {
             @Override
             public ObservableSource<?> apply(Throwable throwable) {
+                //未连接网络直接返回异常
+                if (NetworkUtil.isConnected(mContext)) {
+                    return Observable.error(throwable);
+                }
                 //仅仅对连接失败相关错误进行重试
                 if (throwable instanceof ConnectException
                         || throwable instanceof UnknownHostException

library/src/main/java/com/aries/library/fast/util/FastStackUtil.java

@@ -16,6 +16,7 @@
  * 2、2018-7-30 10:00:45 修改方法返回值
  * 3、2018-11-29 11:44:16 新增{@link #pop(Activity, boolean)} 增加是否调用finish()方法参数,避免因Activity状态变换(如横竖屏切换)造成onActivityDestroyed时候切换回来状态无法保存
  * 即:{@link Activity#onCreate(Bundle)} onCreate(Bundle savedInstanceState)  savedInstanceState对象为空-因为pop的时候已将其finish
+ * 4、2019-1-7 17:51:08 新增{@link #exit(boolean)} 是否杀死进程控制
  */
 public class FastStackUtil {
     private final String TAG = this.getClass().getSimpleName();
@@ -180,16 +181,25 @@ public FastStackUtil popAllExceptCurrent() {
         }
     }
 
+    public FastStackUtil exit() {
+        return exit(true);
+    }
+
     /**
      * 应用程序退出
+     *
+     * @param kill 是否杀掉进程
+     * @return
      */
-    public FastStackUtil exit() {
+    public FastStackUtil exit(boolean kill) {
         try {
             popAll();
-            //退出JVM(java虚拟机),释放所占内存资源,0表示正常退出(非0的都为异常退出)
-            System.exit(0);
-            //从操作系统中结束掉当前程序的进程
-            android.os.Process.killProcess(android.os.Process.myPid());
+            if (kill) {
+                //退出JVM(java虚拟机),释放所占内存资源,0表示正常退出(非0的都为异常退出)
+                System.exit(0);
+                //从操作系统中结束掉当前程序的进程
+                android.os.Process.killProcess(android.os.Process.myPid());
+            }
         } catch (Exception e) {
             System.exit(-1);
             LoggerManager.e(TAG, "exit():" + e.getMessage());