CNLive Android Team / newModuleStrike · Commits

Commit 5149c7adeae1c34fd0c66139a1fcc8f928dcf713

Authored by 韩亚云
1 parent 5e2ed2b4

三方登录qq部分手机监测失败问题，微信登录失败问题

Inline Side-by-side
Showing 3 changed files with 4 additions and 3 deletions
app/strike/src/main/java/com/cnlive/strike/MyApp.java
  View file @5149c7a
@@ -14,7 +14,7 @@ public class MyApp extends BaseApplication { @@ -14,7 +14,7 @@ public class MyApp extends BaseApplication {
14 AppConfig.init(this, BuildConfig.APP_ID, BuildConfig.APP_KEY, 14 AppConfig.init(this, BuildConfig.APP_ID, BuildConfig.APP_KEY,
15 BuildConfig.APP_SCERET, BuildConfig.SPECIAL_GROUP_MEMBER_LIMIT, 15 BuildConfig.APP_SCERET, BuildConfig.SPECIAL_GROUP_MEMBER_LIMIT,
16 BuildConfig.VERSION_AS_DEBUG, BuildConfig.BAIDU_MAP_APP_KEY, "", 16 BuildConfig.VERSION_AS_DEBUG, BuildConfig.BAIDU_MAP_APP_KEY, "",
17 - "10514333", "", 17 + "10514333", BuildConfig.WECHAT_APPID,
18 "", "", "", 18 "", "", "",
19 "", "", "", 19 "", "", "",
20 BuildConfig.BAIDU_MAP_APP_KEY, ""); 20 BuildConfig.BAIDU_MAP_APP_KEY, "");
app/strike/src/main/java/com/cnlive/strike/demo/exoplayer/demo/DemoApplication.java
  View file @5149c7a
@@ -82,7 +82,7 @@ public class DemoApplication extends BaseApplication { @@ -82,7 +82,7 @@ public class DemoApplication extends BaseApplication {
82 AppConfig.init(this, com.cnlive.cloud.BuildConfig.APP_ID, com.cnlive.cloud.BuildConfig.APP_KEY, 82 AppConfig.init(this, com.cnlive.cloud.BuildConfig.APP_ID, com.cnlive.cloud.BuildConfig.APP_KEY,
83 com.cnlive.cloud.BuildConfig.APP_SCERET, com.cnlive.cloud.BuildConfig.SPECIAL_GROUP_MEMBER_LIMIT, 83 com.cnlive.cloud.BuildConfig.APP_SCERET, com.cnlive.cloud.BuildConfig.SPECIAL_GROUP_MEMBER_LIMIT,
84 com.cnlive.cloud.BuildConfig.VERSION_AS_DEBUG, com.cnlive.cloud.BuildConfig.BAIDU_MAP_APP_KEY, "", 84 com.cnlive.cloud.BuildConfig.VERSION_AS_DEBUG, com.cnlive.cloud.BuildConfig.BAIDU_MAP_APP_KEY, "",
85 - "10514333", "", 85 + "10514333", com.cnlive.cloud.BuildConfig.WECHAT_APPID,
86 "", "", "", 86 "", "", "",
87 "", "", "", 87 "", "", "",
88 com.cnlive.cloud.BuildConfig.BAIDU_MAP_APP_KEY, ""); 88 com.cnlive.cloud.BuildConfig.BAIDU_MAP_APP_KEY, "");
cloud/third_tool/src/main/java/com/cnlive/login/utils/ThirdLoginUtil.java
  View file @5149c7a
@@ -12,6 +12,7 @@ import com.cnlive.login.model.OtherUserInfo; @@ -12,6 +12,7 @@ import com.cnlive.login.model.OtherUserInfo;
12 import com.cnlive.login.model.ThirdLoginInfo; 12 import com.cnlive.login.model.ThirdLoginInfo;
13 import com.cnlive.login.observer.ThirdLoginObservable; 13 import com.cnlive.login.observer.ThirdLoginObservable;
14 import com.cnlive.share.BuildConfig; 14 import com.cnlive.share.BuildConfig;
  15 +import com.cnlive.share.util.Util;
15 import com.sina.weibo.sdk.auth.Oauth2AccessToken; 16 import com.sina.weibo.sdk.auth.Oauth2AccessToken;
16 import com.sina.weibo.sdk.auth.WbAuthListener; 17 import com.sina.weibo.sdk.auth.WbAuthListener;
17 import com.sina.weibo.sdk.auth.WbConnectErrorMessage; 18 import com.sina.weibo.sdk.auth.WbConnectErrorMessage;
@@ -74,7 +75,7 @@ public class ThirdLoginUtil { @@ -74,7 +75,7 @@ public class ThirdLoginUtil {
74 public static boolean isQQInstalled(Activity context){ 75 public static boolean isQQInstalled(Activity context){
75 boolean isInstall = false; 76 boolean isInstall = false;
76 mContext = context; 77 mContext = context;
77 - isInstall = mTencent.isQQInstalled(context); 78 + isInstall = (Util.checkQQ(context) || Util.isQQClientAvailable(context) || mTencent.isQQInstalled(context));
78 if(isInstall) mTencent.login(context, ACOPE_ALL, listener); 79 if(isInstall) mTencent.login(context, ACOPE_ALL, listener);
79 return isInstall; 80 return isInstall;
80 } 81 }