Skip to content

Commit 3edde2d

Browse files
eritpchyeritpchy
committed
支持支付宝复杂密码、umeng bug修复、界面优化
1 parent 79f5ac1 commit 3edde2d

File tree

13 files changed

+225
-72
lines changed

13 files changed

+225
-72
lines changed

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
已适配版本:\
88
微信: 6.5.8 [6.5.10-1080](https://github.com/eritpchy/Xposed-Fingerprint-pay/releases/download/1.3/weixin6510.apk) 6.5.13-1081 [6.5.13-1100](https://github.com/eritpchy/Xposed-Fingerprint-pay/releases/download/1.4.1/WeChat-6.5.13-1100.apk) [6.5.16-1101](https://github.com/eritpchy/Xposed-Fingerprint-pay/releases/download/2.4.0/WeChat-6.5.16-1101.apk) [6.5.16-1120](https://github.com/eritpchy/Xposed-Fingerprint-pay/releases/download/2.3.0/WeChat-6.5.16-1120.apk)\
9-
支付宝: 10.1.0.090418-114\
10-
淘宝: 6.11.0-161
9+
支付宝: 10.1.0.090418-114及以上\
10+
淘宝: 6.11.0-161及以上
1111

1212
以下软件经测试过测试, 可以正常调用支付宝、微信:\
1313
猫眼\
@@ -27,7 +27,7 @@
2727

2828

2929
使用步骤:
30-
1. 下载并安装插件: https://github.com/eritpchy/Xposed-Fingerprint-pay/releases/download/2.4.0/WeChatFp-2.4.0-release.apk
30+
1. 下载并安装插件: https://github.com/eritpchy/Xposed-Fingerprint-pay/releases/download/2.5.0/WeChatFp-2.5.0-release.apk
3131
2. 下载并安装微信6.5.16-1120版本 https://github.com/eritpchy/Xposed-Fingerprint-pay/releases/download/2.3.0/WeChat-6.5.16-1120.apk
3232
3. 下载并安装支付宝10.1.0.090418-114版本 https://github.com/eritpchy/Xposed-Fingerprint-pay/releases/download/2.0.0/Alipay-10.1.0.090418-114.apk
3333
4. 下载并安装淘宝6.11.0-161版本 https://github.com/eritpchy/Xposed-Fingerprint-pay/releases/download/2.1.0/Taobao-6.11.0-161.apk
@@ -38,9 +38,9 @@
3838
链接: https://pan.baidu.com/s/1eSq0QNw 密码: fbrg
3939

4040
友情提示:
41-
1. 由于没有复杂密码的支付宝账号, 支付宝的支付密码只支持6位简单密码噢.
42-
2. 以上提供的安装包均为 支付宝/微信/淘宝官方提供的安装包, 没有任何添加修改, 提供安装包只为方便找到指定适配过的安装包.
43-
3. 本软件的网络功能仅限检查自己软件更新功能, 如不放心, 欢迎REVIEW代码.
41+
1. 以上提供的安装包均为 支付宝/微信/淘宝官方提供的安装包, 没有任何添加修改, 提供安装包只为方便找到指定适配过的安装包.
42+
2. 本软件的网络功能仅限检查自己软件更新功能, 如不放心, 欢迎REVIEW代码.
43+
3. 不支持QQ, 别问我为什么, 反正就是不支持!
4444

4545
![qq](https://github.com/eritpchy/Xposed-Fingerprint-pay/raw/master/doc/qqGroup.png)
4646

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ android {
1010
applicationId "com.yyxx.wechatfp"
1111
minSdkVersion 14
1212
targetSdkVersion 26
13-
versionCode 11
14-
versionName "2.4.0"
13+
versionCode 12
14+
versionName "2.5.0"
1515
buildConfigField "String", "APP_PRODUCT_NAME", "\"WeChatFp\""
1616
}
1717

‎app/src/main/java/com/yyxx/wechatfp/Constant.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class Constant {
1212
public static final String HELP_URL_WECHAT = "https://github.com/eritpchy/Xposed-Fingerprint-pay/blob/master/doc/WeChat/README.md";
1313
public static final String HELP_URL_ALIPAY = "https://github.com/eritpchy/Xposed-Fingerprint-pay/blob/master/doc/Alipay/README.md";
1414
public static final String HELP_URL_TAOBAO = "https://github.com/eritpchy/Xposed-Fingerprint-pay/blob/master/doc/Taobao/README.md";
15-
public static final String PROJECT_URL = "https://github.com/eritpchy/WechatFp";
15+
public static final String PROJECT_URL = "https://github.com/eritpchy/Xposed-Fingerprint-pay";
1616
public static final String UPDATE_URL_GITHUB = "https://api.github.com/repos/eritpchy/Xposed-Fingerprint-pay/releases/latest";
1717
public static final String DONATE_ID_ALIPAY = "https://qr.alipay.com/FKX012222QIU52C6LATAB7";
1818
public static final String DONATE_ID_WECHAT = "wxp://f2f0-1_Hm7XAY7SXA3B_0R0v-VJD71jYCWog";

‎app/src/main/java/com/yyxx/wechatfp/Lang.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ public class Lang {
7575
public static final int TOAST_PASSWORD_NOT_SET_ALIPAY = 0x01000010;
7676
public static final int TOAST_PASSWORD_NOT_SET_WECHAT = 0x01000011;
7777
public static final int TOAST_PASSWORD_AUTO_ENTER_FAIL = 0x01000012;
78+
public static final int TOAST_GOTO_DONATE_PAGE_FAIL_ALIPAY = 0x01000013;
79+
public static final int TOAST_GOTO_DONATE_PAGE_FAIL_WECHAT = 0x01000014;
7880

7981
private static final int TEMPLATE = 0xFFFFFFFF;
8082

@@ -117,7 +119,7 @@ public static String getString(int res) {
117119
case SETTINGS_TITLE_WECHAT:
118120
return tr("微信", "微信", "WeChat");
119121
case ENTER_PASSWORD:
120-
return tr("请输入密码", "請輸入密碼", "Enter password");
122+
return tr("输入密码", "輸入密碼", "Enter password");
121123
case SETTINGS_TITLE_SWITCH:
122124
return tr("启用", "啟用", "Enable");
123125
case SETTINGS_TITLE_PASSWORD:
@@ -173,6 +175,10 @@ public static String getString(int res) {
173175
return tr("未设定支付密码，请前往設置->指紋設置中设定微信的支付密码", "未設定支付密碼，請前往設置 -> 指紋設置中設定微信的支付密碼", "Payment password not set, please goto Settings -> Fingerprint to enter you payment password");
174176
case TOAST_PASSWORD_AUTO_ENTER_FAIL:
175177
return tr("Oops.. 输入失败了. 请手动输入密码", "Oops.. 輸入失敗了. 請手動輸入密碼", "Oops... auto input failure, switch to manual input");
178+
case TOAST_GOTO_DONATE_PAGE_FAIL_ALIPAY:
179+
return tr("调用支付宝捐赠页失败, 您可以手动转账捐赠哦, 帐号: " + Constant.AUTHOR_ALIPAY, "調用支付寶捐贈頁失敗, 您可以手動轉賬捐贈哦, 帳號: " + Constant.AUTHOR_ALIPAY, "Can't jump to Alipay donate page, You can do it manually by transfer to account: " + Constant.AUTHOR_ALIPAY);
180+
case TOAST_GOTO_DONATE_PAGE_FAIL_WECHAT:
181+
return tr("调用微信捐赠页失败, 您可以手动转账捐赠哦, 帐号: " + Constant.AUTHOR_WECHAT, "調用微信捐贈頁失敗, 您可以手動轉賬捐贈哦, 帳號: " + Constant.AUTHOR_WECHAT, "Can't jump to WeChat donate page, You can do it manually by transfer to account: " + Constant.AUTHOR_WECHAT);
176182
case TEMPLATE:
177183
return tr("", "", "");
178184
}

‎app/src/main/java/com/yyxx/wechatfp/activity/HomeActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void onCreate(Bundle savedInstanceState) {
4242
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_HELP_ALIPAY), Lang.getString(Lang.SETTINGS_SUB_TITLE_HELP_ALIPAY)));
4343
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_HELP_TAOBAO), Lang.getString(Lang.SETTINGS_SUB_TITLE_HELP_TAOBAO)));
4444
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_CHECKUPDATE), Lang.getString(Lang.SETTINGS_SUB_TITLE_CHECKUPDATE)));
45-
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_WEBSIDE), Lang.getString(Lang.SETTINGS_SUB_TITLE_WEBSIDE)));
45+
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_WEBSIDE), PROJECT_URL));
4646
list.add(new PreferenceAdapter.Data(Lang.getString(Lang.SETTINGS_TITLE_VERSION), BuildConfig.VERSION_NAME));
4747
mListAdapter = new PreferenceAdapter(list);
4848
listView.setAdapter(mListAdapter);

