From 205a7bba1dbef65c082daa17df82ab8339a5411d Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 05 二月 2021 21:55:24 +0800
Subject: [PATCH] Merge branch '3.7.9' of ssh://193.112.35.168:29418/buwan-android-new into 3.7.9
---
BuWanVideo/src/com/weikou/beibeivideo/ui/login/LoginActivity.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/login/LoginActivity.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/login/LoginActivity.java
index 0f6937f..8a58fac 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/login/LoginActivity.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/login/LoginActivity.java
@@ -127,7 +127,7 @@
SingleToast.showToast(LoginActivity.this, "閫夋嫨鍚屾剰鐢ㄦ埛鍗忚鍚庢柟鍙櫥褰�");
break;
}
- if (isQQClientAvailable()) {
+ if (isQQClientAvailable(getApplicationContext())) {
loginType = "1";
// qq鐧诲綍閫昏緫澶勭悊 鐐瑰嚮鐧诲綍鍚庨渶瑕佹殏鏃堕攣瀹氳繑鍥為敭鍜岃繑鍥炲姛鑳� 涓嶇劧浼氭姤閿�
lockBack(true);
@@ -142,7 +142,7 @@
SingleToast.showToast(LoginActivity.this, "閫夋嫨鍚屾剰鐢ㄦ埛鍗忚鍚庢柟鍙櫥褰�");
break;
}
- if (isWXClientAvailable()) {
+ if (isWXClientAvailable(getApplicationContext())) {
loginType = "2";
SendAuth.Req req = new SendAuth.Req();
req.scope = "snsapi_userinfo";
@@ -181,8 +181,8 @@
/**
* 鍒ゆ柇qq鏄惁鍙敤
*/
- public boolean isQQClientAvailable() {
- final PackageManager packageManager = getPackageManager();
+ public static boolean isQQClientAvailable(Context context) {
+ final PackageManager packageManager = context.getPackageManager();
List<PackageInfo> pinfo = packageManager.getInstalledPackages(0);
if (pinfo != null) {
for (int i = 0; i < pinfo.size(); i++) {
@@ -195,8 +195,8 @@
return false;
}
- public boolean isWXClientAvailable() {
- final PackageManager packageManager = getPackageManager();
+ public static boolean isWXClientAvailable(Context context) {
+ final PackageManager packageManager = context.getPackageManager();
List<PackageInfo> pinfo = packageManager.getInstalledPackages(0);
if (pinfo != null) {
for (int i = 0; i < pinfo.size(); i++) {
--
Gitblit v1.8.0