Skip to content

Commit 58eeea9

Browse files
BlankjBlankj
committed
see 05/23 log
1 parent 42db6de commit 58eeea9

File tree

7 files changed

+82
-73
lines changed

7 files changed

+82
-73
lines changed

‎app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ android {
4747

4848
dependencies {
4949
implementation fileTree(include: ['*.jar'], dir: 'libs')
50-
implementation project(':utilcode')
50+
// implementation project(':utilcode')
5151
implementation project(':subutil')
5252

5353
implementation "com.android.support:appcompat-v7:$support_version"
@@ -56,7 +56,7 @@ dependencies {
5656
// LeakCanary
5757
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
5858
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
59-
// implementation 'com.blankj:utilcode:1.16.0'
59+
implementation 'com.blankj:utilcode:1.16.0'
6060
}
6161

6262

‎app/src/main/java/com/blankj/androidutilcode/feature/core/app/AppActivity.java

+15-7
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
import com.blankj.androidutilcode.Config;
1111
import com.blankj.androidutilcode.R;
1212
import com.blankj.androidutilcode.base.BaseBackActivity;
13-
import com.blankj.androidutilcode.helper.AssertHelper;
1413
import com.blankj.androidutilcode.helper.PermissionHelper;
1514
import com.blankj.utilcode.util.AppUtils;
15+
import com.blankj.utilcode.util.FileUtils;
16+
import com.blankj.utilcode.util.LogUtils;
1617
import com.blankj.utilcode.util.SpanUtils;
1718
import com.blankj.utilcode.util.ToastUtils;
1819

@@ -76,6 +77,13 @@ public void doBusiness() {
7677

7778
}
7879

80+
OnReleasedListener listener = new OnReleasedListener() {
81+
@Override
82+
public void onReleased() {
83+
AppUtils.installApp(Config.TEST_APK_PATH);
84+
}
85+
};
86+
7987
@Override
8088
public void onWidgetClick(View view) {
8189
switch (view.getId()) {
@@ -86,12 +94,12 @@ public void onWidgetClick(View view) {
8694
PermissionHelper.requestStorage(new PermissionHelper.OnPermissionGrantedListener() {
8795
@Override
8896
public void onPermissionGranted() {
89-
AssertHelper.releaseInstallApk(new AssertHelper.OnReleasedListener() {
90-
@Override
91-
public void onReleased() {
92-
AppUtils.installApp(Config.TEST_APK_PATH);
93-
}
94-
});
97+
if (!FileUtils.isFileExists(Config.TEST_APK_PATH)) {
98+
new ReleaseInstallApkTask(listener).execute();
99+
} else {
100+
listener.onReleased();
101+
LogUtils.d("test apk existed.");
102+
}
95103
}
96104
});
97105
}

‎app/src/main/java/com/blankj/androidutilcode/feature/core/app/OnReleasedListener.java

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.blankj.androidutilcode.feature.core.app;
2+
3+
/**
4+
* <pre>
5+
* author: Blankj
6+
* blog : http://blankj.com
7+
* time : 2018/05/23
8+
* desc :
9+
* </pre>
10+
*/
11+
public interface OnReleasedListener {
12+
void onReleased();
13+
}

‎app/src/main/java/com/blankj/androidutilcode/feature/core/app/ReleaseInstallApkTask.java

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package com.blankj.androidutilcode.feature.core.app;
2+
3+
import com.blankj.androidutilcode.Config;
4+
import com.blankj.utilcode.util.ResourceUtils;
5+
import com.blankj.utilcode.util.ThreadUtils;
6+
7+
/**
8+
* <pre>
9+
* author: Blankj
10+
* blog : http://blankj.com
11+
* time : 2018/05/23
12+
* desc :
13+
* </pre>
14+
*/
15+
public class ReleaseInstallApkTask extends ThreadUtils.SimpleTask<Void> {
16+
17+
private OnReleasedListener mListener;
18+
19+
public ReleaseInstallApkTask(final OnReleasedListener listener) {
20+
mListener = listener;
21+
}
22+
23+
@Override
24+
public Void doInBackground() {
25+
ResourceUtils.copyFileFromAssets("test_install", Config.TEST_APK_PATH);
26+
return null;
27+
}
28+
29+
@Override
30+
public void onSuccess(Void result) {
31+
if (mListener != null) {
32+
mListener.onReleased();
33+
}
34+
}
35+
36+
public void execute() {
37+
ThreadUtils.executeByIo(this);
38+
}
39+
}

‎app/src/main/java/com/blankj/androidutilcode/helper/AssertHelper.java

-51
This file was deleted.

‎utilcode/src/main/java/com/blankj/utilcode/util/ThreadUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ public void run() {
482482
}
483483
}
484484

485-
private void cancel() {
485+
public void cancel() {
486486
if (state != NEW) return;
487487

488488
state = CANCELLED;

‎utilcode/src/test/java/com/blankj/utilcode/util/ThreadUtilsTest.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public String doInBackground() throws Throwable {
2828
if (index < 4) {
2929
return Thread.currentThread() + " :" + index;
3030
} else if (index < 7) {
31-
ThreadUtils.cancel(this);
31+
cancel();
3232
return null;
3333
} else {
3434
throw new NullPointerException(String.valueOf(index));
@@ -57,7 +57,7 @@ public String doInBackground() throws Throwable {
5757
if (index < 4) {
5858
return Thread.currentThread() + " :" + index;
5959
} else if (index < 7) {
60-
ThreadUtils.cancel(this);
60+
cancel();
6161
return null;
6262
} else {
6363
throw new NullPointerException(String.valueOf(index));
@@ -86,7 +86,7 @@ public String doInBackground() throws Throwable {
8686
if (index < 4) {
8787
return Thread.currentThread() + " :" + index;
8888
} else if (index < 7) {
89-
ThreadUtils.cancel(this);
89+
cancel();
9090
return null;
9191
} else {
9292
throw new NullPointerException(String.valueOf(index));
@@ -115,7 +115,7 @@ public String doInBackground() throws Throwable {
115115
if (index < 4) {
116116
return Thread.currentThread() + " :" + index;
117117
} else if (index < 7) {
118-
ThreadUtils.cancel(this);
118+
cancel();
119119
return null;
120120
} else {
121121
throw new NullPointerException(String.valueOf(index));
@@ -144,7 +144,7 @@ public String doInBackground() throws Throwable {
144144
if (index < 4) {
145145
return Thread.currentThread() + " :" + index;
146146
} else if (index < 7) {
147-
ThreadUtils.cancel(this);
147+
cancel();
148148
return null;
149149
} else {
150150
throw new NullPointerException(String.valueOf(index));
@@ -173,7 +173,7 @@ public String doInBackground() throws Throwable {
173173
if (index < 4) {
174174
return Thread.currentThread() + " :" + index;
175175
} else if (index < 7) {
176-
ThreadUtils.cancel(this);
176+
cancel();
177177
return null;
178178
} else {
179179
throw new NullPointerException(String.valueOf(index));
@@ -202,7 +202,7 @@ public String doInBackground() throws Throwable {
202202
if (index < 4) {
203203
return Thread.currentThread() + " :" + index;
204204
} else if (index < 7) {
205-
ThreadUtils.cancel(this);
205+
cancel();
206206
return null;
207207
} else {
208208
throw new NullPointerException(String.valueOf(index));
@@ -231,7 +231,7 @@ public String doInBackground() throws Throwable {
231231
if (index < 4) {
232232
return Thread.currentThread() + " :" + index;
233233
} else if (index < 7) {
234-
ThreadUtils.cancel(this);
234+
cancel();
235235
return null;
236236
} else {
237237
throw new NullPointerException(String.valueOf(index));
@@ -260,7 +260,7 @@ public String doInBackground() throws Throwable {
260260
if (index < 4) {
261261
return Thread.currentThread() + " :" + index;
262262
} else if (index < 7) {
263-
ThreadUtils.cancel(this);
263+
cancel();
264264
return null;
265265
} else {
266266
throw new NullPointerException(String.valueOf(index));
@@ -289,7 +289,7 @@ public String doInBackground() throws Throwable {
289289
if (index < 4) {
290290
return Thread.currentThread() + " :" + index;
291291
} else if (index < 7) {
292-
ThreadUtils.cancel(this);
292+
cancel();
293293
return null;
294294
} else {
295295
throw new NullPointerException(String.valueOf(index));
@@ -318,7 +318,7 @@ public String doInBackground() throws Throwable {
318318
if (index < 4) {
319319
return Thread.currentThread() + " :" + index;
320320
} else if (index < 7) {
321-
ThreadUtils.cancel(this);
321+
cancel();
322322
return null;
323323
} else {
324324
throw new NullPointerException(String.valueOf(index));
@@ -347,7 +347,7 @@ public String doInBackground() throws Throwable {
347347
if (index < 4) {
348348
return Thread.currentThread() + " :" + index;
349349
} else if (index < 7) {
350-
ThreadUtils.cancel(this);
350+
cancel();
351351
return null;
352352
} else {
353353
throw new NullPointerException(String.valueOf(index));

0 commit comments

Comments
 (0)