‎app/src/main/java/com/yyxx/wechatfp/util/DonateUtil.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,23 @@ public static boolean openAlipayPayPage(Context context, String qrcode) {
3333
return false;
3434
}
3535

36-
public static void openWeChatPay(Context context) {
36+
public static boolean openWeChatPay(Context context) {
3737
try {
3838
Intent donateIntent = new Intent();
3939
donateIntent.setClassName(context, "com.tencent.mm.plugin.remittance.ui.RemittanceAdapterUI");
4040
donateIntent.putExtra("scene", 1);
4141
donateIntent.putExtra("pay_channel", 13);
4242
donateIntent.putExtra("receiver_name", Constant.DONATE_ID_WECHAT);
4343
context.startActivity(donateIntent);
44+
return true;
4445
} catch (Exception e) {
4546
L.e(e);
4647
}
48+
return false;
4749
}
4850

49-
private static void openUri(Context context, String s) {
50-
try {
51-
Intent intent = Intent.parseUri(s, Intent.URI_INTENT_SCHEME);
52-
context.startActivity(intent);
53-
} catch (Exception e) {
54-
L.e(e);
55-
}
51+
private static void openUri(Context context, String s) throws Exception {
52+
Intent intent = Intent.parseUri(s, Intent.URI_INTENT_SCHEME);
53+
context.startActivity(intent);
5654
}
5755
}

‎app/src/main/java/com/yyxx/wechatfp/util/UrlUtil.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import android.net.Uri;
88
import android.util.Log;
99

10+
import com.yyxx.wechatfp.util.log.L;
11+
1012
/**
1113
* Created by Jason on 2017/7/7.
1214
*/
@@ -59,7 +61,11 @@ public static void openUrl(Context context, String url){
5961
Uri content_url = Uri.parse(url);
6062
intent.setData(content_url);
6163
}
62-
context.startActivity(intent);
64+
try {
65+
context.startActivity(intent);
66+
} catch (Exception e) {
67+
L.d(e);
68+
}
6369
}
6470

