Skip to content

Commit 92eaa40

Browse files
eritpchyeritpchy
committed
Bump version to 5.1.0
Support Alipay 10.5.96.8000(1261) Support Taobao 10.36.10(643)
1 parent 87a9165 commit 92eaa40

32 files changed

+506
-222
lines changed

‎app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "com.surcumference.fingerprintpay"
88
minSdkVersion 14
99
targetSdkVersion 33
10-
versionCode 31
11-
versionName "5.0.1"
10+
versionCode 32
11+
versionName "5.1.0"
1212
buildConfigField "String", "APP_PRODUCT_NAME", "\"FingerprintPay\""
1313
}
1414

‎app/debug.gradle

+19
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,24 @@ project.ext.appInfo.each {entry ->
2121
def classDexPath = new File(project.buildDir, "intermediates/dex/debug/mergeDexDebug/classes.dex").absolutePath
2222
executable = ADB_PATH
2323
args = ['push', classDexPath, "/data/local/tmp/libriru-module-xfingerprint-pay-${name.toLowerCase()}.debug.dex"]
24+
doLast {
25+
exec {
26+
executable = ADB_PATH
27+
args = ["shell", "chmod", "a-w", "/data/local/tmp/libriru-module-xfingerprint-pay-${name.toLowerCase()}.debug.dex"]
28+
}
29+
}
2430
}
2531
debugRiruTask.finalizedBy(startTask)
2632
def debugZygiskTask = tasks.create(name: "debug${name}Zygisk", dependsOn: ["mergeDexDebug"], type: Exec) {
2733
def classDexPath = new File(project.buildDir, "intermediates/dex/debug/mergeDexDebug/classes.dex").absolutePath
2834
executable = ADB_PATH
2935
args = ['push', classDexPath, "/data/local/tmp/libzygisk-module-xfingerprint-pay-${name.toLowerCase()}.debug.dex"]
36+
doLast {
37+
exec {
38+
executable = ADB_PATH
39+
args = ["shell", "chmod", "a-w", "/data/local/tmp/libzygisk-module-xfingerprint-pay-${name.toLowerCase()}.debug.dex"]
40+
}
41+
}
3042
}
3143
debugZygiskTask.finalizedBy(startTask)
3244
}
@@ -47,4 +59,11 @@ android.applicationVariants.all { variant ->
4759
output.outputFileName = apkName
4860
}
4961
}
62+
}
63+
64+
def removeWritePermission(path) {
65+
exec {
66+
executable = ADB_PATH
67+
args = ["shell", "chmod", "a-w", "/data/local/tmp/libzygisk-module-xfingerprint-pay-${name.toLowerCase()}.debug.dex"]
68+
}
5069
}

‎app/src/main/java/com/surcumference/fingerprint/activity/HomeActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.surcumference.fingerprint.Lang;
2828
import com.surcumference.fingerprint.R;
2929
import com.surcumference.fingerprint.adapter.PreferenceAdapter;
30-
import com.surcumference.fingerprint.network.updateCheck.UpdateFactory;
30+
import com.surcumference.fingerprint.network.update.UpdateFactory;
3131
import com.surcumference.fingerprint.util.Task;
3232
import com.surcumference.fingerprint.util.Umeng;
3333
import com.surcumference.fingerprint.util.bugfixer.TagManagerBugFixer;

‎app/src/main/java/com/surcumference/fingerprint/network/inf/UpdateResultListener.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
public interface UpdateResultListener {
1010

1111
void onNoUpdate();
12-
void onNetErr();
12+
void onNetErr(Exception exception);
1313
void onHasUpdate(UpdateInfo updateInfo);
1414
}

‎app/src/main/java/com/surcumference/fingerprint/network/updateCheck/BaseUpdateChecker.java renamed to ‎app/src/main/java/com/surcumference/fingerprint/network/update/BaseUpdateChecker.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.surcumference.fingerprint.network.updateCheck;
1+
package com.surcumference.fingerprint.network.update;
22

