Skip to content

Commit 6baeb5c

Browse files
yjfnypeuyjfnypeu
committed
release 2.3.0
1 parent 2e11b21 commit 6baeb5c

File tree

12 files changed

+68
-40
lines changed

12 files changed

+68
-40
lines changed

‎app/app.iml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.jakewharton/butterknife/8.5.1/jars" />
9999
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.squareup.leakcanary/leakcanary-android/1.4-beta2/jars" />
100100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.tbruyelle.rxpermissions/rxpermissions/0.9.2/jars" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.lzh.nonview.updateplugin/UpdatePlugin/2.3.0/jars" />
101102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
102103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
103104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
@@ -109,6 +110,8 @@
109110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
110111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
111112
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
113+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
114+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
112115
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
113116
</content>
114117
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
@@ -130,11 +133,11 @@
130133
<orderEntry type="library" exported="" name="rxpermissions-0.9.2" level="project" />
131134
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
132135
<orderEntry type="library" exported="" name="support-vector-drawable-25.1.0" level="project" />
136+
<orderEntry type="library" exported="" name="UpdatePlugin-2.3.0" level="project" />
133137
<orderEntry type="library" exported="" name="butterknife-8.5.1" level="project" />
134138
<orderEntry type="library" exported="" name="leakcanary-watcher-1.4-beta2" level="project" />
135139
<orderEntry type="library" exported="" name="appcompat-v7-25.1.0" level="project" />
136140
<orderEntry type="library" exported="" name="support-core-utils-25.1.0" level="project" />
137141
<orderEntry type="library" exported="" name="leakcanary-android-1.4-beta2" level="project" />
138-
<orderEntry type="module" module-name="updatepluginlib" exported="" />
139142
</component>
140143
</module>

‎app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
testCompile 'junit:junit:4.12'
2727
// compile project(':updatepluginlib')
2828
compile 'com.android.support:appcompat-v7:25.1.0'
29-
compile 'org.lzh.nonview.updateplugin:UpdatePlugin:2.3'
29+
compile 'org.lzh.nonview.updateplugin:UpdatePlugin:2.3.0'
3030
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
3131
compile 'com.jakewharton:butterknife:8.5.1'
3232
annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'

