Skip to content

Commit a3b83c4

Browse files
getActivitygetActivity
committed
修改 Toast 依赖项
1 parent 32d5d4b commit a3b83c4

File tree

6 files changed

+32
-32
lines changed

6 files changed

+32
-32
lines changed

‎HelpDoc.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ EasyHttp.post(this)
302302

303303
@Override
304304
public void onSucceed(HttpData<LoginBean> data) {
305-
ToastUtils.show("登录成功");
305+
toast("登录成功");
306306
}
307307
});
308308
```
@@ -358,12 +358,12 @@ EasyHttp.post(this)
358358

359359
@Override
360360
public void onSucceed(Void result) {
361-
ToastUtils.show("上传成功");
361+
toast("上传成功");
362362
}
363363

364364
@Override
365365
public void onFail(Exception e) {
366-
ToastUtils.show("上传失败");
366+
toast("上传失败");
367367
}
368368

369369
@Override
@@ -402,13 +402,13 @@ EasyHttp.download(this)
402402

403403
@Override
404404
public void onComplete(File file) {
405-
ToastUtils.show("下载完成：" + file.getPath());
406-
installApk(MainActivity.this, file);
405+
toast("下载完成：" + file.getPath());
406+
installApk(XxxActivity.this, file);
407407
}
408408

409409
@Override
410410
public void onError(File file, Exception e) {
411-
ToastUtils.show("下载出错：" + e.getMessage());
411+
toast("下载出错：" + e.getMessage());
412412
}
413413

414414
@Override
@@ -461,9 +461,9 @@ try {
461461
.api(new SearchBlogsApi()
462462
.setKeyword("搬砖不再有"))
463463
.execute(new ResponseClass<HttpData<SearchBean>>() {});
464-
ToastUtils.show("请求成功，请看日志");
464+
toast("请求成功，请看日志");
465465
} catch (Exception e) {
466-
ToastUtils.show(e.getMessage());
466+
toast(e.getMessage());
467467
}
468468
```
469469

