Skip to content

Commit a121564

Browse files
committed
+ 4.3.0 云闪付支持
1 parent dae915c commit a121564

File tree

26 files changed

+720
-30
lines changed

26 files changed

+720
-30
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
![1](./app/src/main/res/mipmap-xhdpi/ic_launcher.png)
44
# FingerprintPay
5-
让微信、支付宝、淘宝和腾讯QQ在支持指纹识别的手机上使用指纹支付, 即使他们都不打算支持!
5+
让微信、支付宝、淘宝、腾讯QQ、云闪付在支持指纹识别的手机上使用指纹支付.
66

7-
## 注意: 支付宝现在支持了刷脸支付, 体验感官跟苹果的Face ID差不多, 请优先使用支付宝自带的刷脸支付
7+
## 注意: 支付宝支持刷脸支付, 体验感官跟苹果的Face ID差不多, 请优先使用支付宝自带的刷脸支付
88

99
## 最低要求
1010
* 有指纹硬件
@@ -48,6 +48,7 @@
4848
2. [淘宝](https://github.com/eritpchy/FingerprintPay/tree/main/doc/Taobao)
4949
3. [微信](https://github.com/eritpchy/FingerprintPay/tree/main/doc/WeChat)
5050
4. [QQ](https://github.com/eritpchy/FingerprintPay/tree/main/doc/QQ)
51+
5. [云闪付](https://github.com/eritpchy/FingerprintPay/tree/main/doc/UnionPay)
5152

5253
## 常见问题
5354
1. 因Xposed 造成的开机卡住, 可按电源键禁用Xposed (多次振动后重启手机)
@@ -67,7 +68,7 @@
6768

6869
## 提示
6970
1. 本软件的网络功能仅限检查自己软件更新功能, 如不放心, 欢迎REVIEW代码.
70-
2. 支付宝、淘宝、微信和QQ均可沿用市场中的最新版.
71+
2. 支付宝、淘宝、微信、QQ、云闪付均可沿用市场中的最新版.
7172

7273
![qq](./doc/qqGroup.png)
7374
#### QQ交流群: [665167891](http://shang.qq.com/wpa/qunwpa?idkey=91c2cd8f14532413701607c364f03f43afa1539a24b96b8907c92f3c018894e5)

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
minSdkVersion 14
1010
targetSdkVersion 30
1111
versionCode 21
12-
versionName "4.2.1"
12+
versionName "4.3.0"
1313
buildConfigField "String", "APP_PRODUCT_NAME", "\"FingerprintPay\""
1414
}
1515

app/debug.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
def ADB_PATH = "${android.getSdkDirectory()}/platform-tools/adb"
22
def appInfo = [
3-
Alipay: "com.eg.android.AlipayGphone",
4-
Taobao: "com.taobao.taobao",
5-
QQ: "com.tencent.mobileqq",
6-
WeChat: "com.tencent.mm",
3+
Alipay: "com.eg.android.AlipayGphone",
4+
Taobao: "com.taobao.taobao",
5+
QQ: "com.tencent.mobileqq",
6+
WeChat: "com.tencent.mm",
7+
UnionPay: "com.unionpay",
78
]
89
appInfo.each {entry ->
910
def name = entry.key

app/src/main/java/com/surcumference/fingerprint/Constant.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,23 @@ public class Constant {
1010
public static final String PACKAGE_NAME_ALIPAY = "com.eg.android.AlipayGphone";
1111
public static final String PACKAGE_NAME_TAOBAO = "com.taobao.taobao";
1212
public static final String PACKAGE_NAME_QQ = "com.tencent.mobileqq";
13+
public static final String PACKAGE_NAME_UNIONPAY = "com.unionpay";
1314
public static final String AUTHORITY_WECHAT = "com.tencent.mm.external.fileprovider";
1415
public static final String AUTHORITY_ALIPAY = "com.eg.android.AlipayGphone.asUpgradeFileProvider";
1516
public static final String AUTHORITY_TAOBAO = "com.taobao.taobao.interactProvider";
1617
public static final String AUTHORITY_QQ = "com.tencent.mobileqq.fileprovider";
18+
public static final String AUTHORITY_UNIONPAY = "com.unionpay.fileProvider";
1719
public static final String AUTHORITY_FINGERPRINT_PAY = BuildConfig.APPLICATION_ID + ".fileprovider";
18-
public static final String HELP_URL_WECHAT = "https://github.com/eritpchy/FingerprintPay/blob/master/doc/WeChat/README.md";
19-
public static final String HELP_URL_ALIPAY = "https://github.com/eritpchy/FingerprintPay/blob/master/doc/Alipay/README.md";
20-
public static final String HELP_URL_TAOBAO = "https://github.com/eritpchy/FingerprintPay/blob/master/doc/Taobao/README.md";
21-
public static final String HELP_URL_QQ = "https://github.com/eritpchy/FingerprintPay/blob/master/doc/QQ/README.md";
22-
public static final String HELP_URL_FAQ = "https://github.com/eritpchy/FingerprintPay/blob/master/README.md#%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98";
23-
public static final String HELP_URL_LICENSE = "https://github.com/eritpchy/FingerprintPay/blob/master/license.md";
20+
public static final String CDN_URL = "https://accelerate.xdow.net/";
21+
public static final String HELP_URL_WECHAT = CDN_URL + "eritpchy/FingerprintPay/blob/master/doc/WeChat/README.md#%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B";
22+
public static final String HELP_URL_ALIPAY = CDN_URL + "eritpchy/FingerprintPay/blob/master/doc/Alipay/README.md#%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B";
23+
public static final String HELP_URL_TAOBAO = CDN_URL + "eritpchy/FingerprintPay/blob/master/doc/Taobao/README.md#%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B";
24+
public static final String HELP_URL_QQ = CDN_URL + "eritpchy/FingerprintPay/blob/master/doc/QQ/README.md#%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B";
25+
public static final String HELP_URL_UNIONPAY = CDN_URL + "eritpchy/FingerprintPay/blob/master/doc/UnionPay/README.md#%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B";
26+
public static final String HELP_URL_FAQ = CDN_URL + "eritpchy/FingerprintPay/blob/master/README.md#%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98";
27+
public static final String HELP_URL_LICENSE = CDN_URL + "eritpchy/FingerprintPay/blob/master/license.md";
2428
public static final String PROJECT_URL = "https://github.com/eritpchy/FingerprintPay";
25-
public static final String UPDATE_URL_GITHUB = "https://api.github.com/repos/eritpchy/FingerprintPay/releases/latest";
29+
public static final String UPDATE_URL_GITHUB = CDN_URL + "https://api.github.com/repos/eritpchy/FingerprintPay/releases/latest";
2630
public static final String DONATE_ID_ALIPAY = "https://qr.alipay.com/FKX012222QIU52C6LATAB7";
2731
public static final String DONATE_ID_WECHAT = "wxp://f2f0-1_Hm7XAY7SXA3B_0R0v-VJD71jYCWog";
2832
public static final String AUTHOR_ALIPAY = "eritpchy12@gmail.com";

app/src/main/java/com/surcumference/fingerprint/Lang.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ public static String getString(int res) {
4040
return tr("淘宝指纹", "淘宝指纹", "Taobao fingerprint pay");
4141
case R.id.settings_title_help_qq:
4242
return tr("QQ指纹", "QQ指纹", "QQ fingerprint pay");
43+
case R.id.settings_title_help_unionpay:
44+
return tr("云闪付指纹", "雲閃付指纹", "UnionPay fingerprint pay");
4345
case R.id.settings_title_qq_group:
4446
return tr("QQ交流群", "QQ交流群", "QQ Group");
4547
case R.id.settings_title_help_faq:
@@ -60,6 +62,8 @@ public static String getString(int res) {
6062
return tr("查看使用教程", "查看使用教程", "Tutorial");
6163
case R.id.settings_sub_title_help_qq:
6264
return tr("查看使用教程", "查看使用教程", "Tutorial");
65+
case R.id.settings_sub_title_help_unionpay:
66+
return tr("查看使用教程", "查看使用教程", "Tutorial");
6367
case R.id.settings_sub_title_qq_group:
6468
return tr("665167891", "665167891", "665167891");
6569
case R.id.settings_sub_title_help_faq:
@@ -95,6 +99,8 @@ public static String getString(int res) {
9599
return tr("微信", "微信", "WeChat");
96100
case R.id.settings_title_qq:
97101
return tr("腾讯QQ", "騰訊QQ", "Tencent QQ");
102+
case R.id.settings_title_unionpay:
103+
return tr("云闪付", "雲閃付", "Union Pay");
98104
case R.id.enter_password:
99105
return tr("使用密码", "使用密碼", "Enter password");
100106
case R.id.settings_title_switch:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import static com.surcumference.fingerprint.Constant.HELP_URL_LICENSE;
77
import static com.surcumference.fingerprint.Constant.HELP_URL_QQ;
88
import static com.surcumference.fingerprint.Constant.HELP_URL_TAOBAO;
9+
import static com.surcumference.fingerprint.Constant.HELP_URL_UNIONPAY;
910
import static com.surcumference.fingerprint.Constant.HELP_URL_WECHAT;
1011
import static com.surcumference.fingerprint.Constant.PROJECT_URL;
1112

@@ -50,6 +51,7 @@ public void onCreate(Bundle savedInstanceState) {
5051
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_alipay), Lang.getString(R.id.settings_sub_title_help_alipay)));
5152
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_taobao), Lang.getString(R.id.settings_sub_title_help_taobao)));
5253
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_qq), Lang.getString(R.id.settings_sub_title_help_qq)));
54+
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_unionpay), Lang.getString(R.id.settings_sub_title_help_unionpay)));
5355
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_help_faq), Lang.getString(R.id.settings_sub_title_help_faq)));
5456
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_qq_group), Lang.getString(R.id.settings_sub_title_qq_group)));
5557
list.add(new PreferenceAdapter.Data(Lang.getString(R.id.settings_title_checkupdate), Lang.getString(R.id.settings_sub_title_checkupdate)));
@@ -78,6 +80,8 @@ public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
7880
WebActivity.openUrl(this, HELP_URL_TAOBAO);
7981
} else if (Lang.getString(R.id.settings_title_help_qq).equals(data.title)) {
8082
WebActivity.openUrl(this, HELP_URL_QQ);
83+
} else if (Lang.getString(R.id.settings_title_help_unionpay).equals(data.title)) {
84+
WebActivity.openUrl(this, HELP_URL_UNIONPAY);
8185
} else if (Lang.getString(R.id.settings_title_help_faq).equals(data.title)) {
8286
WebActivity.openUrl(this, HELP_URL_FAQ);
8387
} else if (Lang.getString(R.id.settings_title_qq_group).equals(data.title)) {

app/src/main/java/com/surcumference/fingerprint/bean/PluginTarget.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ public enum PluginTarget {
99
QQ(R.id.settings_title_qq),
1010
WeChat(R.id.settings_title_wechat),
1111
Alipay(R.id.settings_title_alipay),
12-
Taobao(R.id.settings_title_taobao);
12+
Taobao(R.id.settings_title_taobao),
13+
UnionPay(R.id.settings_title_unionpay);
1314

1415
@IdRes
1516
private int mAppNameRes;

app/src/main/java/com/surcumference/fingerprint/network/updateCheck/UpdateFactory.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,10 @@ public void onHasUpdate(UpdateInfo updateInfo) {
121121
private static void handleMagiskUpdate(Context context, UpdateInfo updateInfo, DialogInterface updateInfoViewDialogInterface) {
122122
Task.onBackground(() -> {
123123
if (!Shell.SU.available()) {
124-
Task.onMain(() -> new MessageView(context).text(Lang.getString(R.id.update_no_root)).showInDialog());
125-
return;
124+
if (!Shell.SU.available()) {
125+
Task.onMain(() -> new MessageView(context).text(Lang.getString(R.id.update_no_root)).showInDialog());
126+
return;
127+
}
126128
}
127129
Task.onMain(() -> {
128130
MagiskInstPluginTargetSelectionView instPluginTargetSelectionView = new MagiskInstPluginTargetSelectionView(context);

app/src/main/java/com/surcumference/fingerprint/network/updateCheck/github/GithubUpdateChecker.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ public void onResponse(Call call, Response response) throws IOException {
6060
String content = appendUpdateExtInfo(info.content, info.date, info.contentUrl);
6161
L.d("content", content);
6262
GithubAssetsInfo assetsInfo = info.getDownloadAssetsInfo();
63-
UpdateInfo updateInfo = new UpdateInfo(info.version, content, info.contentUrl, assetsInfo.url, assetsInfo.size);
63+
UpdateInfo updateInfo = new UpdateInfo(info.version, content,
64+
info.contentUrl, Constant.CDN_URL + assetsInfo.url, assetsInfo.size);
6465
onHasUpdate(updateInfo);
6566
} else {
6667
onNoUpdate();

0 commit comments

Comments
 (0)