Skip to content

Commit 0e2540c

Browse files
committed
ToastUtil增加空字符判定
1 parent ffa0830 commit 0e2540c

File tree

7 files changed

+17
-8
lines changed

7 files changed

+17
-8
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ dependencies {
7777
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
7878
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
7979
testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
80-
implementation 'com.github.AriesHoo.UIWidget:widget-core:3.2.14'
80+
implementation 'com.github.AriesHoo.UIWidget:widget-core:'.concat(widgetVersionName)
8181

8282
//以下库FastLib里使用compileOnly只是编译,使用时需根据项目选择相应版本
8383
implementation 'com.google.android.material:material:'.concat(supportVersion)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
import android.widget.ImageView;
1616
import android.widget.RelativeLayout;
1717

18+
import com.aries.library.fast.BuildConfig;
1819
import com.aries.library.fast.FastLifecycleCallbacks;
1920
import com.aries.library.fast.basis.BasisActivity;
2021
import com.aries.library.fast.basis.BasisFragment;
2122
import com.aries.library.fast.demo.App;
22-
import com.aries.library.fast.demo.BuildConfig;
2323
import com.aries.library.fast.demo.R;
2424
import com.aries.library.fast.demo.module.SplashActivity;
2525
import com.aries.library.fast.demo.module.main.MainActivity;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected <T> Observable<T> transform(Observable<BaseEntity<T>> observable) {
3333
} else {
3434
if (result.success) {
3535
return result.data != null ? Observable.just(result.data)
36-
: Observable.error(new FastNullException("没有数据"));
36+
: Observable.error(new FastNullException());
3737
} else {
3838
return Observable.error(new NetworkErrorException());
3939
}

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ ext{
3131
supportVersion = "1.0.0"
3232
versionCode = 240
3333
versionName = "2.2.13_beta8"
34+
widgetVersionName = "3.2.15"
3435
}

library/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ dependencies {
6565
//图片加载
6666
compileOnly 'com.github.bumptech.glide:glide:4.8.0'
6767
//常用UI控件(TitleBarView、RadiusView等)
68-
api 'com.github.AriesHoo.UIWidget:widget-core:3.2.13'
68+
api 'com.github.AriesHoo.UIWidget:widget-core:'.concat(widgetVersionName)
6969
//日志打印
7070
api 'com.orhanobut:logger:2.2.0'
7171
//注解

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,19 @@ public class FastNullException extends Exception {
1111

1212
public int errorCode;
1313

14-
public FastNullException(String message, int errorCode) {
15-
super(message);
16-
this.errorCode = errorCode;
14+
public FastNullException() {
15+
this("");
1716
}
1817

1918
public FastNullException(String message) {
2019
this(message, -1);
2120
}
2221

22+
public FastNullException(String message, int errorCode) {
23+
super(message);
24+
this.errorCode = errorCode;
25+
}
26+
2327
public FastNullException(String message, Throwable cause) {
2428
super(message, cause);
2529
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.graphics.drawable.Drawable;
66
import android.os.Build;
77
import android.os.Looper;
8+
import android.text.TextUtils;
89
import android.util.TypedValue;
910
import android.view.Gravity;
1011
import android.widget.Toast;
@@ -13,7 +14,6 @@
1314
import com.aries.library.fast.FastManager;
1415
import com.aries.library.fast.R;
1516
import com.aries.library.fast.i.ToastControl;
16-
import com.aries.ui.util.RomUtil;
1717
import com.aries.ui.view.radius.RadiusTextView;
1818

1919
import androidx.annotation.ColorInt;
@@ -133,6 +133,10 @@ public void onComplete() {
133133
}
134134

135135
private static void showToast(CharSequence content, boolean isShowRunningForeground, Builder builder) {
136+
//过滤空字符情况
137+
if (TextUtils.isEmpty(content) || TextUtils.isEmpty(content.toString().trim())) {
138+
return;
139+
}
136140
//修复快速点击无法显示的问题,修复超过50之后无法显示的问题
137141
sSystemToast = SingleToast.getInstance();
138142
sTextView = new RadiusTextView(sContext);

0 commit comments

Comments
 (0)