Skip to content

Commit a50e353

Browse files
yjfnypeuyjfnypeu
committed
update new version
1 parent fd1ed38 commit a50e353

28 files changed

+512
-72
lines changed

‎.idea/gradle.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: 9 additions & 8 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,6 +72,14 @@
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" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
@@ -95,6 +95,7 @@
9595
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
9696
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9797
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
9899
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
99100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
100101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />

‎app/src/main/AndroidManifest.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,28 @@
1717
</intent-filter>
1818
</activity>
1919
<activity android:name=".EmptyActivity"></activity>
20+
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>
2042
</application>
2143

2244
</manifest>

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package org.lzh.framework.updateplugin;
2+
3+
import android.app.Activity;
4+
import android.os.Bundle;
5+
6+
/**
7+
* Created by admin on 16-6-21.
8+
*/
9+
public class BaseActivity extends Activity {
10+
11+
@Override
12+
protected void onCreate(Bundle savedInstanceState) {
13+
super.onCreate(savedInstanceState);
14+
MyApplication.getRefWatcher(this).watch(this);
15+
}
16+
}

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

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

3-
import android.app.Activity;
43
import android.content.Intent;
54
import android.os.Bundle;
65

7-
public class EmptyActivity extends Activity {
6+
public class EmptyActivity extends BaseActivity {
87

98
@Override
109
protected void onCreate(Bundle savedInstanceState) {

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

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
package org.lzh.framework.updateplugin;
22

3-
import android.app.Activity;
43
import android.content.Intent;
54
import android.os.Bundle;
65
import android.view.View;
76

87
import org.lzh.framework.updatepluginlib.UpdateBuilder;
9-
import org.lzh.framework.updatepluginlib.UpdateConfig;
108
import org.lzh.framework.updatepluginlib.model.Update;
119
import org.lzh.framework.updatepluginlib.strategy.UpdateStrategy;
1210

13-
public class MainActivity extends Activity {
11+
public class MainActivity extends BaseActivity {
1412

1513
@Override
1614
protected void onCreate(Bundle savedInstanceState) {
@@ -22,7 +20,30 @@ public void onClick(View v) {
2220
// UpdateBuilder中可设置的配置与UpdateConfig中一致。检查更新入口调用check方法
2321
// 对于UpdateBuilder中未设置的参数。会默认使用UpdateConfig中的配置
2422
UpdateBuilder.create()
23+
.strategy(new UpdateStrategy() {
24+
@Override
25+
public boolean isShowUpdateDialog(Update update) {
26+
return false;
27+
}
28+
29+
@Override
30+
public boolean isAutoInstall() {
31+
return false;
32+
}
33+
34+
@Override
35+
public boolean isShowDownloadDialog() {
36+
return false;
37+
}
38+
})
2539
.check(MainActivity.this);
40+
41+
}
42+
});
43+
findViewById(R.id.finishAndToNext).setOnClickListener(new View.OnClickListener(){
44+
45+
@Override
46+
public void onClick(View v) {
2647
startActivity(new Intent(MainActivity.this,EmptyActivity.class));
2748
finish();
2849
}

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package org.lzh.framework.updateplugin;
22

33
import android.app.Application;
4+
import android.content.Context;
45
import android.widget.Toast;
56

67
import com.squareup.leakcanary.LeakCanary;
8+
import com.squareup.leakcanary.RefWatcher;
79

810
import org.lzh.framework.updatepluginlib.UpdateConfig;
911
import org.lzh.framework.updatepluginlib.callback.EmptyCheckCB;
@@ -16,11 +18,18 @@
1618
*/
1719
public class MyApplication extends Application {
1820
private String apkFile = "http://apk.hiapk.com/appdown/com.hiapk.live?planid=2515816&seid=c711112f-cc50-0001-a55f-bfe5123fe450";
21+
private RefWatcher refWatcher;
22+
23+
public static RefWatcher getRefWatcher (Context context) {
24+
MyApplication application = (MyApplication) context
25+
.getApplicationContext();
26+
return application.refWatcher;
27+
}
1928

2029
@Override
2130
public void onCreate() {
2231
super.onCreate();
23-
LeakCanary.install(this);
32+
refWatcher = LeakCanary.install(this);
2433
// UpdateConfig为全局配置。当在其他页面中。使用UpdateBuilder进行检查更新时。
2534
// 对于没传的参数，会默认使用UpdateConfig中的全局配置
2635
UpdateConfig.getConfig()
@@ -43,7 +52,7 @@ public Update parse(String response) {
4352
// 此apk包的更新内容
4453
update.setUpdateContent("测试更新");
4554
// 此apk包是否为强制更新
46-
update.setForced(true);
55+
update.setForced(false);
4756
// 是否忽略此次版本更新
4857
update.setIgnore(false);
4958
return update;

‎app/src/main/res/layout/activity_main.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,10 @@
99
android:layout_width="match_parent"
1010
android:layout_height="wrap_content"
1111
android:text="update" />
12+
13+
<Button
14+
android:id="@+id/finishAndToNext"
15+
android:text="finish and to next"
16+
android:layout_width="match_parent"
17+
android:layout_height="wrap_content" />
1218
</LinearLayout>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
*/
2222
public class UpdateBuilder {
2323

24+
/**
25+
* To see {@link UpdateWorker}
26+
*/
2427
private UpdateWorker checkWorker;
2528
private DownloadWorker downloadWorker;
2629
private UpdateCheckCB checkCB;

0 commit comments

Comments
 (0)