Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	app/build.gradle
#	build.gradle
#	library/build.gradle

Author: AriesHoo@126.com

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

@@ -15,11 +15,11 @@
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
+import com.aries.library.fast.BuildConfig;
 import com.aries.library.fast.FastLifecycleCallbacks;
 import com.aries.library.fast.basis.BasisActivity;
 import com.aries.library.fast.basis.BasisFragment;
 import com.aries.library.fast.demo.App;
-import com.aries.library.fast.demo.BuildConfig;
 import com.aries.library.fast.demo.R;
 import com.aries.library.fast.demo.module.SplashActivity;
 import com.aries.library.fast.demo.module.main.MainActivity;

app/src/main/java/com/aries/library/fast/demo/retrofit/repository/BaseRepository.java

@@ -33,7 +33,7 @@ protected <T> Observable<T> transform(Observable<BaseEntity<T>> observable) {
                             } else {
                                 if (result.success) {
                                     return result.data != null ? Observable.just(result.data)
-                                            : Observable.error(new FastNullException("没有数据"));
+                                            : Observable.error(new FastNullException());
                                 } else {
                                     return Observable.error(new NetworkErrorException());
                                 }

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

@@ -11,15 +11,19 @@ public class FastNullException extends Exception {
 
     public int errorCode;
 
-    public FastNullException(String message, int errorCode) {
-        super(message);
-        this.errorCode = errorCode;
+    public FastNullException() {
+        this("");
     }
 
     public FastNullException(String message) {
         this(message, -1);
     }
 
+    public FastNullException(String message, int errorCode) {
+        super(message);
+        this.errorCode = errorCode;
+    }
+
     public FastNullException(String message, Throwable cause) {
         super(message, cause);
     }

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

@@ -5,6 +5,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Looper;
+import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.widget.Toast;
@@ -13,7 +14,6 @@
 import com.aries.library.fast.FastManager;
 import com.aries.library.fast.R;
 import com.aries.library.fast.i.ToastControl;
-import com.aries.ui.util.RomUtil;
 import com.aries.ui.view.radius.RadiusTextView;
 
 import androidx.annotation.ColorInt;
@@ -133,6 +133,10 @@ public void onComplete() {
     }
 
     private static void showToast(CharSequence content, boolean isShowRunningForeground, Builder builder) {
+        //过滤空字符情况
+        if (TextUtils.isEmpty(content) || TextUtils.isEmpty(content.toString().trim())) {
+            return;
+        }
         //修复快速点击无法显示的问题,修复超过50之后无法显示的问题
         sSystemToast = SingleToast.getInstance();
         sTextView = new RadiusTextView(sContext);