Skip to content

Commit c1d7afa

Browse files
committed
修改强制更新策略:点击返回键直接返回桌面
1 parent db87786 commit c1d7afa

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

app/src/main/java/com/vector/appupdatedemo/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ protected UpdateAppBean parseJson(String json) {
254254
//更新内容
255255
.setUpdate_log(jsonObject.getString("update_log"))
256256
//是否强制更新
257-
.setConstraint(jsonObject.getBoolean("constraint"));
257+
.setConstraint(true);
258258
} catch (JSONException e) {
259259
e.printStackTrace();
260260
}

update-app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ publish {
4141
userOrg = 'qianwen'//bintray.com用户名
4242
groupId = 'com.qianwen'//jcenter上的路径
4343
artifactId = 'update-app'//项目名称
44-
publishVersion = '3.2.3'//版本号
44+
publishVersion = '3.2.4'//版本号
4545
desc = 'App update tools'
4646
website = 'https://github.com/WVector/AppUpdateDemo'
4747
}

update-app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<activity
1212
android:name=".DialogActivity"
1313
android:configChanges="keyboardHidden|orientation|locale|screenSize"
14-
android:launchMode="singleInstance"
1514
android:screenOrientation="portrait"
1615
android:theme="@style/UpdateAppDialog"
1716
android:windowSoftInputMode="adjustPan|stateHidden">

update-app/src/main/java/com/vector/update_app/DialogActivity.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.vector.update_app;
22

33
import android.content.ComponentName;
4+
import android.content.Intent;
45
import android.content.ServiceConnection;
56
import android.graphics.Color;
67
import android.os.Bundle;
@@ -246,7 +247,10 @@ public void onBackPressed() {
246247
//禁用
247248
if (mUpdateApp != null && mUpdateApp.isConstraint()) {
248249
// ActManager.getInstance().finishAllActivity();
249-
android.os.Process.killProcess(android.os.Process.myPid());
250+
// android.os.Process.killProcess(android.os.Process.myPid());
251+
//返回桌面
252+
startActivity(new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_HOME));
253+
return;
250254
}
251255
super.onBackPressed();
252256
}

0 commit comments

Comments
 (0)