6571
}

‎app/src/main/java/com/yyxx/wechatfp/util/ViewUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public static void recursiveLoopChildren(ViewGroup parent) {
174174
} else {
175175
if (child != null) {
176176
try {
177-
L.d("view", getViewInfo(child));
177+
L.d("view", getViewInfo(child), child.getTag());
178178
} catch (Exception e) {
179179

180180
}

‎app/src/main/java/com/yyxx/wechatfp/view/DonateView.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import android.widget.AdapterView;
1111
import android.widget.LinearLayout;
1212
import android.widget.ListView;
13+
import android.widget.Toast;
1314

1415
import com.yyxx.wechatfp.Constant;
1516
import com.yyxx.wechatfp.Lang;
@@ -80,9 +81,13 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
8081
PreferenceAdapter.Data data = mListAdapter.getItem(position);
8182
final Context context = getContext();
8283
if (Lang.getString(Lang.SETTINGS_TITLE_ALIPAY).equals(data.title)) {
83-
DonateUtil.openAlipayPayPage(context);
84+
if (!DonateUtil.openAlipayPayPage(context)) {
85+
Toast.makeText(context, Lang.getString(Lang.TOAST_GOTO_DONATE_PAGE_FAIL_ALIPAY), Toast.LENGTH_LONG).show();
86+
}
8487
} else if (Lang.getString(Lang.SETTINGS_TITLE_WECHAT).equals(data.title)) {
85-
DonateUtil.openWeChatPay(context);
88+
if (!DonateUtil.openWeChatPay(context)) {
89+
Toast.makeText(context, Lang.getString(Lang.TOAST_GOTO_DONATE_PAGE_FAIL_WECHAT), Toast.LENGTH_LONG).show();
90+
}
8691
}
8792
}
8893
}

‎app/src/main/java/com/yyxx/wechatfp/view/PasswordInputView.java‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import android.view.inputmethod.InputMethodManager;
1212
import android.widget.EditText;
1313

14+
import com.yyxx.wechatfp.Constant;
1415
import com.yyxx.wechatfp.Lang;
1516
import com.yyxx.wechatfp.util.DpUtil;
1617

@@ -44,9 +45,17 @@ private void initView(Context context) {
4445
mInputView.setFocusable(true);
4546
mInputView.setFocusableInTouchMode(true);
4647
mInputView.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
47-
mInputView.setInputType(InputType.TYPE_CLASS_NUMBER
48-
| InputType.TYPE_NUMBER_VARIATION_PASSWORD
49-
);
48+
String packageName = context.getPackageName();
49+
if (Constant.PACKAGE_NAME_ALIPAY.equals(packageName)
50+
|| Constant.PACKAGE_NAME_TAOBAO.equals(packageName)) {
51+
mInputView.setInputType(InputType.TYPE_CLASS_TEXT
52+
| InputType.TYPE_TEXT_VARIATION_PASSWORD
53+
);
54+
} else {
55+
mInputView.setInputType(InputType.TYPE_CLASS_NUMBER
56+
| InputType.TYPE_NUMBER_VARIATION_PASSWORD
57+
);
58+
}
5059

5160
LayoutParams layoutParam = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
5261
int defHMargin = DpUtil.dip2px(context, 15);

0 commit comments

Comments
 (0)