|
@@ -19,6 +19,7 @@ import com.sheep.gamegroup.module.login.fragments.SignUpFgt;
|
|
|
import com.sheep.gamegroup.module.login.fragments.ValidCaptchaFgt;
|
|
import com.sheep.gamegroup.module.login.fragments.ValidCaptchaFgt;
|
|
|
import com.sheep.gamegroup.greendao.download.Account;
|
|
import com.sheep.gamegroup.greendao.download.Account;
|
|
|
import com.sheep.gamegroup.module.login.fragments.WelcomeFgt;
|
|
import com.sheep.gamegroup.module.login.fragments.WelcomeFgt;
|
|
|
|
|
+import com.sheep.gamegroup.util.ApiJSONUtil;
|
|
|
import com.sheep.gamegroup.util.CertificationUtil;
|
|
import com.sheep.gamegroup.util.CertificationUtil;
|
|
|
import com.sheep.gamegroup.util.Jump2View;
|
|
import com.sheep.gamegroup.util.Jump2View;
|
|
|
import com.sheep.gamegroup.util.TestUtil;
|
|
import com.sheep.gamegroup.util.TestUtil;
|
|
@@ -101,7 +102,8 @@ public class LoginAct extends BaseUMActivity implements LoginController {
|
|
|
// Snackbar.make(getWindow().getDecorView(), "登录成功", Snackbar.LENGTH_SHORT).show();
|
|
// Snackbar.make(getWindow().getDecorView(), "登录成功", Snackbar.LENGTH_SHORT).show();
|
|
|
if (TextUtils.isEmpty(loginResult.getUser().getBirthday())
|
|
if (TextUtils.isEmpty(loginResult.getUser().getBirthday())
|
|
|
|| loginResult.getUser().getBirthday().startsWith("000")) {
|
|
|| loginResult.getUser().getBirthday().startsWith("000")) {
|
|
|
- getUserInfo(platform, loginResult);
|
|
|
|
|
|
|
+ ApiJSONUtil.postUserForm();//3.5.0 by 曾杰斌,注:这里认为,没有设置过生日的用户都是新注册用户,需要记录注册来源,可能从网页注册的用户进来后,记录来源会有问题,但是现在只记录游戏用户,问题不是很大
|
|
|
|
|
+ getUserInfoFromUM(platform, loginResult);
|
|
|
} else {
|
|
} else {
|
|
|
goMain(loginResult);
|
|
goMain(loginResult);
|
|
|
}
|
|
}
|
|
@@ -111,7 +113,7 @@ public class LoginAct extends BaseUMActivity implements LoginController {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private void getUserInfo(int platform, final LoginEntity entity) {
|
|
|
|
|
|
|
+ private void getUserInfoFromUM(int platform, final LoginEntity entity) {
|
|
|
if (platform == LoginController.PLATFORM_QQ || platform == LoginController.PLATFORM_WX) {
|
|
if (platform == LoginController.PLATFORM_QQ || platform == LoginController.PLATFORM_WX) {
|
|
|
UMShareAPI.get(SheepApp.getInstance()).getPlatformInfo(this,
|
|
UMShareAPI.get(SheepApp.getInstance()).getPlatformInfo(this,
|
|
|
platform == LoginController.PLATFORM_QQ ? SHARE_MEDIA.QQ : SHARE_MEDIA.WEIXIN,
|
|
platform == LoginController.PLATFORM_QQ ? SHARE_MEDIA.QQ : SHARE_MEDIA.WEIXIN,
|