对接用户信息接口

app/src/main/java/com/ynstkz/shitu/android/activity/AlterPasswordActivity.java

@@ -7,18 +7,14 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.common.library.okhttp.callback.Callback;
 import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
-import com.ynstkz.shitu.android.application.STSign;
 import com.ynstkz.shitu.android.base.BaseBean;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
-import com.ynstkz.shitu.android.bean.UserBean;
-import com.ynstkz.shitu.android.common.Constants;
 import com.ynstkz.shitu.android.data.RequestGroup;
 
 import butterknife.Bind;

app/src/main/java/com/ynstkz/shitu/android/activity/AlterUserNameActivity.java

@@ -13,15 +13,11 @@ import android.widget.TextView;
 import com.common.library.okhttp.callback.Callback;
 import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
-import com.ynstkz.shitu.android.application.STSign;
 import com.ynstkz.shitu.android.base.BaseBean;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
-import com.ynstkz.shitu.android.bean.UserBean;
-import com.ynstkz.shitu.android.common.Constants;
 import com.ynstkz.shitu.android.data.RequestGroup;
 
 import butterknife.Bind;
-import okhttp3.Cache;
 import okhttp3.Call;
 import okhttp3.Response;
 
@@ -103,11 +99,6 @@ public class AlterUserNameActivity extends TitleBarActivity {
                 if(baseBean != null){
                     showToast(baseBean.getMsg());
                     if("200".equals(baseBean.getCode())){
-                        UserBean userBean = STSign.getInstance().getUser();
-                        if(userBean != null){
-                            userBean.setUserName(userName);
-                            com.common.library.cache.Cache.put(Constants.CACHE_USER_KEY, userBean);
-                        }
                         finish();
                     }
                 }

app/src/main/java/com/ynstkz/shitu/android/activity/LoginActivity.java

@@ -5,25 +5,19 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
-import android.util.Log;
-import android.util.Patterns;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.common.library.cache.Cache;
 import com.common.library.okhttp.callback.Callback;
 import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.bean.LoginBean;
-import com.ynstkz.shitu.android.bean.UserBean;
-import com.ynstkz.shitu.android.common.Constants;
 import com.ynstkz.shitu.android.data.RequestGroup;
 import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
-import com.ynstkz.shitu.android.event.LocationChangedEvent;
 import com.ynstkz.shitu.android.event.LoginEvent;
 import com.ynstkz.shitu.android.event.RegisterSuccessEvent;
 import com.ynstkz.shitu.android.utils.StatusBarUtil;
@@ -33,7 +27,6 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import butterknife.Bind;
-import butterknife.ButterKnife;
 import okhttp3.Call;
 import okhttp3.Response;
 
@@ -154,11 +147,9 @@ public class LoginActivity extends TitleBarActivity {
                             EventBus.getDefault().post(new LoginEvent());
                             showToast(loginBean.getMsg());
 
-                            UserBean userBean = new UserBean();
-                            userBean.setUserName(loginBean.getData().getUserName());
-                            userBean.setUserId(loginBean.getData().getUserId()+"");
-                            userBean.setToken(loginBean.getData().getToken());
-                            Cache.put(Constants.CACHE_USER_KEY, userBean);
+                            SharedPreferencesUtils.saveToken(loginBean.getData().getToken());
+                            SharedPreferencesUtils.saveUserId(loginBean.getData().getUserId());
+
                             finish();
                         }
                     } else {

app/src/main/java/com/ynstkz/shitu/android/activity/RegisterSubmitActivity.java

@@ -11,15 +11,11 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.amap.api.navi.view.PoiInputResItemWidget;
-import com.common.library.cache.Cache;
 import com.common.library.okhttp.callback.Callback;
 import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.bean.RegisterBean;
-import com.ynstkz.shitu.android.bean.UserBean;
-import com.ynstkz.shitu.android.common.Constants;
 import com.ynstkz.shitu.android.data.RequestGroup;
 import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
 import com.ynstkz.shitu.android.event.RegisterSuccessEvent;
@@ -127,11 +123,9 @@ public class RegisterSubmitActivity extends TitleBarActivity {
                             EventBus.getDefault().post(new RegisterSuccessEvent());
                             showToast(bean.getMsg());
 
-                            UserBean userBean = new UserBean();
-                            userBean.setUserName(bean.getData().getUserName());
-                            userBean.setUserId(bean.getData().getUserId()+"");
-                            userBean.setToken(bean.getData().getToken());
-                            Cache.put(Constants.CACHE_USER_KEY, userBean);
+                            SharedPreferencesUtils.saveToken(bean.getData().getToken());
+                            SharedPreferencesUtils.saveUserId(bean.getData().getUserId());
+
                             finish();
                         }
                     } else {

app/src/main/java/com/ynstkz/shitu/android/activity/UserInfoActivity.java

@@ -3,7 +3,6 @@ package com.ynstkz.shitu.android.activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.telecom.PhoneAccount;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -12,9 +11,7 @@ import android.widget.TextView;
 import com.common.library.cache.Cache;
 import com.common.library.view.materialdialog.MaterialDialog;
 import com.ynstkz.shitu.android.R;
-import com.ynstkz.shitu.android.application.STSign;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
-import com.ynstkz.shitu.android.bean.UserBean;
 import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
 import com.ynstkz.shitu.android.event.LogoutEvent;
 
@@ -141,9 +138,6 @@ public class UserInfoActivity extends TitleBarActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        UserBean userBean = STSign.getInstance().getUser();
-        if(userBean != null){
-            tvUsername.setText(userBean.getUserName());
-        }
+
     }
 }

app/src/main/java/com/ynstkz/shitu/android/application/STSign.java

@@ -1,13 +1,7 @@
 package com.ynstkz.shitu.android.application;
 
-import android.text.TextUtils;
-
-import com.common.library.cache.Cache;
 import com.common.library.okhttp.callback.Callback;
-import com.ynstkz.shitu.android.bean.UserBean;
-import com.ynstkz.shitu.android.common.Constants;
 import com.ynstkz.shitu.android.data.RequestGroup;
-import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
 import com.ynstkz.shitu.android.listener.CheckVerifyCodeCallback;
 import com.ynstkz.shitu.android.listener.VerifyCodeCallback;
 
@@ -29,35 +23,6 @@ public class STSign {
     private STSign() {
     }
 
-    private UserBean userBean;
-
-    /**
-     * 获取用户信息
-     * @return
-     */
-    public UserBean getUser(){
-        if(!SharedPreferencesUtils.isLogin()){
-            return null;
-        }
-        if(userBean != null && !TextUtils.isEmpty(getUserToken())){
-            return userBean;
-        }
-        Cache<UserBean> userBeanCache = new Cache<>();
-        userBean = userBeanCache.get(Constants.CACHE_USER_KEY);
-        return userBean;
-    }
-
-    /**
-     * 获取token
-     * @return
-     */
-    public String getUserToken(){
-        if(userBean != null){
-            return userBean.getToken();
-        }
-        return "";
-    }
-
     /**
      * 获取验证码
      * 1-注册;2-登录;3-重置密码;4-修改手机号

app/src/main/java/com/ynstkz/shitu/android/bean/LoginBean.java

@@ -34,7 +34,7 @@ public class LoginBean extends BaseBean{
          */
 
         private String userName;
-        private int userId;
+        private String userId;
         private String token;
 
         public String getUserName() {
@@ -45,11 +45,11 @@ public class LoginBean extends BaseBean{
             this.userName = userName;
         }
 
-        public int getUserId() {
+        public String getUserId() {
             return userId;
         }
 
-        public void setUserId(int userId) {
+        public void setUserId(String userId) {
             this.userId = userId;
         }
 

app/src/main/java/com/ynstkz/shitu/android/bean/RegisterBean.java

@@ -34,7 +34,7 @@ public class RegisterBean extends BaseBean{
          */
 
         private String userName;
-        private int userId;
+        private String userId;
         private String token;
 
         public String getUserName() {
@@ -45,11 +45,11 @@ public class RegisterBean extends BaseBean{
             this.userName = userName;
         }
 
-        public int getUserId() {
+        public String getUserId() {
             return userId;
         }
 
-        public void setUserId(int userId) {
+        public void setUserId(String userId) {
             this.userId = userId;
         }
 

app/src/main/java/com/ynstkz/shitu/android/bean/UserBean.java

@@ -1,40 +0,0 @@
-package com.ynstkz.shitu.android.bean;
-
-import com.ynstkz.shitu.android.base.BaseBean;
-
-/**
- * 作者：fuchangle on 2018/2/22 11:58
- */
-
-public class UserBean extends BaseBean{
-
-    private String userName;
-
-    private String userId;
-
-    private String token;
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-}

app/src/main/java/com/ynstkz/shitu/android/bean/UserInfoBean.java

@@ -0,0 +1,135 @@
+package com.ynstkz.shitu.android.bean;
+
+import com.ynstkz.shitu.android.base.BaseBean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 作者：fuchangle on 2018/2/28 16:11
+ */
+
+public class UserInfoBean extends BaseBean{
+
+    private List<DataBean> data;
+
+    public List<DataBean> getData() {
+        return data;
+    }
+
+    public void setData(List<DataBean> data) {
+        this.data = data;
+    }
+
+    public static class DataBean implements Serializable{
+
+        private int userId;
+        private String userName;
+        private String userPwd;
+        private String headPic;
+        private String mobile;
+        private int isParent;
+        private String realName;
+        private String idCardNum;
+        private long regTime;
+        private long createTime;
+        private long updateTime;
+        private int isDelete;
+
+        public int getUserId() {
+            return userId;
+        }
+
+        public void setUserId(int userId) {
+            this.userId = userId;
+        }
+
+        public String getUserName() {
+            return userName;
+        }
+
+        public void setUserName(String userName) {
+            this.userName = userName;
+        }
+
+        public String getUserPwd() {
+            return userPwd;
+        }
+
+        public void setUserPwd(String userPwd) {
+            this.userPwd = userPwd;
+        }
+
+        public String getHeadPic() {
+            return headPic;
+        }
+
+        public void setHeadPic(String headPic) {
+            this.headPic = headPic;
+        }
+
+        public String getMobile() {
+            return mobile;
+        }
+
+        public void setMobile(String mobile) {
+            this.mobile = mobile;
+        }
+
+        public int getIsParent() {
+            return isParent;
+        }
+
+        public void setIsParent(int isParent) {
+            this.isParent = isParent;
+        }
+
+        public String getRealName() {
+            return realName;
+        }
+
+        public void setRealName(String realName) {
+            this.realName = realName;
+        }
+
+        public String getIdCardNum() {
+            return idCardNum;
+        }
+
+        public void setIdCardNum(String idCardNum) {
+            this.idCardNum = idCardNum;
+        }
+
+        public long getRegTime() {
+            return regTime;
+        }
+
+        public void setRegTime(long regTime) {
+            this.regTime = regTime;
+        }
+
+        public long getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(long createTime) {
+            this.createTime = createTime;
+        }
+
+        public long getUpdateTime() {
+            return updateTime;
+        }
+
+        public void setUpdateTime(long updateTime) {
+            this.updateTime = updateTime;
+        }
+
+        public int getIsDelete() {
+            return isDelete;
+        }
+
+        public void setIsDelete(int isDelete) {
+            this.isDelete = isDelete;
+        }
+    }
+}

app/src/main/java/com/ynstkz/shitu/android/data/RequestGroup.java

@@ -1,11 +1,8 @@
 package com.ynstkz.shitu.android.data;
 
-import com.common.library.cache.Cache;
 import com.common.library.okhttp.OkHttpUtils;
 import com.common.library.okhttp.callback.Callback;
 import com.google.gson.Gson;
-import com.ynstkz.shitu.android.application.STSign;
-import com.ynstkz.shitu.android.bean.UserBean;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -111,7 +108,7 @@ public class RequestGroup {
         params.put("realName", realName);
         params.put("idCardNum", idCardNum);
         OkHttpUtils.postString().url(UrlCat.URL_USER_AUTH).addHeader(KEY_TOKEN,
-                STSign.getInstance().getUserToken()).content(new Gson().toJson(params)).build().execute(callback);
+                SharedPreferencesUtils.getToken()).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -126,15 +123,14 @@ public class RequestGroup {
         params.put("pwd", pwd);
         params.put("rePwd", rePwd);
         OkHttpUtils.postString().url(UrlCat.URL_USER_FINDPWD).addHeader(KEY_TOKEN,
-                STSign.getInstance().getUserToken()).content(new Gson().toJson(params)).build().execute(callback);
+                SharedPreferencesUtils.getToken()).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
      * 用户详情
      */
-    public static void userInfo(Callback callback){
-        Map<String, String> params = getSystemParams();
-        OkHttpUtils.postString().url(UrlCat.URL_USER_INFO).content(new Gson().toJson(params)).build().execute(callback);
+    public static void getUserInfo(Callback callback){
+        OkHttpUtils.get().url(UrlCat.URL_USER_INFO).addHeader(KEY_TOKEN, SharedPreferencesUtils.getToken()).build().execute(callback);
     }
 
     /**
@@ -200,7 +196,7 @@ public class RequestGroup {
         Map<String, String> params = getSystemParams();
         params.put("userName", userName);
         OkHttpUtils.postString().url(UrlCat.URL_USER_RESET_USERNAME).addHeader(KEY_TOKEN,
-                STSign.getInstance().getUserToken()).content(new Gson().toJson(params)).build().execute(callback);
+                SharedPreferencesUtils.getToken()).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -239,7 +235,7 @@ public class RequestGroup {
         params.put("pwd", pwd);
         params.put("rePwd", rePwd);
         OkHttpUtils.postString().url(UrlCat.URL_ALTER_PASSWORD).addHeader(KEY_TOKEN,
-                STSign.getInstance().getUserToken()).content(new Gson().toJson(params)).build().execute(callback);
+                SharedPreferencesUtils.getToken()).content(new Gson().toJson(params)).build().execute(callback);
     }
 
 }

app/src/main/java/com/ynstkz/shitu/android/data/SharedPreferencesUtils.java

@@ -10,6 +10,10 @@ public class SharedPreferencesUtils {
 
     private static final String KEY_LOCATION = "key_location";
 
+    private static final String KEY_TOKEN = "token";
+
+    private static final String KEY_USERID = "userId";
+
     /**
      * 是否登录
      * @return
@@ -29,4 +33,26 @@ public class SharedPreferencesUtils {
     public static String getLocation(){
         return (String)SharedPreferencesDao.get(KEY_LOCATION, "未知");
     }
+
+    /**
+     * 获取token
+     */
+    public static void saveToken(String token){
+        SharedPreferencesDao.set(KEY_TOKEN, token);
+    }
+
+    public static String getToken(){
+        return (String)SharedPreferencesDao.get(KEY_TOKEN, "");
+    }
+
+    /**
+     * 获取userId
+     */
+    public static void saveUserId(String userId){
+        SharedPreferencesDao.set(KEY_USERID, userId);
+    }
+
+    public static String getUserId(){
+        return (String)SharedPreferencesDao.get(KEY_USERID, "");
+    }
 }

app/src/main/java/com/ynstkz/shitu/android/fragment/UserCenterFragment.java

@@ -9,6 +9,8 @@ import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.common.library.okhttp.callback.Callback;
+import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.activity.MessageListActivity;
 import com.ynstkz.shitu.android.activity.MineCollectActivity;
@@ -18,9 +20,9 @@ import com.ynstkz.shitu.android.activity.SettingActivity;
 import com.ynstkz.shitu.android.activity.StudentInfoActivity;
 import com.ynstkz.shitu.android.activity.UserInfoActivity;
 import com.ynstkz.shitu.android.adapter.UserCenterOptionGridAdapter;
-import com.ynstkz.shitu.android.application.STSign;
 import com.ynstkz.shitu.android.base.BaseFragment;
-import com.ynstkz.shitu.android.bean.UserBean;
+import com.ynstkz.shitu.android.bean.UserInfoBean;
+import com.ynstkz.shitu.android.data.RequestGroup;
 import com.ynstkz.shitu.android.view.ScrollViewWithGridView;
 
 import java.util.Arrays;
@@ -28,6 +30,8 @@ import java.util.List;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
+import okhttp3.Call;
+import okhttp3.Response;
 
 /**
  * 我
@@ -62,17 +66,16 @@ public class UserCenterFragment extends BaseFragment {
     }
 
     private void initView() {
-        UserBean userBean = STSign.getInstance().getUser();
-        if (userBean != null) {
-            tvUsername.setText(userBean.getUserName());
-        }
     }
 
+
     private void initData() {
         List<String> listUserOption = Arrays.asList(getResources().getStringArray(R.array.usercenter_option));
         UserCenterOptionGridAdapter userCenterOptionGridAdapter = new UserCenterOptionGridAdapter(getActivity(), listUserOption);
         gvMine.setAdapter(userCenterOptionGridAdapter);
         userCenterOptionGridAdapter.notifyDataSetChanged();
+
+        getUserInfo();
     }
 
     private void setListener() {
@@ -132,6 +135,43 @@ public class UserCenterFragment extends BaseFragment {
         });
     }
 
+    /**
+     * 获取用户信息
+     */
+    private void getUserInfo(){
+
+        RequestGroup.getUserInfo(new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return new Gson().fromJson(response.body().string(), UserInfoBean.class);
+            }
+
+            @Override
+            public void onError(Call call, Exception e, int id) {
+                showToast(getActivity(), getString(R.string.error_msg));
+            }
+
+            @Override
+            public void onResponse(Object response, int id) {
+                UserInfoBean userInfoBean = (UserInfoBean)response;
+                if(userInfoBean != null){
+                    if("200".equals(userInfoBean.getCode())){
+
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * 初始化用户信息
+     */
+    private void initUserInfo(UserInfoBean userInfoBean){
+        if(userInfoBean == null){
+            return;
+        }
+    }
+
     @Override
     public void onDestroyView() {
         super.onDestroyView();