Skip to content

Commit e43e337

Browse files
yjfnypeuyjfnypeu
committed
some optimize
1 parent b6bf1b5 commit e43e337

File tree

10 files changed

+26
-43
lines changed

10 files changed

+26
-43
lines changed

‎app/app.iml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
3938
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4039
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4140
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4241
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4342
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4443
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4544
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4646
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4848
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -67,14 +67,6 @@
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -83,6 +75,14 @@
8375
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/UpdateConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public UpdateConfig strategy(UpdateStrategy strategy) {
181181

182182
public Context getContext() {
183183
if (context == null) {
184-
throw new RuntimeException("should call UpdateConfig.install first");
184+
throw new RuntimeException("should call UpdateConfig.init(context) first");
185185
}
186186
return context;
187187
}

‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/Updater.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.lzh.framework.updatepluginlib.callback.DefaultDownloadCB;
1111
import org.lzh.framework.updatepluginlib.model.Update;
1212

13-
public class Updater {
13+
public final class Updater {
1414
private static Updater updater;
1515
private IUpdateExecutor executor;
1616

@@ -40,11 +40,8 @@ public void checkUpdate(UpdateBuilder builder) {
4040
checkCB.onCheckError(-1,"Already have a update task running");
4141
return;
4242
}
43-
checkWorker.setEntity(builder.getCheckEntity());
44-
checkWorker.setParser(builder.getJsonParser());
45-
checkWorker.setChecker(builder.getUpdateChecker());
43+
checkWorker.setBuilder(builder);
4644
checkWorker.setCheckCB(checkCB);
47-
4845
executor.check(checkWorker);
4946
}
5047

@@ -58,7 +55,6 @@ public void downUpdate(Update update,UpdateBuilder builder) {
5855
DefaultDownloadCB downloadCB = new DefaultDownloadCB();
5956
downloadCB.setBuilder(builder);
6057
downloadCB.setUpdate(update);
61-
downloadCB.setDownloadCB(builder.getDownloadCB());
6258

6359
DownloadWorker downloadWorker = builder.getDownloadWorker();
6460
if (downloadWorker.isRunning()) {
@@ -67,7 +63,7 @@ public void downUpdate(Update update,UpdateBuilder builder) {
6763
return;
6864
}
6965

70-
downloadWorker.setUrl(update.getUpdateUrl());
66+
downloadWorker.setUpdate(update);
7167
downloadWorker.setDownloadCB(downloadCB);
7268
downloadWorker.setCacheFileName(builder.getFileCreator().create(update.getVersionName()));
7369

‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/business/DownloadWorker.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.lzh.framework.updatepluginlib.business;
22

3+
import org.lzh.framework.updatepluginlib.UpdateBuilder;
34
import org.lzh.framework.updatepluginlib.callback.UpdateDownloadCB;
45
import org.lzh.framework.updatepluginlib.model.Update;
56
import org.lzh.framework.updatepluginlib.util.HandlerUtil;
@@ -27,12 +28,9 @@ public abstract class DownloadWorker extends UnifiedWorker implements Runnable,R
2728
protected File cacheFileName;
2829
protected Update update;
2930

30-
public void setUrl(String url) {
31-
this.url = url;
32-
}
33-
3431
public void setUpdate(Update update) {
3532
this.update = update;
33+
this.url = update.getUpdateUrl();
3634
}
3735

3836
public void setCacheFileName(File cacheFileName) {

‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/business/IUpdateExecutor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
public interface IUpdateExecutor {
44

55
/**
6-
* check if is new version exist;
6+
* Launch a <b>Check</b> task which checks if is new version exist;
77
*/
88
void check(UpdateWorker worker);
99

1010
/**
11-
* request download new version apk
11+
* Launch a <b>Download</b> task that requests download new version apk
1212
* @param worker The DownloadWorker task
1313
*/
1414
void download(DownloadWorker worker);

‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/business/UpdateWorker.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.lzh.framework.updatepluginlib.business;
22

3+
import org.lzh.framework.updatepluginlib.UpdateBuilder;
34
import org.lzh.framework.updatepluginlib.callback.UpdateCheckCB;
45
import org.lzh.framework.updatepluginlib.model.CheckEntity;
56
import org.lzh.framework.updatepluginlib.model.Update;
@@ -34,22 +35,16 @@ public abstract class UpdateWorker extends UnifiedWorker implements Runnable,Rec
3435
*/
3536
protected UpdateParser parser;
3637

37-
public void setEntity(CheckEntity entity) {
38-
this.entity = entity;
38+
public void setBuilder (UpdateBuilder builder) {
39+
this.entity = builder.getCheckEntity();
40+
this.checker = builder.getUpdateChecker();
41+
this.parser = builder.getJsonParser();
3942
}
4043

41-
public void setCheckCB(UpdateCheckCB checkCB) {
44+
public void setCheckCB (UpdateCheckCB checkCB) {
4245
this.checkCB = checkCB;
4346
}
4447

45-
public void setParser(UpdateParser parser) {
46-
this.parser = parser;
47-
}
48-
49-
public void setChecker(UpdateChecker checker) {
50-
this.checker = checker;
51-
}
52-
5348
@Override
5449
public void run() {
5550
try {
@@ -120,5 +115,6 @@ public void release() {
120115
this.checkCB = null;
121116
this.checker = null;
122117
this.parser = null;
118+
this.entity = null;
123119
}
124120
}

‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/callback/DefaultCheckCB.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
/**
1616
* default check callback to receive update event send by {@link org.lzh.framework.updatepluginlib.business.UpdateWorker}
1717
*/
18-
public class DefaultCheckCB implements UpdateCheckCB,Recyclable {
18+
public final class DefaultCheckCB implements UpdateCheckCB,Recyclable {
1919

2020
private UpdateBuilder builder;
2121
private UpdateCheckCB checkCB;

‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/callback/DefaultDownloadCB.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* The default download callback to receive update event send by {@link org.lzh.framework.updatepluginlib.business.DownloadWorker}
1919
* @author lzh
2020
*/
21-
public class DefaultDownloadCB implements UpdateDownloadCB ,Recyclable {
21+
public final class DefaultDownloadCB implements UpdateDownloadCB ,Recyclable {
2222

2323
private UpdateBuilder builder;
2424
/**
@@ -42,10 +42,6 @@ public void setUpdate(Update update) {
4242
this.update = update;
4343
}
4444

45-
public void setDownloadCB(UpdateDownloadCB downloadCB) {
46-
this.downloadCB = downloadCB;
47-
}
48-
4945
/**
5046
* Receive and pass download_start event send by {@link DownloadWorker#sendUpdateStart()}
5147
*/

‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/util/ActivityManager.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package org.lzh.framework.updatepluginlib.util;
22

3-
import android.annotation.TargetApi;
43
import android.app.Activity;
54
import android.app.Application;
65
import android.content.Context;
7-
import android.os.Build;
86
import android.os.Bundle;
97

108
import java.util.LinkedList;

‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/util/UpdatePreference.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public static void saveDownloadTotalSize(String url, long totalSize) {
4040

4141
public static Set<String> getIgnoreVersions () {
4242
Set<String> ignoreVersions = getUpdatePref().getStringSet("ignoreVersions", new HashSet<String>());
43-
System.out.println("ignoreVersions = " + ignoreVersions);
4443
return ignoreVersions;
4544
}
4645

0 commit comments

Comments
 (0)