合并代码

陈硕
2 parents ecc07015 425522c4
Showing 2 changed files with 25 additions and 3 deletions
app/src/main/java/com/cnlive/gundam/user/fragment/UserPersonalEditFragment.java
app/src/main/java/com/cnlive/gundam/user/fragment/UserPersonalFragment.java
@@ -129,6 +129,10 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View
         if (i == IUserService.SUCCESS) {
             updateUserInfo();
             Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show();
+        } else if (i == IUserService.ERROR_TOKEN_INVALID) {
+            UserService userService = UserService.getInstance(getActivity());
+            userService.clearUser();
+            getActivity().finish();
         } else {
             Toast.makeText(getActivity(), "提交失败" + s, Toast.LENGTH_LONG).show();
         }
@@ -142,6 +146,10 @@ public class UserPersonalEditFragment extends Fragment implements Callback, View
                     UserData userData = (UserData) obj;
                     UserService userService = UserService.getInstance(getActivity());
                     userService.setActiveAccountInfo(userData.getData());
+                } else if (i == IUserService.ERROR_TOKEN_INVALID) {
+                    UserService userService = UserService.getInstance(getActivity());
+                    userService.clearUser();
+                    getActivity().finish();
                 }
             }
         });
@@ -93,12 +93,17 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
     @Override
     public void onResume() {
         super.onResume();
-        initData();
+        UserService userService = UserService.getInstance(getActivity());
+        user = userService.getActiveAccountInfo();
+        if(user != null && user.getUid() > 0){
+            initData();
+            updateUserInfo();
+        }else{
+            getActivity().finish();
+        }
     }
     private void initData() {
-        UserService userService = UserService.getInstance(getActivity());
-        user = userService.getActiveAccountInfo();
         String gender = user.getGender().equals("f") ? "女" : (user.getGender().equals("m") ? "男" : "未知");
         personalData = new ArrayList<>();
         personalData.add(new PersonalData("头像", user.getFaceurl(), PersonalData.TYPE_HEADER));
@@ -278,6 +283,10 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
         if (i == IUserService.SUCCESS) {
             updateUserInfo();
             Toast.makeText(getActivity(), "提交成功", Toast.LENGTH_LONG).show();
+        } else if (i == IUserService.ERROR_TOKEN_INVALID) {
+            UserService userService = UserService.getInstance(getActivity());
+            userService.clearUser();
+            getActivity().finish();
         } else {
             Toast.makeText(getActivity(), "提交失败" + s, Toast.LENGTH_LONG).show();
         }
@@ -291,7 +300,12 @@ public class UserPersonalFragment extends Fragment implements DataBindingAdapter
                     UserData userData = (UserData) obj;
                     UserService userService = UserService.getInstance(getActivity());
                     userService.setActiveAccountInfo(userData.getData());
+                    user = userService.getActiveAccountInfo();
                     initData();
+                } else if (i == IUserService.ERROR_TOKEN_INVALID) {
+                    UserService userService = UserService.getInstance(getActivity());
+                    userService.clearUser();
+                    getActivity().finish();
                 }
             }
         });