Skip to content

Commit a4f61c2

Browse files
committed
remove EasyThread library
1 parent 16ae3e2 commit a4f61c2

File tree

3 files changed

+23
-25
lines changed

3 files changed

+23
-25
lines changed

app/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ dependencies {
2828
implementation 'com.android.support:appcompat-v7:27.1.1'
2929

3030
implementation 'com.alibaba:fastjson:1.2.46'
31-
implementation 'com.github.yjfnypeu:EasyThread:0.6.0'
3231

3332
implementation "com.jakewharton:butterknife:$butterknife_version"
3433
kapt "com.jakewharton:butterknife-compiler:$butterknife_version"
3534

3635
implementation project(':utils')
37-
// implementation 'com.github.yjfnypeu:EasyAndroid:1.0.9'
36+
// implementation 'com.github.yjfnypeu:EasyAndroid:1.1.0'
3837
}

app/src/main/java/com/haoge/sample/easyandroid/activities/EasyResultActivity.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.content.Intent
44
import butterknife.OnClick
55
import com.haoge.easyandroid.easy.EasyActivityResult
66
import com.haoge.easyandroid.easy.EasyLog
7+
import com.haoge.easyandroid.easy.EasyToast
78
import com.haoge.sample.easyandroid.BaseActivity
89
import com.haoge.sample.easyandroid.R
910

@@ -20,23 +21,23 @@ class EasyResultActivity: BaseActivity() {
2021
fun normalStart() {
2122
EasyActivityResult.startActivity(this,
2223
Intent(this, EasyToastActivity::class.java),
23-
{_, _ -> EasyLog.DEFAULT.e("正常启动模式接收返回信息") })
24+
{_, _ -> EasyToast.DEFAULT.show("正常启动模式接收返回信息") })
2425
}
2526

2627
@OnClick(R.id.violentStart)
2728
fun violentStart() {
2829
// 暴击启动测试:同时被调用启动多次,应只有第一次启动成功
2930
EasyActivityResult.startActivity(this,
3031
Intent(this, EasyToastActivity::class.java),
31-
{_, _ -> EasyLog.DEFAULT.e("暴击启动测试:第一次启动任务 接收返回信息") })
32+
{_, _ -> EasyToast.DEFAULT.show("暴击启动测试:第一次启动任务 接收返回信息") })
3233

3334
EasyActivityResult.startActivity(this,
3435
Intent(this, EasyToastActivity::class.java),
35-
{_, _ -> EasyLog.DEFAULT.e("暴击启动测试:第二次启动任务 接收返回信息") })
36+
{_, _ -> EasyToast.DEFAULT.show("暴击启动测试:第二次启动任务 接收返回信息") })
3637

3738
EasyActivityResult.startActivity(this,
3839
Intent(this, EasyToastActivity::class.java),
39-
{_, _ -> EasyLog.DEFAULT.e("暴击启动测试:第三次启动任务 接收返回信息") })
40+
{_, _ -> EasyToast.DEFAULT.show("暴击启动测试:第三次启动任务 接收返回信息") })
4041
}
4142

4243
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

app/src/main/java/com/haoge/sample/easyandroid/activities/mvp/MVPDemoActivity.kt

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.haoge.sample.easyandroid.activities.mvp
22

33
import android.os.Bundle
4+
import com.haoge.easyandroid.easy.EasyExecutor
45
import com.haoge.easyandroid.easy.EasyToast
56
import com.haoge.easyandroid.mvp.MVPPresenter
67
import com.haoge.easyandroid.mvp.MVPView
78
import com.haoge.sample.easyandroid.R
8-
import com.lzh.easythread.AsyncCallback
9-
import com.lzh.easythread.EasyThread
9+
import java.util.concurrent.Callable
1010

1111
/**
1212
* @author haoge on 2018/5/30
@@ -34,29 +34,27 @@ interface DemoView:MVPView {
3434

3535
// P层数据处理:处理与界面无关的、与数据处理相关的逻辑。并用于连接M与V层的中间件
3636
class DemoPresenter(view:DemoView):MVPPresenter<DemoView>(view) {
37-
val executor: EasyThread by lazy { EasyThread.Builder.createSingle().build() }
37+
val executor: EasyExecutor by lazy { EasyExecutor.newBuilder(1)
38+
.onError { _, _ ->
39+
if (!isViewAttached()) return@onError
40+
view.hideLoadingDialog()
41+
}
42+
.build() }
3843

3944
fun requestData() {
4045
view?.showLoadingDialog()
4146

4247
// 使用线程池模拟网络请求环境。
43-
executor.async({
48+
executor.async(Callable {
4449
Thread.sleep(3000)
45-
return@async "Hello world"
46-
}, object : AsyncCallback<String>{
47-
override fun onSuccess(t: String?) {
48-
// 对于异步网络操作,回调时尽量先判断一下是否处于View绑定状态。
49-
if (!isViewAttached()) return
50-
51-
view?.hideLoadingDialog()
52-
view?.onQuerySuccess(t)
53-
}
54-
55-
override fun onFailed(t: Throwable?) {
56-
view?.hideLoadingDialog()
57-
view?.toastMessage("获取数据失败:Cause by -> ${t?.message?:"未知错误"}")
58-
}
59-
})
50+
return@Callable "Hello world!"
51+
}) {
52+
// 对于异步网络操作,回调时尽量先判断一下是否处于View绑定状态。
53+
if (!isViewAttached()) return@async
54+
55+
view?.hideLoadingDialog()
56+
view?.onQuerySuccess(it)
57+
}
6058
}
6159

6260
}

0 commit comments

Comments
 (0)