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

refactor_questionedit分支合并到dev

Browse Source
This commit is contained in:
kehaoyuan
2018-05-21 10:29:24 +08:00
parent 3e488d28cd 7e350cac41
commit 9ebf2be016
15 changed files with 63 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
View File

@ -116,7 +116,6 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
public final static String LOGIN_TAG = "login_tag"; //登入标识
public final static String LOGOUT_TAG = "logout_tag"; // 登出标识
public final static String LOGIN_RETRY = "login_retry";
public final static String MESSAGE_UNREAD_TAG = "message_unread_tag";
public final static String MESSAGE_READ_OVER = "MESSAGE_READ_OVER";
public static final int REQUEST_MESSAGE = 199;
@ -131,8 +130,6 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
private UserViewModel mUserViewModel;
private MessageUnreadViewModel mUnreadViewModel;
private boolean isLogin;
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
@ -163,8 +160,6 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
mUserViewModel = ViewModelProviders.of(this, factory).get(UserViewModel.class);
mUserViewModel.getLoginObsUserinfo().observe(this, this);
isLogin = mUserViewModel.isLogin();
mUnreadViewModel = ViewModelProviders.of(this,
new MessageUnreadViewModel.Factory(HaloApp.getInstance().getApplication())).get(MessageUnreadViewModel.class);
mUnreadViewModel.getLiveData().observe(this
@ -194,7 +189,9 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
// 连接上网络事件
@Subscribe(threadMode = ThreadMode.MAIN)
public void onEventMainThread(EBNetworkState busNetworkState) {
if (busNetworkState.isNetworkConnected() && isLogin && mUserInfoEntity == null) {
if (busNetworkState.isNetworkConnected()
&& mUserViewModel.isLogin()
&& (mUserInfoEntity == null || TextUtils.isEmpty(UserManager.getInstance().getToken()))) {
mUserViewModel.retryCheckLogin();
}
}
@ -207,8 +204,6 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
}
} else if (LOGOUT_TAG.equals(reuse.getType())) {
mUserViewModel.logout();
} else if (LOGIN_RETRY.equals(reuse.getType())) {
mUserViewModel.retryCheckLogin();
}
}
@ -447,23 +442,12 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
mUnreadViewModel.clean();
changeLoginState(false);
EventBus.getDefault().post(new EBConcernChanged());
isLogin = false;
} else {
changeLoginState(true);
isLogin = true;
}
if (mLoginDialog != null) {
mLoginDialog.dismissAllowingStateLoss();
}
}
@Override
public void onResume() {
super.onResume();
// 检验登录一致性
if (isLogin && TextUtils.isEmpty(UserManager.getInstance().getToken())) {
mUserViewModel.retryCheckLogin();
}
}
}