33
import com.surcumference.fingerprint.bean.UpdateInfo;
44
import com.surcumference.fingerprint.network.inf.IUpdateCheck;
@@ -29,13 +29,13 @@ public void onNoUpdate() {
2929
}
3030

3131
@Override
32-
public void onNetErr() {
32+
public void onNetErr(Exception exception) {
3333
Task.onMain(() -> {
3434
UpdateResultListener listener = mResultListener;
3535
if (listener == null) {
3636
return;
3737
}
38-
listener.onNetErr();
38+
listener.onNetErr(exception);
3939
});
4040
}
4141

‎app/src/main/java/com/surcumference/fingerprint/network/updateCheck/UpdateFactory.java renamed to ‎app/src/main/java/com/surcumference/fingerprint/network/update/UpdateFactory.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.surcumference.fingerprint.network.updateCheck;
1+
package com.surcumference.fingerprint.network.update;
22

33
import android.app.Activity;
44
import android.content.Context;
@@ -18,7 +18,7 @@
1818
import com.surcumference.fingerprint.bean.PluginType;
1919
import com.surcumference.fingerprint.bean.UpdateInfo;
2020
import com.surcumference.fingerprint.network.inf.UpdateResultListener;
21-
import com.surcumference.fingerprint.network.updateCheck.github.GithubUpdateChecker;
21+
import com.surcumference.fingerprint.network.update.github.GithubUpdateChecker;
2222
import com.surcumference.fingerprint.plugin.PluginApp;
2323
import com.surcumference.fingerprint.util.ApplicationUtils;
2424
import com.surcumference.fingerprint.util.Config;
@@ -66,7 +66,8 @@ public static void doUpdateCheck(final Context context, final boolean quite, fin
6666
}});
6767
File targetFile = FileUtils.getSharableFile(context, fileName);
6868
FileUtils.delete(targetFile);
69-
new GithubUpdateChecker(new UpdateResultListener() {
69+
new GithubUpdateChecker(BuildConfig.VERSION_NAME, Constant.UPDATE_URL_GITHUB,
70+
new UpdateResultListener() {
7071
@Override
7172
public void onNoUpdate() {
7273
if (!quite) {
@@ -75,7 +76,7 @@ public void onNoUpdate() {
7576
}
7677

7778
@Override
78-
public void onNetErr() {
79+
public void onNetErr(Exception e) {
7980
if (!quite) {
8081
Toaster.showLong(Lang.getString(R.id.toast_check_update_fail_net_err));
8182
}

‎app/src/main/java/com/surcumference/fingerprint/network/updateCheck/github/GithubUpdateChecker.java renamed to ‎app/src/main/java/com/surcumference/fingerprint/network/update/github/GithubUpdateChecker.java

+27-24
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
package com.surcumference.fingerprint.network.updateCheck.github;
1+
package com.surcumference.fingerprint.network.update.github;
22

33
import android.text.TextUtils;
44

55
import com.google.gson.Gson;
66
import com.surcumference.fingerprint.BuildConfig;
7-
import com.surcumference.fingerprint.Constant;
87
import com.surcumference.fingerprint.Lang;
98
import com.surcumference.fingerprint.R;
109
import com.surcumference.fingerprint.bean.UpdateInfo;
1110
import com.surcumference.fingerprint.network.inf.UpdateResultListener;
12-
import com.surcumference.fingerprint.network.updateCheck.BaseUpdateChecker;
13-
import com.surcumference.fingerprint.network.updateCheck.github.bean.GithubAssetsInfo;
14-
import com.surcumference.fingerprint.network.updateCheck.github.bean.GithubLatestInfo;
11+
import com.surcumference.fingerprint.network.update.BaseUpdateChecker;
12+
import com.surcumference.fingerprint.network.update.github.bean.GithubAssetsInfo;
13+
import com.surcumference.fingerprint.network.update.github.bean.GithubLatestInfo;
1514
import com.surcumference.fingerprint.util.DateUtils;
1615
import com.surcumference.fingerprint.util.StringUtils;
1716
import com.surcumference.fingerprint.util.log.L;
@@ -32,9 +31,13 @@
3231
public class GithubUpdateChecker extends BaseUpdateChecker {
3332

3433
public static OkHttpClient sHttpClient = new OkHttpClient();
34+
private final String mLocalVersion;
35+
private final String mUpdateUrl;
3536

36-
public GithubUpdateChecker(UpdateResultListener listener) {
37+
public GithubUpdateChecker(String localVersion, String updateUrl, UpdateResultListener listener) {
3738
super(listener);
39+
this.mLocalVersion = localVersion;
40+
this.mUpdateUrl = updateUrl;
3841
}
3942

4043
@Override
@@ -43,7 +46,7 @@ public void doUpdateCheck() {
4346
callback = new Callback() {
4447
@Override
4548
public void onFailure(Call call, IOException e) {
46-
onNetErr();
49+
onNetErr(e);
4750
}
4851

4952
@Override
@@ -53,32 +56,32 @@ public void onResponse(Call call, Response response) throws IOException {
5356
response.close();
5457
try {
5558
GithubLatestInfo info = new Gson().fromJson(replay, GithubLatestInfo.class);
56-
if (info != null) {
57-
if (info.isDataComplete()) {
58-
if (BuildConfig.DEBUG || StringUtils.isAppNewVersion(BuildConfig.VERSION_NAME, info.version)) {
59-
L.d("info", info);
60-
String content = appendUpdateExtInfo(info.content, info.date, info.contentUrl);
61-
L.d("content", content);
62-
GithubAssetsInfo assetsInfo = info.getDownloadAssetsInfo();
63-
UpdateInfo updateInfo = new UpdateInfo(info.version, content,
64-
info.contentUrl, assetsInfo.url, assetsInfo.name, assetsInfo.size);
65-
onHasUpdate(updateInfo);
66-
} else {
67-
onNoUpdate();
68-
}
69-
return;
70-
}
59+
if (!info.isDataComplete()) {
60+
onNetErr(new IllegalArgumentException("data not complete!"));
61+
return;
7162
}
63+
if (BuildConfig.DEBUG || StringUtils.isAppNewVersion(mLocalVersion, info.version)) {
64+
L.d("info", info);
65+
String content = appendUpdateExtInfo(info.content, info.date, info.contentUrl);
66+
L.d("content", content);
67+
GithubAssetsInfo assetsInfo = info.getDownloadAssetsInfo();
68+
UpdateInfo updateInfo = new UpdateInfo(info.version, content,
69+
info.contentUrl, assetsInfo.url, assetsInfo.name, assetsInfo.size);
70+
onHasUpdate(updateInfo);
71+
} else {
72+
onNoUpdate();
73+
}
74+
return;
7275
} catch (Exception e) {
7376
L.d(e);
7477
}
7578
}
76-
onNetErr();
79+
onNetErr(new IOException("response not successful. code: " + response.code()));
7780
}
7881
};
7982

8083
Request request = new Request.Builder()
81-
.url(Constant.UPDATE_URL_GITHUB)
84+
.url(this.mUpdateUrl)
8285
.build();
8386
sHttpClient.newCall(request).enqueue(callback);
8487
}

‎app/src/main/java/com/surcumference/fingerprint/network/updateCheck/github/bean/GithubAssetsInfo.java renamed to ‎app/src/main/java/com/surcumference/fingerprint/network/update/github/bean/GithubAssetsInfo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.surcumference.fingerprint.network.updateCheck.github.bean;
1+
package com.surcumference.fingerprint.network.update.github.bean;
22

33
import com.google.gson.annotations.SerializedName;
44

‎app/src/main/java/com/surcumference/fingerprint/network/updateCheck/github/bean/GithubLatestInfo.java renamed to ‎app/src/main/java/com/surcumference/fingerprint/network/update/github/bean/GithubLatestInfo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.surcumference.fingerprint.network.updateCheck.github.bean;
1+
package com.surcumference.fingerprint.network.update.github.bean;
22

33
import android.text.TextUtils;
44

0 commit comments

Comments
 (0)