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

相关数据关联UserDataEntity, 统一在Interceptor添加token

Browse Source
This commit is contained in:
kehaoyuan
2017-09-14 15:23:08 +08:00
parent 1e7d43bc72
commit b0dde281ea
30 changed files with 763 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/gh/common/util/LoginUtils.java
View File

@ -241,7 +241,7 @@ public class LoginUtils {
HashMap<String, String> map = new HashMap<>();
map.put("device_id", syncDeviceID);
RequestBody body = RequestBody.create(MediaType.parse("application/json"), new JSONObject(map).toString());
RetrofitManager.getInstance(context).getApi().syncUserData(token, body)
RetrofitManager.getInstance(context).getApi().syncUserData(body)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Response<ResponseBody>() {
@ -274,12 +274,10 @@ public class LoginUtils {
// 注销登录
public static void logout(final Context context) {
LoginResponseEntity loginToken = getLoginToken(context);
if (loginToken == null || loginToken.getAccessToken() == null) return;
RetrofitManager.getInstance(context)
.getUsersea()
.logout(loginToken.getAccessToken().getValue())
.logout()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Response<ResponseBody>() {
@ -344,7 +342,7 @@ public class LoginUtils {
public static void getUserData(final Context context, String token, final onLoginCallBackListener listener, final LoginTag loginTag) {
RetrofitManager.getInstance(context)
.getApi()
.getUserInfo(token)
.getUserInfo()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Response<UserInfoEntity>() {
@ -466,14 +464,11 @@ public class LoginUtils {
final Dialog loadingDialog = DialogUtils.showWaitDialog(context, "正在修改信息...");
LoginResponseEntity loginToken = getLoginToken(context);
if (loginToken == null || loginToken.getAccessToken() == null) return;
RequestBody body = RequestBody.create(MediaType.parse("application/json"),
new JSONObject(map).toString());
RetrofitManager.getInstance(context)
.getUsersea()
.changeUserInfo(loginToken.getAccessToken().getValue(), body)
.changeUserInfo(body)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Response<ResponseBody>() {