Commit 079c09c5 authored by fallenstardust's avatar fallenstardust

当萌卡登录时,也登录云备份的萌卡账号

parent 97d73337
...@@ -4,6 +4,7 @@ import android.graphics.Color; ...@@ -4,6 +4,7 @@ import android.graphics.Color;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -133,6 +134,7 @@ public class DeckSquareMyDeckFragment extends Fragment { ...@@ -133,6 +134,7 @@ public class DeckSquareMyDeckFragment extends Fragment {
VUiKit.defer().when(() -> { VUiKit.defer().when(() -> {
LoginResponse result = DeckSquareApiUtil.login(username, password);//执行登录 LoginResponse result = DeckSquareApiUtil.login(username, password);//执行登录
Log.w("seesee result", result.user.username+"//"+result.user.id+"//"+result.token);
SharedPreferenceUtil.setServerToken(result.token); SharedPreferenceUtil.setServerToken(result.token);
SharedPreferenceUtil.setServerUserId(result.user.id); SharedPreferenceUtil.setServerUserId(result.user.id);
return result; return result;
......
...@@ -40,6 +40,7 @@ import cn.garymb.ygomobile.ui.plus.DefWebViewClient; ...@@ -40,6 +40,7 @@ import cn.garymb.ygomobile.ui.plus.DefWebViewClient;
import cn.garymb.ygomobile.utils.DeckUtil; import cn.garymb.ygomobile.utils.DeckUtil;
import cn.garymb.ygomobile.utils.JsonUtil; import cn.garymb.ygomobile.utils.JsonUtil;
import cn.garymb.ygomobile.utils.OkhttpUtil; import cn.garymb.ygomobile.utils.OkhttpUtil;
import cn.garymb.ygomobile.utils.SharedPreferenceUtil;
import okhttp3.Call; import okhttp3.Call;
import okhttp3.Callback; import okhttp3.Callback;
import okhttp3.Response; import okhttp3.Response;
...@@ -338,6 +339,9 @@ public class MyCard { ...@@ -338,6 +339,9 @@ public class MyCard {
if (TextUtils.isEmpty(exception)) { if (TextUtils.isEmpty(exception)) {
mcUser = new Gson().fromJson(userInfo, McUser.class); mcUser = new Gson().fromJson(userInfo, McUser.class);
UserManagement.getDx().setMcUser(mcUser); UserManagement.getDx().setMcUser(mcUser);
Log.i("seesee", userInfo.substring(userInfo.lastIndexOf(":")+2,userInfo.lastIndexOf("\"")));
SharedPreferenceUtil.setServerToken(userInfo.substring(userInfo.lastIndexOf(":")+2,userInfo.lastIndexOf("\"")));
SharedPreferenceUtil.setServerUserId(mcUser.getExternal_id());
} }
if (mListener!=null) if (mListener!=null)
mListener.onLogin(mcUser,exception); mListener.onLogin(mcUser,exception);
......
...@@ -58,6 +58,7 @@ import cn.garymb.ygomobile.ui.mycard.mcchat.management.ServiceManagement; ...@@ -58,6 +58,7 @@ import cn.garymb.ygomobile.ui.mycard.mcchat.management.ServiceManagement;
import cn.garymb.ygomobile.utils.DownloadUtil; import cn.garymb.ygomobile.utils.DownloadUtil;
import cn.garymb.ygomobile.utils.FileUtils; import cn.garymb.ygomobile.utils.FileUtils;
import cn.garymb.ygomobile.utils.HandlerUtil; import cn.garymb.ygomobile.utils.HandlerUtil;
import cn.garymb.ygomobile.utils.SharedPreferenceUtil;
import cn.garymb.ygomobile.utils.YGOUtil; import cn.garymb.ygomobile.utils.YGOUtil;
import cn.garymb.ygomobile.utils.glide.GlideCompat; import cn.garymb.ygomobile.utils.glide.GlideCompat;
import ocgcore.DataManager; import ocgcore.DataManager;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment