修改更新用户信息的逻辑和token失效的代码处理

谷俊
1 parent 915b1b18
Showing 3 changed files with 54 additions and 5 deletions
app/src/main/java/com/cnlive/gundam/main/ui/fragment/ConfigFragment.java
app/src/main/java/com/cnlive/gundam/user/fragment/UserPersonalEditFragment.java
app/src/main/java/com/cnlive/gundam/user/fragment/UserPersonalFragment.java
@@ -17,7 +17,10 @@ import com.cnlive.gundam.user.activity.LoginActivity;
 import com.cnlive.gundam.user.activity.UserPersonalActivity;
 import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.user.model.User;
-
+import com.cnlive.libs.user.IUserService;
+import com.cnlive.libs.user.UserUtil;
+import com.cnlive.libs.user.model.UserData;
+import com.cnlive.libs.util.data.network.Callback;
 /**
@@ -27,6 +30,8 @@ import com.cnlive.gundam.user.model.User;
 public class ConfigFragment extends Fragment implements View.OnClickListener {
     private UserFragmentBinding binding;
+    private User user;
+
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -81,7 +86,11 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
     @Override
     public void onResume() {
         super.onResume();
-        notifyUI(UserService.getInstance(getActivity()).getActiveAccountInfo().getUid() != 0);
+        user = UserService.getInstance(getActivity()).getActiveAccountInfo();
+        boolean isLogin = user != null && user.getUid() != 0;
+        notifyUI(isLogin);
+        if (!isLogin) return;
+        updateUserInfo();
     }
     private void notifyUI(boolean isLogin) {
@@ -94,4 +103,22 @@ public class ConfigFragment extends Fragment implements View.OnClickListener {
             binding.tvNickname.setText(getString(R.string.click_login));
         }
     }
+
+    private void updateUserInfo() {
+        UserUtil.queryUserInfo(String.valueOf(user.getUid()), String.valueOf(user.getUid()), new Callback() {
+            @Override
+            public void onState(int i, String s, Object obj) {
+                if (i == IUserService.SUCCESS) {
+                    UserData userData = (UserData) obj;
+                    UserService userService = UserService.getInstance(getActivity());
+                    userService.setActiveAccountInfo(userData.getData());
+                    notifyUI(true);
+                } else if (i == IUserService.ERROR_TOKEN_INVALID) {
+                    UserService userService = UserService.getInstance(getActivity());
+                    userService.clearUser();
+                    notifyUI(false);
+                }
+            }
+        });
+    }
 }
@@ -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();
                 }
             }
         });