‎updatepluginlib/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ publish {
3131
userOrg = 'yjfnypeu'//bintray.com用户名
3232
groupId = 'org.lzh.nonview.updateplugin'//jcenter上的路径
3333
artifactId = 'UpdatePlugin'//项目名称
34-
publishVersion = '2.3'//版本号
34+
publishVersion = '2.3.0'//版本号
3535
desc = 'this is a auto update yourself app framework'//描述，不重要
3636
website = 'https://github.com/yjfnypeu/UpdatePlugin'//网站，不重要；尽量模拟github上的地址，例如我这样的；当然你有地址最好了
3737

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.lzh.framework.updatepluginlib.creator.ApkFileCreator;
88
import org.lzh.framework.updatepluginlib.creator.DialogCreator;
99
import org.lzh.framework.updatepluginlib.creator.DownloadCreator;
10-
import org.lzh.framework.updatepluginlib.creator.InstallChecker;
10+
import org.lzh.framework.updatepluginlib.creator.FileChecker;
1111
import org.lzh.framework.updatepluginlib.creator.InstallCreator;
1212
import org.lzh.framework.updatepluginlib.model.CheckEntity;
1313
import org.lzh.framework.updatepluginlib.model.UpdateChecker;
@@ -36,7 +36,7 @@ public class UpdateBuilder {
3636
private UpdateParser jsonParser;
3737
private ApkFileCreator fileCreator;
3838
private UpdateChecker updateChecker;
39-
private InstallChecker installChecker;
39+
private FileChecker fileChecker;
4040

4141
public static UpdateBuilder create() {
4242
return new UpdateBuilder();
@@ -57,8 +57,8 @@ public UpdateBuilder updateChecker (UpdateChecker checker) {
5757
return this;
5858
}
5959

60-
public UpdateBuilder installChecker(InstallChecker checker) {
61-
this.installChecker = checker;
60+
public UpdateBuilder installChecker(FileChecker checker) {
61+
this.fileChecker = checker;
6262
return this;
6363
}
6464

@@ -137,8 +137,8 @@ public UpdateChecker getUpdateChecker() {
137137
return updateChecker;
138138
}
139139

140-
public InstallChecker getInstallChecker () {
141-
return installChecker != null ? installChecker : UpdateConfig.getConfig().getInstallChecker();
140+
public FileChecker getFileChecker() {
141+
return fileChecker != null ? fileChecker : UpdateConfig.getConfig().getFileChecker();
142142
}
143143

144144
public DialogCreator getUpdateDialogCreator() {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
import org.lzh.framework.updatepluginlib.callback.UpdateDownloadCB;
1212
import org.lzh.framework.updatepluginlib.creator.ApkFileCreator;
1313
import org.lzh.framework.updatepluginlib.creator.DefaultFileCreator;
14-
import org.lzh.framework.updatepluginlib.creator.DefaultInstallChecker;
14+
import org.lzh.framework.updatepluginlib.creator.DefaultFileChecker;
1515
import org.lzh.framework.updatepluginlib.creator.DefaultNeedDownloadCreator;
1616
import org.lzh.framework.updatepluginlib.creator.DefaultNeedInstallCreator;
1717
import org.lzh.framework.updatepluginlib.creator.DefaultNeedUpdateCreator;
1818
import org.lzh.framework.updatepluginlib.creator.DialogCreator;
1919
import org.lzh.framework.updatepluginlib.creator.DownloadCreator;
20-
import org.lzh.framework.updatepluginlib.creator.InstallChecker;
20+
import org.lzh.framework.updatepluginlib.creator.FileChecker;
2121
import org.lzh.framework.updatepluginlib.creator.InstallCreator;
2222
import org.lzh.framework.updatepluginlib.model.CheckEntity;
2323
import org.lzh.framework.updatepluginlib.model.DefaultChecker;
@@ -88,7 +88,7 @@ public class UpdateConfig {
8888
/**
8989
* To check out if the apk file is validly.
9090
*/
91-
private InstallChecker installChecker;
91+
private FileChecker fileChecker;
9292

9393
private static UpdateConfig config;
9494
public static UpdateConfig getConfig() {
@@ -127,8 +127,8 @@ public UpdateConfig updateChecker(UpdateChecker checker) {
127127
return this;
128128
}
129129

130-
public UpdateConfig installChecker (InstallChecker checker) {
131-
this.installChecker = checker;
130+
public UpdateConfig installChecker (FileChecker checker) {
131+
this.fileChecker = checker;
132132
return this;
133133
}
134134

@@ -224,11 +224,11 @@ public UpdateChecker getUpdateChecker() {
224224
return updateChecker;
225225
}
226226

227-
public InstallChecker getInstallChecker () {
228-
if (installChecker == null) {
229-
installChecker = new DefaultInstallChecker();
227+
public FileChecker getFileChecker() {
228+
if (fileChecker == null) {
229+
fileChecker = new DefaultFileChecker();
230230
}
231-
return installChecker;
231+
return fileChecker;
232232
}
233233

234234
public DownloadCreator getDownloadDialogCreator() {

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.lzh.framework.updatepluginlib.business.UpdateWorker;
99
import org.lzh.framework.updatepluginlib.callback.DefaultCheckCB;
1010
import org.lzh.framework.updatepluginlib.callback.DefaultDownloadCB;
11-
import org.lzh.framework.updatepluginlib.creator.InstallChecker;
11+
import org.lzh.framework.updatepluginlib.creator.FileChecker;
1212
import org.lzh.framework.updatepluginlib.model.Update;
1313

1414
import java.io.File;
@@ -59,9 +59,10 @@ public void downUpdate(Update update,UpdateBuilder builder) {
5959
downloadCB.setBuilder(builder);
6060
downloadCB.setUpdate(update);
6161

62-
InstallChecker installChecker = builder.getInstallChecker();
62+
FileChecker fileChecker = builder.getFileChecker();
6363
File cacheFile = builder.getFileCreator().create(update.getVersionName());
64-
if (installChecker.check(update,cacheFile.getAbsolutePath())) {
64+
if (cacheFile != null && cacheFile.exists()
65+
&& fileChecker.checkPreFile(update,cacheFile.getAbsolutePath())) {
6566
// check success: skip download and show install dialog if needed.
6667
downloadCB.showInstallDialogIfNeed(cacheFile);
6768
return;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void showInstallDialogIfNeed(File file) {
9191

9292
InstallCreator creator = builder.getInstallDialogCreator();
9393
creator.setCheckCB(builder.getCheckCB());
94-
creator.setInstallChecker(builder.getInstallChecker());
94+
creator.setFileChecker(builder.getFileChecker());
9595
creator.setUpdate(update);
9696
if (builder.getStrategy().isAutoInstall()) {
9797
creator.sendToInstall(file.getAbsolutePath());

‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/creator/DefaultInstallChecker.java renamed to ‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/creator/DefaultFileChecker.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77
import org.lzh.framework.updatepluginlib.UpdateConfig;
88
import org.lzh.framework.updatepluginlib.model.Update;
99

10-
import java.io.File;
11-
1210
/**
13-
* Checkout if
1411
* @author haoge
1512
*/
16-
public class DefaultInstallChecker implements InstallChecker {
13+
public class DefaultFileChecker implements FileChecker {
14+
1715
@Override
18-
public boolean check(Update update, String file) {
16+
public boolean checkPreFile(Update update, String file) {
1917
try {
2018
Context context = UpdateConfig.getConfig().getContext();
2119
PackageManager packageManager = context.getPackageManager();
@@ -25,4 +23,10 @@ public boolean check(Update update, String file) {
2523
return false;
2624
}
2725
}
26+
27+
@Override
28+
public boolean checkAfterDownload(Update update, String file) {
29+
// For default: skip checked.
30+
return true;
31+
}
2832
}

‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/creator/FileChecker.java

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package org.lzh.framework.updatepluginlib.creator;
2+
3+
import org.lzh.framework.updatepluginlib.model.Update;
4+
5+
/**
6+
* A tool to check if the apk file is valid.
7+
*/
8+
public interface FileChecker {
9+
10+
/**
11+
* Check if that file is valid before start download task.
12+
* @param update update entity
13+
* @param file the cache file name create by {@link ApkFileCreator#create(String)}
14+
* @return true if check successful
15+
*/
16+
boolean checkPreFile(Update update, String file);
17+
18+
/**
19+
* Check if that file is valid before start install task.
20+
* @param update update entity
21+
* @param file the cache file name create by {@link ApkFileCreator#create(String)}
22+
* @return true if check successful
23+
*/
24+
boolean checkAfterDownload (Update update, String file);
25+
}

‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/creator/InstallChecker.java

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/creator/InstallCreator.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
public abstract class InstallCreator implements Recyclable {
1414

1515
private UpdateCheckCB checkCB;
16-
protected InstallChecker installChecker;
16+
protected FileChecker fileChecker;
1717
protected Update update;
1818

1919
public void setCheckCB(UpdateCheckCB checkCB) {
2020
this.checkCB = checkCB;
2121
}
2222

23-
public void setInstallChecker (InstallChecker checker) {
24-
this.installChecker = checker;
23+
public void setFileChecker(FileChecker checker) {
24+
this.fileChecker = checker;
2525
}
2626

2727
public void setUpdate(Update update) {
@@ -35,7 +35,7 @@ public void setUpdate(Update update) {
3535
* @param filename the absolutely file name that downloaded
3636
*/
3737
public void sendToInstall(String filename) {
38-
if (installChecker == null || installChecker.check(update,filename)) {
38+
if (fileChecker == null || fileChecker.checkAfterDownload(update,filename)) {
3939
Utils.installApk(UpdateConfig.getConfig().getContext(),filename);
4040
} else {
4141
checkCB.onCheckError(-1,String.format("apk %s checked failed",filename));
@@ -65,7 +65,7 @@ public void sendCheckIgnore(Update update) {
6565
@Override
6666
public void release() {
6767
this.checkCB = null;
68-
this.installChecker = null;
68+
this.fileChecker = null;
6969
this.update = null;
7070
}
7171
}

‎updatepluginlib/updatepluginlib.iml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8484
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8585
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
8687
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8788
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8889
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -97,7 +98,9 @@
9798
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
9899
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
99100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
100102
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/publications" />
101104
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
102105
</content>
103106
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />

0 commit comments

Comments
 (0)