Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '3.0' of gitlab.ghzhushou.com:halo/assistant-android into 3.0

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/common/util/GetLoginDataUtils.java
#	app/src/main/java/com/gh/gamecenter/LoginActivity.java
This commit is contained in:
kehaoyuan
2017-07-10 17:00:22 +08:00
parent ba3e882f47 b9a80e12a8
commit 6f3827db15
65 changed files with 1256 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/gh/common/util/GetLoginDataUtils.java
View File

@ -2,6 +2,7 @@ package com.gh.common.util;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.widget.Toast;
import com.gh.common.constant.Config;
@ -44,7 +45,7 @@ public class GetLoginDataUtils {
private Tencent mTencent;
private IWXAPI mIWXAPI;
public SsoHandler mSsoHandler;
private SsoHandler mSsoHandler;
private Oauth2AccessToken mAccessToken; // weibo
public static final String SCOPE =
@ -133,6 +134,9 @@ public class GetLoginDataUtils {
}
};
public void onQQCallback(int requestCode, int resultCode, Intent data) {
Tencent.onActivityResultData(requestCode, resultCode, data, QqLoginListener);
}
// QQ登录
public void QQLogin(OnLoginDataListener listener, Activity activity) {
@ -162,6 +166,11 @@ public class GetLoginDataUtils {
mLoginListener.OnLoginData(content, LoginUtils.LoginTag.wechat);
}
public void onWeiboCallback(int requestCode, int resultCode, Intent data) {
if (mSsoHandler != null) {
mSsoHandler.authorizeCallBack(requestCode, resultCode, data);
}
}
// 微博登录
public void WeiBoLogin(OnLoginDataListener listener, Activity context) {
mSsoHandler = new SsoHandler(context);
@ -193,6 +202,7 @@ public class GetLoginDataUtils {
}
}
});
JSONObject content = new JSONObject();
try {
content.put("uid", token.getUid());