Skip to content

Commit e0e65d4

Browse files
committed
Drop QQ < 7.3.0 support
1 parent 22c28e3 commit e0e65d4

File tree

3 files changed

+8
-24
lines changed

3 files changed

+8
-24
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public static class WeChat {
5353
}
5454

5555
public static class QQ {
56-
public static final int QQ_VERSION_CODE_7_3_0 = 750;
5756
public static final int QQ_VERSION_CODE_8_2_11 = 1380;
5857
public static final int QQ_VERSION_CODE_8_8_83 = 2654;
5958
}

app/src/main/java/com/surcumference/fingerprint/plugin/impl/qq/QQBasePlugin.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,8 @@ private synchronized void initPayActivity(Activity activity, int retryDelay, int
241241
fingerprintView.setVisibility(View.GONE);
242242
}
243243
if (payDialog.titleTextView != null) {
244-
if (versionCode >= Constant.QQ.QQ_VERSION_CODE_7_3_0) {
245-
payDialog.titleTextView.setClickable(true);
246-
payDialog.titleTextView.setText("找回密码");
247-
} else {
248-
payDialog.titleTextView.setText(Lang.getString(R.id.qq_payview_password_title));
249-
}
244+
payDialog.titleTextView.setClickable(true);
245+
payDialog.titleTextView.setText("找回密码");
250246
}
251247
if (payDialog.usePasswordText != null) {
252248
payDialog.usePasswordText.setText(Lang.getString(R.id.qq_payview_fingerprint_switch_text));
@@ -289,9 +285,7 @@ private synchronized void initPayActivity(Activity activity, int retryDelay, int
289285
}
290286
if (payDialog.titleTextView != null) {
291287
payDialog.titleTextView.setText(Lang.getString(R.id.qq_payview_fingerprint_title));
292-
if (versionCode >= Constant.QQ.QQ_VERSION_CODE_7_3_0) {
293-
payDialog.titleTextView.setClickable(false);
294-
}
288+
payDialog.titleTextView.setClickable(false);
295289
}
296290
if (payDialog.usePasswordText != null) {
297291
payDialog.usePasswordText.setText(Lang.getString(R.id.qq_payview_password_switch_text));

app/src/main/java/com/surcumference/fingerprint/plugin/impl/qq/QQBasePlugin_8_2_11.java

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public class QQBasePlugin_8_2_11 implements IAppPlugin, IMockCurrentUser {
5555
private static final String TAG_ACTIVITY_PAY = "TAG_ACTIVITY_PAY";
5656
private static final String TAG_ACTIVITY_FIRST_RESUME = "TAG_ACTIVITY_FIRST_RESUME";
5757

58-
protected static final int QQ_VERSION_CODE_7_3_0 = 750;
5958
protected static final int QQ_VERSION_CODE_8_8_83 = 2654;
6059

6160
private XBiometricIdentify mFingerprintIdentify;
@@ -227,12 +226,8 @@ private synchronized void initPayActivity(Activity activity, int retryDelay, int
227226
fingerprintView.setVisibility(View.GONE);
228227
}
229228
if (payDialog.titleTextView != null) {
230-
if (versionCode >= QQ_VERSION_CODE_7_3_0) {
231-
payDialog.titleTextView.setClickable(true);
232-
payDialog.titleTextView.setText("找回密码");
233-
} else {
234-
payDialog.titleTextView.setText(Lang.getString(R.id.qq_payview_password_title));
235-
}
229+
payDialog.titleTextView.setClickable(true);
230+
payDialog.titleTextView.setText("找回密码");
236231
}
237232
if (payDialog.usePasswordText != null) {
238233
payDialog.usePasswordText.setText(Lang.getString(R.id.qq_payview_fingerprint_switch_text));
@@ -275,9 +270,7 @@ private synchronized void initPayActivity(Activity activity, int retryDelay, int
275270
}
276271
if (payDialog.titleTextView != null) {
277272
payDialog.titleTextView.setText(Lang.getString(R.id.qq_payview_fingerprint_title));
278-
if (versionCode >= QQ_VERSION_CODE_7_3_0) {
279-
payDialog.titleTextView.setClickable(false);
280-
}
273+
payDialog.titleTextView.setClickable(false);
281274
}
282275
if (payDialog.usePasswordText != null) {
283276
payDialog.usePasswordText.setText(Lang.getString(R.id.qq_payview_password_switch_text));
@@ -379,10 +372,8 @@ private View prepareFingerprintView(Context context) {
379372
textView.setTextSize(16);
380373
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
381374
params.gravity = Gravity.CENTER;
382-
if (getVersionCode(context) >= QQ_VERSION_CODE_7_3_0) {
383-
//QQ居然拿键盘底部来定位... To TP工程师. 你们的Activity太重了
384-
params.bottomMargin = DpUtils.dip2px(context, 30);
385-
}
375+
//QQ居然拿键盘底部来定位... To TP工程师. 你们的Activity太重了
376+
params.bottomMargin = DpUtils.dip2px(context, 30);
386377
textView.setLayoutParams(params);
387378
return textView;
388379
}

0 commit comments

Comments
 (0)