|
|
@@ -1,20 +1,24 @@
|
|
|
package com.sheep.gamegroup.module.login;
|
|
|
|
|
|
+import android.Manifest;
|
|
|
import android.content.Intent;
|
|
|
import android.content.SharedPreferences;
|
|
|
import android.os.Bundle;
|
|
|
-import androidx.annotation.Nullable;
|
|
|
-import androidx.fragment.app.Fragment;
|
|
|
-import androidx.fragment.app.FragmentTransaction;
|
|
|
import android.text.TextUtils;
|
|
|
import android.util.Log;
|
|
|
import android.view.Menu;
|
|
|
|
|
|
+import androidx.annotation.Nullable;
|
|
|
+import androidx.core.app.ActivityCompat;
|
|
|
+import androidx.fragment.app.Fragment;
|
|
|
+import androidx.fragment.app.FragmentTransaction;
|
|
|
+
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.kfzs.duanduan.utils.StatusBarUtils;
|
|
|
import com.sheep.gamegroup.absBase.BaseUMActivity;
|
|
|
import com.sheep.gamegroup.event.WXLoginAuthEvent;
|
|
|
import com.sheep.gamegroup.greendao.DDProviderHelper;
|
|
|
+import com.sheep.gamegroup.greendao.download.Account;
|
|
|
import com.sheep.gamegroup.model.entity.BaseMessage;
|
|
|
import com.sheep.gamegroup.model.entity.LoginEntity;
|
|
|
import com.sheep.gamegroup.model.util.SheepSubscriber;
|
|
|
@@ -24,7 +28,6 @@ import com.sheep.gamegroup.module.login.fragments.FindAccountFgt;
|
|
|
import com.sheep.gamegroup.module.login.fragments.SignInFgt;
|
|
|
import com.sheep.gamegroup.module.login.fragments.SignUpFgt;
|
|
|
import com.sheep.gamegroup.module.login.fragments.ValidCaptchaFgt;
|
|
|
-import com.sheep.gamegroup.greendao.download.Account;
|
|
|
import com.sheep.gamegroup.module.login.fragments.WelcomeFgt;
|
|
|
import com.sheep.gamegroup.util.ApiJSONUtil;
|
|
|
import com.sheep.gamegroup.util.CertificationUtil;
|
|
|
@@ -67,6 +70,13 @@ public class LoginAct extends BaseUMActivity implements LoginController {
|
|
|
StatusBarUtils.setTranslucent(this);
|
|
|
super.onCreate(savedInstanceState);
|
|
|
EventBus.getDefault().register(this);
|
|
|
+ //登录页面获取状态码
|
|
|
+ checkPermission();
|
|
|
+ }
|
|
|
+
|
|
|
+ private void checkPermission() {
|
|
|
+ String[] permissions = new String[]{Manifest.permission.READ_PHONE_STATE};
|
|
|
+ ActivityCompat.requestPermissions(this, permissions, 0);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -150,8 +160,8 @@ public class LoginAct extends BaseUMActivity implements LoginController {
|
|
|
|
|
|
@Override
|
|
|
public void whenLoginSuccess(int platform, LoginEntity loginResult) {
|
|
|
- Log.e("SNOW", "whenLoginSuccess: access_token---------"+loginResult.getUser().getAccess_token());
|
|
|
- SpUtils.saveQQGameAccessToken(SheepApp.getInstance(),loginResult.getUser().getAccess_token());
|
|
|
+ Log.e("SNOW", "whenLoginSuccess: access_token---------" + loginResult.getUser().getAccess_token());
|
|
|
+ SpUtils.saveQQGameAccessToken(SheepApp.getInstance(), loginResult.getUser().getAccess_token());
|
|
|
// Snackbar.make(getWindow().getDecorView(), "登录成功", Snackbar.LENGTH_SHORT).show();
|
|
|
if (TextUtils.isEmpty(loginResult.getUser().getBirthday())
|
|
|
|| loginResult.getUser().getBirthday().startsWith("000")) {
|
|
|
@@ -162,7 +172,7 @@ public class LoginAct extends BaseUMActivity implements LoginController {
|
|
|
}
|
|
|
TestUtil.saveUser(loginResult);
|
|
|
if (platform == LoginController.PLATFORM_ACCOUNT || platform == LoginController.PLATFORM_PHONE) {
|
|
|
- DDProviderHelper.getInstance().saveAccount(Account.generateByUser(loginResult.getUser()),platform);
|
|
|
+ DDProviderHelper.getInstance().saveAccount(Account.generateByUser(loginResult.getUser()), platform);
|
|
|
}
|
|
|
//登录成功记录设备信息
|
|
|
ApiJSONUtil.postUserDeviceLog();
|
|
|
@@ -353,7 +363,7 @@ public class LoginAct extends BaseUMActivity implements LoginController {
|
|
|
if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
|
|
|
SpUtils.saveToken(SheepApp.getInstance(), loginEty.getToken());
|
|
|
DataUtil.getInstance().initUserEntity(loginEty.getUser());
|
|
|
- SpUtils.saveQQGameAccessToken(SheepApp.getInstance(),loginEty.getUser().getAccess_token());
|
|
|
+ SpUtils.saveQQGameAccessToken(SheepApp.getInstance(), loginEty.getUser().getAccess_token());
|
|
|
}
|
|
|
whenLoginSuccess(LoginController.PLATFORM_WX, loginEty);
|
|
|
TestUtil.saveUser(loginEty);
|