Skip to content

Commit fe65a3c

Browse files
yjfnypeuyjfnypeu
committed
update jcenter
1 parent b09b2cd commit fe65a3c

File tree

10 files changed

+81
-40
lines changed

10 files changed

+81
-40
lines changed

‎.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7567
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -80,9 +72,16 @@
8072
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8685
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8786
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8887
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -93,7 +92,9 @@
9392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
9493
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
9594
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
9696
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
9798
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
9899
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
99100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
@@ -102,6 +103,8 @@
102103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
103104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
104105
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
105108
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
106109
</content>
107110
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />

‎app/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ apply plugin: 'com.android.application'
33
android {
44
compileSdkVersion 23
55
buildToolsVersion "23.0.3"
6-
6+
lintOptions {
7+
abortOnError false
8+
}
79
defaultConfig {
810
applicationId "org.lzh.framework.updateplugin"
911
minSdkVersion 14
@@ -24,5 +26,6 @@ dependencies {
2426
testCompile 'junit:junit:4.12'
2527
// compile 'com.android.support:appcompat-v7:23.3.0'
2628
compile project(':updatepluginlib')
27-
// compile 'com.github.yjfnypeu:UpdatePlugin:0.4'
29+
// compile 'com.github.yjfnypeu:UpdatePlugin:0.3'
30+
// debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3'
2831
}

‎app/src/main/AndroidManifest.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,27 @@
1818
</activity>
1919
<activity android:name=".EmptyActivity"></activity>
2020

21+
<!--<service-->
22+
<!--android:name="com.squareup.leakcanary.internal.HeapAnalyzerService"-->
23+
<!--android:enabled="false"-->
24+
<!--android:process=":leakcanary" />-->
25+
<!--<service-->
26+
<!--android:name="com.squareup.leakcanary.DisplayLeakService"-->
27+
<!--android:enabled="false" />-->
28+
29+
<!--<activity-->
30+
<!--android:name="com.squareup.leakcanary.internal.DisplayLeakActivity"-->
31+
<!--android:enabled="false"-->
32+
<!--android:icon="@drawable/__leak_canary_icon"-->
33+
<!--android:label="@string/__leak_canary_display_activity_label"-->
34+
<!--android:taskAffinity="com.squareup.leakcanary"-->
35+
<!--android:theme="@style/__LeakCanary.Base" >-->
36+
<!--<intent-filter>-->
37+
<!--<action android:name="android.intent.action.MAIN" />-->
38+
39+
<!--<category android:name="android.intent.category.LAUNCHER" />-->
40+
<!--</intent-filter>-->
41+
<!--</activity>-->
2142
</application>
2243

2344
</manifest>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ public class BaseActivity extends Activity {
1111
@Override
1212
protected void onCreate(Bundle savedInstanceState) {
1313
super.onCreate(savedInstanceState);
14+
// MyApplication.getRefWatcher(this).watch(this);
1415
}
1516
}

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@ public void onClick(View v) {
2121
// 对于UpdateBuilder中未设置的参数。会默认使用UpdateConfig中的配置
2222

2323
UpdateBuilder.create()
24-
.strategy(new UpdateStrategy() {
25-
@Override
26-
public boolean isShowUpdateDialog(Update update) {
27-
return false;
28-
}
29-
30-
@Override
31-
public boolean isAutoInstall() {
32-
return false;
33-
}
34-
35-
@Override
36-
public boolean isShowDownloadDialog() {
37-
return false;
38-
}
39-
})
24+
// .strategy(new UpdateStrategy() {
25+
// @Override
26+
// public boolean isShowUpdateDialog(Update update) {
27+
// return false;
28+
// }
29+
//
30+
// @Override
31+
// public boolean isAutoInstall() {
32+
// return false;
33+
// }
34+
//
35+
// @Override
36+
// public boolean isShowDownloadDialog() {
37+
// return false;
38+
// }
39+
// })
4040
.check(MainActivity.this);
4141

4242

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.app.Application;
44
import android.widget.Toast;
55

6+
67
import org.lzh.framework.updatepluginlib.UpdateConfig;
78
import org.lzh.framework.updatepluginlib.callback.EmptyCheckCB;
89
import org.lzh.framework.updatepluginlib.callback.EmptyDownloadCB;
@@ -14,10 +15,18 @@
1415
*/
1516
public class MyApplication extends Application {
1617
private String apkFile = "http://apk.hiapk.com/appdown/com.hiapk.live?planid=2515816&seid=c711112f-cc50-0001-a55f-bfe5123fe450";
18+
// private RefWatcher refWatcher;
19+
//
20+
// public static RefWatcher getRefWatcher (Context context) {
21+
// MyApplication application = (MyApplication) context
22+
// .getApplicationContext();
23+
// return application.refWatcher;
24+
// }
1725

1826
@Override
1927
public void onCreate() {
2028
super.onCreate();
29+
// refWatcher = LeakCanary.install(this);
2130
// UpdateConfig为全局配置。当在其他页面中。使用UpdateBuilder进行检查更新时。
2231
// 对于没传的参数，会默认使用UpdateConfig中的全局配置
2332
UpdateConfig.getConfig()

‎updatepluginlib/build.gradle

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

‎updatepluginlib/src/main/java/org/lzh/framework/updatepluginlib/model/UpdateChecker.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package org.lzh.framework.updatepluginlib.model;
22

33
/**
4-
* 新版本检查器
4+
* The checker to check whether or not should be updated
55
* Created by lzh on 2016/6/20.
66
*/
77
public interface UpdateChecker {
88

99
/**
10-
* 判断是否含有新版本
11-
* @return 返回true代表需要更新。
10+
* check if is a new version
1211
*/
1312
boolean check(Update update);
1413
}

‎updatepluginlib/updatepluginlib.iml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,6 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -81,6 +73,15 @@
8173
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8375
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
8485
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8586
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8687
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -95,7 +96,11 @@
9596
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
9697
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
9798
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
98100
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/publications" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
99104
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
100105
</content>
101106
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />

0 commit comments

Comments
 (0)