Skip to content

Commit 974ee26

Browse files
yjfnypeuyjfnypeu
committed
update README
1 parent 8096528 commit 974ee26

File tree

5 files changed

+21
-35
lines changed

5 files changed

+21
-35
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ OK。最简单的用法就这么点。当然。如果需要查看其他配置请
6969
- 2.0
7070
```
7171
新增一个ActivityManager.用于在框架需要弹窗提示时获取当前栈顶的Activity进行Dialog创建
72-
最低版本支持提高到8.得益于新机制，启动检查更新任务时不用手动传递Activity且可以在任意线程进行启动
72+
最低版本支持提高到14.得益于新机制，启动检查更新任务时不用手动传递Activity且可以在任意线程进行启动
7373
移除原有的用于在更新进程中需要显示Dialog时提供的替换Activity功能
7474
完善UpdateCheckCB回调
7575
优化代码

‎app/app.iml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -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/androidTest/res" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -83,38 +75,43 @@
8375
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/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" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.hotchemi/permissionsdispatcher/2.3.1/jars" />
9290
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.squareup.leakcanary/leakcanary-android/1.4-beta2/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.lzh.nonview.updateplugin/UpdatePlugin/2.0/jars" />
9392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9493
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
9594
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9695
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
9796
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
9997
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
10098
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
10199
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
102100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
103101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
104102
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
105105
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
106106
</content>
107107
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
108108
<orderEntry type="sourceFolder" forTests="false" />
109-
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
110109
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
111110
<orderEntry type="library" exported="" name="haha-2.0.2" level="project" />
112111
<orderEntry type="library" exported="" name="leakcanary-analyzer-1.4-beta2" level="project" />
113112
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
114-
<orderEntry type="library" exported="" name="permissionsdispatcher-2.3.1" level="project" />
115113
<orderEntry type="library" exported="" name="leakcanary-watcher-1.4-beta2" level="project" />
116-
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
114+
<orderEntry type="library" exported="" name="UpdatePlugin-2.0" level="project" />
117115
<orderEntry type="library" exported="" name="leakcanary-android-1.4-beta2" level="project" />
118-
<orderEntry type="module" module-name="updatepluginlib" exported="" />
119116
</component>
120117
</module>

‎app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ android {
2525
dependencies {
2626
compile fileTree(dir: 'libs', include: ['*.jar'])
2727
testCompile 'junit:junit:4.12'
28-
compile project(':updatepluginlib')
29-
// compile 'org.lzh.nonview.updateplugin:UpdatePlugin:1.1.0'
28+
// compile project(':updatepluginlib')
29+
compile 'org.lzh.nonview.updateplugin:UpdatePlugin:2.0'
3030
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
3131
// compile 'com.jakewharton:butterknife:8.2.1'
3232

33-
compile 'com.github.hotchemi:permissionsdispatcher:2.3.1'
34-
apt 'com.github.hotchemi:permissionsdispatcher-processor:2.3.1'
33+
// compile 'com.github.hotchemi:permissionsdispatcher:2.3.1'
34+
// apt 'com.github.hotchemi:permissionsdispatcher-processor:2.3.1'
3535

3636
}

‎app/src/main/java/org/lzh/framework/updateplugin/SampleActivity.java

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.lzh.framework.updateplugin;
22

3-
import android.Manifest;
43
import android.app.Activity;
54
import android.content.Intent;
65
import android.os.Bundle;
@@ -14,13 +13,8 @@
1413
import org.lzh.framework.updateplugin.update.CustomNeedUpdateCreator;
1514
import org.lzh.framework.updateplugin.update.CustomUpdateChecker;
1615
import org.lzh.framework.updateplugin.update.CustomUpdateWorker;
17-
import org.lzh.framework.updateplugin.update.NotificationDownloadCreator;
1816
import org.lzh.framework.updatepluginlib.UpdateBuilder;
1917

20-
import permissions.dispatcher.NeedsPermission;
21-
import permissions.dispatcher.RuntimePermissions;
22-
23-
@RuntimePermissions
2418
public class SampleActivity extends Activity implements View.OnClickListener{
2519

2620
@Override
@@ -36,19 +30,11 @@ protected void onCreate(Bundle savedInstanceState) {
3630
findViewById(R.id.custom_activity_replace).setOnClickListener(this);
3731
findViewById(R.id.upgrade_in_back_thread).setOnClickListener(this);
3832

39-
SampleActivityPermissionsDispatcher.requestPermissionWithCheck(this);
40-
}
41-
42-
@NeedsPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
43-
void requestPermission() {
44-
4533
}
4634

4735
// 使用默认配置进行更新
4836
void useDefaultUpdate() {
49-
UpdateBuilder.create()
50-
.downloadDialogCreator(new NotificationDownloadCreator())
51-
.check();
37+
UpdateBuilder.create().check();
5238
}
5339

5440
// 使用自定义网络任务进行更新。

‎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/androidTest/jni" isTestSource="true" />
8484
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8585
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/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)