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

登录重构（网络层的token重试未完成， 还有其他登录相关代码的整理）

Browse Source
This commit is contained in:
kehaoyuan
2017-12-01 16:59:32 +08:00
parent ea2b9ef4df
commit ce36dd4012
38 changed files with 1376 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java
View File

@ -1,5 +1,8 @@
package com.gh.gamecenter;
import android.app.Dialog;
import android.arch.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
@ -9,15 +12,19 @@ import android.os.Bundle;
import android.preference.PreferenceManager;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
import com.gh.base.BaseActivity;
import com.gh.common.util.DialogUtils;
import com.gh.common.util.EntranceUtils;
import com.gh.common.util.LoginUtils;
import com.gh.common.util.RandomUtils;
import com.gh.common.util.UserIconUtils;
import com.gh.gamecenter.entity.UserInfoEntity;
import com.gh.gamecenter.login.ApiResponse;
import com.gh.gamecenter.login.UserViewModel;
import com.lightgame.utils.Utils;
import org.json.JSONException;
@ -30,12 +37,10 @@ import java.util.Locale;
import butterknife.BindView;
import butterknife.OnClick;
import static com.gh.gamecenter.UserInfoActivity.USERINFO_CHANGE_REQUEST;
/**
* Created by khy on 2017/2/10.
*/
public class SelectUserIconActivity extends BaseActivity implements LoginUtils.onChangeUserInfoListener {
public class SelectUserIconActivity extends BaseActivity {
@BindView(R.id.skip_media_store)
TextView mSkipMediaStore;
@ -43,6 +48,10 @@ public class SelectUserIconActivity extends BaseActivity implements LoginUtils.o
public final static int CROP_ICON_REQUEST = 12;
public final static int MEDIA_ICON_REQUEST = 13;
private UserViewModel mUserViewModel;
private Dialog mLoadingDialog;
private SharedPreferences sp;
@NonNull
@ -86,7 +95,7 @@ public class SelectUserIconActivity extends BaseActivity implements LoginUtils.o
// intent.putExtra("url", url);
// setResult(0x125, intent);
// finish();
LoginUtils.changeUserInfo(this, this, url, "icon");
change(url);
}
}
@ -97,6 +106,19 @@ public class SelectUserIconActivity extends BaseActivity implements LoginUtils.o
sp = PreferenceManager.getDefaultSharedPreferences(this);
UserViewModel.Factory factory = new UserViewModel.Factory(getApplication());
mUserViewModel = ViewModelProviders.of(this, factory).get(UserViewModel.class);
mUserViewModel.getEditObsUserinfo().observe(this, new Observer<ApiResponse<UserInfoEntity>>() {
@Override
public void onChanged(@Nullable ApiResponse<UserInfoEntity> userInfoEntity) {
if (mLoadingDialog != null) {
mLoadingDialog.dismiss();
}
if (mLoadingDialog != null && userInfoEntity != null && userInfoEntity.getData() != null) {
finish();
}
}
});
}
@OnClick({R.id.user_default_icon_1, R.id.user_default_icon_2, R.id.user_default_icon_3, R.id.user_default_icon_4,
@ -179,12 +201,12 @@ public class SelectUserIconActivity extends BaseActivity implements LoginUtils.o
// intent.putExtra("url", iconUrl);
// setResult(0x125, intent);
// finish();
LoginUtils.changeUserInfo(this, this, iconUrl, "icon");
change(iconUrl);
}
@Override
public void onChange() {
setResult(USERINFO_CHANGE_REQUEST);
finish();
private void change(String url) {
mLoadingDialog = DialogUtils.showWaitDialog(this, "正在修改信息...");
mUserViewModel.changeUserInfo(url, "icon");
}
}