CNLive Android Team / CNLiveApp · Commits

Commit 64901775144905fe545f4b911f152ef60b0d7089

Authored by 陈硕
2 parents ecc07015 425522c4

合并代码

Inline Side-by-side
Showing 2 changed files with 25 additions and 3 deletions
app/src/main/java/com/cnlive/gundam/user/fragment/UserPersonalEditFragment.java
  View file @6490177
... ... @@ -129,6 +129,10 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View
129 129 if (i == IUserService.SUCCESS) {
130 130 updateUserInfo();
131 131 Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show();
  132 + } else if (i == IUserService.ERROR_TOKEN_INVALID) {
  133 + UserService userService = UserService.getInstance(getActivity());
  134 + userService.clearUser();
  135 + getActivity().finish();
132 136 } else {
133 137 Toast.makeText(getActivity(), "提交失败" + s, Toast.LENGTH_LONG).show();
134 138 }
... ... @@ -142,6 +146,10 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View
142 146 UserData userData = (UserData) obj;
143 147 UserService userService = UserService.getInstance(getActivity());
144 148 userService.setActiveAccountInfo(userData.getData());
  149 + } else if (i == IUserService.ERROR_TOKEN_INVALID) {
  150 + UserService userService = UserService.getInstance(getActivity());
  151 + userService.clearUser();
  152 + getActivity().finish();
145 153 }
146 154 }
147 155 });
... ...
app/src/main/java/com/cnlive/gundam/user/fragment/UserPersonalFragment.java
  View file @6490177
... ... @@ -93,12 +93,17 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
93 93 @Override
94 94 public void onResume() {
95 95 super.onResume();
96   - initData();
  96 + UserService userService = UserService.getInstance(getActivity());
  97 + user = userService.getActiveAccountInfo();
  98 + if(user != null && user.getUid() > 0){
  99 + initData();
  100 + updateUserInfo();
  101 + }else{
  102 + getActivity().finish();
  103 + }
97 104 }
98 105  
99 106 private void initData() {
100   - UserService userService = UserService.getInstance(getActivity());
101   - user = userService.getActiveAccountInfo();
102 107 String gender = user.getGender().equals("f") ? "女" : (user.getGender().equals("m") ? "男" : "未知");
103 108 personalData = new ArrayList<>();
104 109 personalData.add(new PersonalData("头像", user.getFaceurl(), PersonalData.TYPE_HEADER));
... ... @@ -278,6 +283,10 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
278 283 if (i == IUserService.SUCCESS) {
279 284 updateUserInfo();
280 285 Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show();
  286 + } else if (i == IUserService.ERROR_TOKEN_INVALID) {
  287 + UserService userService = UserService.getInstance(getActivity());
  288 + userService.clearUser();
  289 + getActivity().finish();
281 290 } else {
282 291 Toast.makeText(getActivity(), "提交失败" + s, Toast.LENGTH_LONG).show();
283 292 }
... ... @@ -291,7 +300,12 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
291 300 UserData userData = (UserData) obj;
292 301 UserService userService = UserService.getInstance(getActivity());
293 302 userService.setActiveAccountInfo(userData.getData());
  303 + user = userService.getActiveAccountInfo();
294 304 initData();
  305 + } else if (i == IUserService.ERROR_TOKEN_INVALID) {
  306 + UserService userService = UserService.getInstance(getActivity());
  307 + userService.clearUser();
  308 + getActivity().finish();
295 309 }
296 310 }
297 311 });
... ...