@@ -645,7 +645,7 @@ lifecycleScope.launch(Dispatchers.IO) {
645645
// 在这里进行 UI 刷新
646646
}
647647
} catch (e: Exception) {
648-
ToastUtils.show(e.message)
648+
toast(e.message)
649649
}
650650
}
651651
```
@@ -1660,7 +1660,7 @@ Observable.create(new ObservableOnSubscribe<HttpData<SearchBean>>() {
16601660

16611661
@Override
16621662
public void accept(Throwable throwable) throws Exception {
1663-
ToastUtils.show(throwable.getMessage());
1663+
toast(throwable.getMessage());
16641664
}
16651665
});
16661666
```
@@ -1743,7 +1743,7 @@ Observable.create(new ObservableOnSubscribe<HttpData<SearchBean>>() {
17431743
17441744
@Override
17451745
public void accept(Throwable throwable) throws Exception {
1746-
ToastUtils.show(throwable.getMessage());
1746+
toast(throwable.getMessage());
17471747
}
17481748
});
17491749
```

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ EasyHttp.post(this)
223223

224224
* 权限框架：[XXPermissions](https://github.com/getActivity/XXPermissions) ![](https://img.shields.io/github/stars/getActivity/XXPermissions.svg) ![](https://img.shields.io/github/forks/getActivity/XXPermissions.svg)
225225

226-
* 吐司框架：[ToastUtils](https://github.com/getActivity/ToastUtils) ![](https://img.shields.io/github/stars/getActivity/ToastUtils.svg) ![](https://img.shields.io/github/forks/getActivity/ToastUtils.svg)
226+
* 吐司框架：[Toaster](https://github.com/getActivity/Toaster) ![](https://img.shields.io/github/stars/getActivity/Toaster.svg) ![](https://img.shields.io/github/forks/getActivity/Toaster.svg)
227227

228228
* 标题栏框架：[TitleBar](https://github.com/getActivity/TitleBar) ![](https://img.shields.io/github/stars/getActivity/TitleBar.svg) ![](https://img.shields.io/github/forks/getActivity/TitleBar.svg)
229229

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ dependencies {
7272
// noinspection GradleDependency
7373
implementation 'com.squareup.okhttp3:okhttp:3.12.13'
7474

75-
// 吐司框架：https://github.com/getActivity/ToastUtils
76-
implementation 'com.github.getActivity:ToastUtils:11.2'
75+
// 吐司框架：https://github.com/getActivity/Toaster
76+
implementation 'com.github.getActivity:Toaster:12.0'
7777

7878
// 权限请求框架：https://github.com/getActivity/XXPermissions
7979
implementation 'com.github.getActivity:XXPermissions:16.6'

‎app/src/main/java/com/hjq/easy/demo/AppApplication.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.hjq.http.model.HttpHeaders;
1414
import com.hjq.http.model.HttpParams;
1515
import com.hjq.http.request.HttpRequest;
16-
import com.hjq.toast.ToastUtils;
16+
import com.hjq.toast.Toaster;
1717
import com.tencent.mmkv.MMKV;
1818

1919
import okhttp3.OkHttpClient;
@@ -29,7 +29,7 @@ public final class AppApplication extends Application {
2929
@Override
3030
public void onCreate() {
3131
super.onCreate();
32-
ToastUtils.init(this);
32+
Toaster.init(this);
3333
MMKV.initialize(this);
3434

3535
// 网络请求框架初始化

‎app/src/main/java/com/hjq/easy/demo/BaseActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import com.hjq.easy.demo.http.model.HttpData;
88
import com.hjq.http.listener.OnHttpListener;
9-
import com.hjq.toast.ToastUtils;
9+
import com.hjq.toast.Toaster;
1010

1111
import okhttp3.Call;
1212

@@ -68,13 +68,13 @@ public void onStart(Call call) {
6868
@Override
6969
public void onSucceed(Object result) {
7070
if (result instanceof HttpData) {
71-
ToastUtils.show(((HttpData<?>) result).getMessage());
71+
Toaster.show(((HttpData<?>) result).getMessage());
7272
}
7373
}
7474

7575
@Override
7676
public void onFail(Exception e) {
77-
ToastUtils.show(e.getMessage());
77+
Toaster.show(e.getMessage());
7878
}
7979

8080
@Override

‎app/src/main/java/com/hjq/easy/demo/MainActivity.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import com.hjq.permissions.OnPermissionCallback;
3636
import com.hjq.permissions.Permission;
3737
import com.hjq.permissions.XXPermissions;
38-
import com.hjq.toast.ToastUtils;
38+
import com.hjq.toast.Toaster;
3939

4040
import java.io.File;
4141
import java.io.IOException;
@@ -97,10 +97,10 @@ public void onGranted(@NonNull List<String> permissions, boolean allGranted) {}
9797
@Override
9898
public void onDenied(@NonNull List<String> permissions, boolean doNotAskAgain) {
9999
if (doNotAskAgain) {
100-
ToastUtils.show("授权失败，请手动授予存储权限");
100+
Toaster.show("授权失败，请手动授予存储权限");
101101
XXPermissions.startPermissionActivity(this, permissions);
102102
} else {
103-
ToastUtils.show("请先授予存储权限");
103+
Toaster.show("请先授予存储权限");
104104
requestPermission();
105105
}
106106
}
@@ -127,7 +127,7 @@ public void onClick(View view) {
127127

128128
@Override
129129
public void onSucceed(HttpData<List<SearchAuthorApi.Bean>> result) {
130-
ToastUtils.show("Get 请求成功，请看日志");
130+
Toaster.show("Get 请求成功，请看日志");
131131
}
132132
});
133133

@@ -140,7 +140,7 @@ public void onSucceed(HttpData<List<SearchAuthorApi.Bean>> result) {
140140

141141
@Override
142142
public void onSucceed(HttpData<SearchBlogsApi.Bean> result) {
143-
ToastUtils.show("Post 请求成功，请看日志");
143+
Toaster.show("Post 请求成功，请看日志");
144144
}
145145
});
146146

@@ -154,17 +154,17 @@ public void onSucceed(HttpData<SearchBlogsApi.Bean> result) {
154154
.api(new SearchBlogsApi()
155155
.setKeyword("搬砖不再有"))
156156
.execute(new ResponseClass<HttpData<SearchBlogsApi.Bean>>() {});
157-
ToastUtils.show("同步请求成功，请看日志");
157+
Toaster.show("同步请求成功，请看日志");
158158
} catch (Exception e) {
159-
ToastUtils.show(e.getMessage());
159+
Toaster.show(e.getMessage());
160160
}
161161
runOnUiThread(this::hideDialog);
162162
}).start();
163163

164164
} else if (viewId == R.id.btn_main_update) {
165165

166166
if (mProgressBar.getVisibility() == View.VISIBLE) {
167-
ToastUtils.show("当前正在上传或者下载，请等待完成之后再进行操作");
167+
Toaster.show("当前正在上传或者下载，请等待完成之后再进行操作");
168168
return;
169169
}
170170

@@ -219,12 +219,12 @@ public void onProgress(int progress) {
219219

220220
@Override
221221
public void onSucceed(Void result) {
222-
ToastUtils.show("上传成功");
222+
Toaster.show("上传成功");
223223
}
224224

225225
@Override
226226
public void onFail(Exception e) {
227-
ToastUtils.show("上传失败");
227+
Toaster.show("上传失败");
228228
}
229229

230230
@Override
@@ -236,7 +236,7 @@ public void onEnd(Call call) {
236236
} else if (viewId == R.id.btn_main_download) {
237237

238238
if (mProgressBar.getVisibility() == View.VISIBLE) {
239-
ToastUtils.show("当前正在上传或者下载，请等待完成之后再进行操作");
239+
Toaster.show("当前正在上传或者下载，请等待完成之后再进行操作");
240240
return;
241241
}
242242

@@ -281,13 +281,13 @@ public void onProgress(File file, int progress) {
281281

282282
@Override
283283
public void onComplete(File file) {
284-
ToastUtils.show("下载完成：" + file.getPath());
284+
Toaster.show("下载完成：" + file.getPath());
285285
installApk(MainActivity.this, file);
286286
}
287287

288288
@Override
289289
public void onError(File file, Exception e) {
290-
ToastUtils.show(e.getMessage());
290+
Toaster.show(e.getMessage());
291291
if (e instanceof FileMD5Exception) {
292292
// 如果是文件 md5 校验失败，则删除文件
293293
file.delete();

0 commit comments

Comments
 (0)