对接修改密码接口

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

@@ -1,5 +1,6 @@
 package com.ynstkz.shitu.android.activity;
 
+import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
@@ -11,8 +12,13 @@ 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;
@@ -38,6 +44,8 @@ public class AlterPasswordActivity extends TitleBarActivity {
     @Bind(R.id.btn_save)
     Button btnSave;
 
+    private ProgressDialog progressDialog;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -84,6 +92,9 @@ public class AlterPasswordActivity extends TitleBarActivity {
                     showToast("确认密码不一致");
                     return;
                 }
+                progressDialog = new ProgressDialog(AlterPasswordActivity.this);
+                progressDialog.setMessage("正在提交");
+                progressDialog.show();
                 resetPwd(pwd_old, pwd, pwd_again);
             }
         });
@@ -95,22 +106,34 @@ public class AlterPasswordActivity extends TitleBarActivity {
      * @param pwd
      * @param rePwd
      */
-    public static void resetPwd(String oldPwd, String pwd, String rePwd){
+    public void resetPwd(String oldPwd, String pwd, String rePwd){
 
         RequestGroup.resetPwd(oldPwd, pwd, rePwd, new Callback() {
             @Override
             public Object parseNetworkResponse(Response response, int id) throws Exception {
-                return null;
+                return new Gson().fromJson(response.body().string(), BaseBean.class);
             }
 
             @Override
             public void onError(Call call, Exception e, int id) {
-
+                if(progressDialog != null){
+                    progressDialog.dismiss();
+                }
+                showToast(getString(R.string.error_msg));
             }
 
             @Override
             public void onResponse(Object response, int id) {
-
+                if(progressDialog != null){
+                    progressDialog.dismiss();
+                }
+                BaseBean baseBean = (BaseBean)response;
+                if(baseBean != null){
+                    showToast(baseBean.getMsg());
+                    if("200".equals(baseBean.getCode())){
+                        finish();
+                    }
+                }
             }
         });
     }

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

@@ -1,21 +1,27 @@
 package com.ynstkz.shitu.android.activity;
 
+import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 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;
+import okhttp3.Cache;
 import okhttp3.Call;
 import okhttp3.Response;
 
@@ -34,6 +40,8 @@ public class AlterUserNameActivity extends TitleBarActivity {
     @Bind(R.id.btn_save)
     Button btnSave;
 
+    private ProgressDialog progressDialog;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -57,34 +65,53 @@ public class AlterUserNameActivity extends TitleBarActivity {
             @Override
             public void onClick(View view) {
                 String userName = editUsername.getText().toString().trim();
-                if(TextUtils.isEmpty(userName)){
+                if (TextUtils.isEmpty(userName)) {
                     showToast(getString(R.string.empty_username));
                     return;
                 }
+                progressDialog = new ProgressDialog(AlterUserNameActivity.this);
+                progressDialog.setMessage("正在提交");
+                progressDialog.show();
                 alterUserName(userName);
             }
         });
     }
 
 
-    private void alterUserName(String userName){
+    private void alterUserName(final String userName) {
 
         RequestGroup.userResetUsername(userName, new Callback() {
             @Override
             public Object parseNetworkResponse(Response response, int id) throws Exception {
-                return null;
+                return new Gson().fromJson(response.body().string(), BaseBean.class);
             }
 
             @Override
             public void onError(Call call, Exception e, int id) {
-
+                if(progressDialog != null){
+                    progressDialog.dismiss();
+                }
+                showToast(getString(R.string.error_msg));
             }
 
             @Override
             public void onResponse(Object response, int id) {
-
+                if(progressDialog != null){
+                    progressDialog.dismiss();
+                }
+                BaseBean baseBean = (BaseBean)response;
+                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/IdAuthActivity.java

@@ -10,10 +10,14 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.common.library.okhttp.callback.Callback;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
+import com.ynstkz.shitu.android.data.RequestGroup;
 
 import butterknife.Bind;
+import okhttp3.Call;
+import okhttp3.Response;
 
 /**
  * 作者：fuchangle on 2018/2/12 10:54
@@ -64,4 +68,30 @@ public class IdAuthActivity extends TitleBarActivity {
     private void setListener(){
 
     }
+
+    /**
+     * 用户认证
+     * @param isParent
+     * @param realName
+     * @param idCardNum
+     */
+    private void userAuth(String isParent, String realName, String idCardNum){
+
+        RequestGroup.userAuth(isParent, realName, idCardNum, new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return null;
+            }
+
+            @Override
+            public void onError(Call call, Exception e, int id) {
+
+            }
+
+            @Override
+            public void onResponse(Object response, int id) {
+
+            }
+        });
+    }
 }

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

@@ -20,6 +20,7 @@ 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;
@@ -157,7 +158,7 @@ public class LoginActivity extends TitleBarActivity {
                             userBean.setUserName(loginBean.getData().getUserName());
                             userBean.setUserId(loginBean.getData().getUserId()+"");
                             userBean.setToken(loginBean.getData().getToken());
-                            Cache.put("UserBean", userBean);
+                            Cache.put(Constants.CACHE_USER_KEY, userBean);
                             finish();
                         }
                     } else {

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

@@ -19,6 +19,7 @@ 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;
@@ -130,7 +131,7 @@ public class RegisterSubmitActivity extends TitleBarActivity {
                             userBean.setUserName(bean.getData().getUserName());
                             userBean.setUserId(bean.getData().getUserId()+"");
                             userBean.setToken(bean.getData().getToken());
-                            Cache.put("UserBean", userBean);
+                            Cache.put(Constants.CACHE_USER_KEY, userBean);
                             finish();
                         }
                     } else {

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

@@ -12,7 +12,9 @@ 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;
 
@@ -136,4 +138,12 @@ 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,9 +1,13 @@
 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;
 
@@ -32,15 +36,29 @@ public class STSign {
      * @return
      */
     public UserBean getUser(){
-        if(userBean != null){
+        if(!SharedPreferencesUtils.isLogin()){
+            return null;
+        }
+        if(userBean != null && !TextUtils.isEmpty(getUserToken())){
             return userBean;
         }
         Cache<UserBean> userBeanCache = new Cache<>();
-        userBean = userBeanCache.get("UserBean");
+        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-修改手机号
      * @param phoneNumber

app/src/main/java/com/ynstkz/shitu/android/common/Constants.java

@@ -7,4 +7,6 @@ package com.ynstkz.shitu.android.common;
 public class Constants {
 
     public final static String ST_SHAREPREFREENCE="stsharepref";//SharePreference名字
+
+    public final static String CACHE_USER_KEY = "UserBean";
 }

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

@@ -7,8 +7,6 @@ import com.google.gson.Gson;
 import com.ynstkz.shitu.android.application.STSign;
 import com.ynstkz.shitu.android.bean.UserBean;
 
-import org.json.JSONObject;
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -18,6 +16,8 @@ import java.util.Map;
 
 public class RequestGroup {
 
+    public static final String KEY_TOKEN = "authorization";
+
     /***
      * 获取系统级参数
      *
@@ -25,11 +25,6 @@ public class RequestGroup {
      */
     public static Map<String, String> getSystemParams() {
         Map<String, String> params = new HashMap<>();
-        if(SharedPreferencesUtils.isLogin()){
-            UserBean userBean = STSign.getInstance().getUser();
-            params.put("token", userBean.getToken());
-            params.put("userId", userBean.getUserId());
-        }
         return params;
     }
 
@@ -115,11 +110,12 @@ public class RequestGroup {
         params.put("isParent", isParent);
         params.put("realName", realName);
         params.put("idCardNum", idCardNum);
-        OkHttpUtils.postString().url(UrlCat.URL_USER_AUTH).content(new Gson().toJson(params)).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_USER_AUTH).addHeader(KEY_TOKEN,
+                STSign.getInstance().getUserToken()).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
-     * 修改密码
+     * 找回密码
      * @param mobile
      * @param pwd
      * @param rePwd
@@ -129,7 +125,8 @@ public class RequestGroup {
         params.put("mobile", mobile);
         params.put("pwd", pwd);
         params.put("rePwd", rePwd);
-        OkHttpUtils.postString().url(UrlCat.URL_USER_FINDPWD).content(new Gson().toJson(params)).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_USER_FINDPWD).addHeader(KEY_TOKEN,
+                STSign.getInstance().getUserToken()).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -202,7 +199,8 @@ public class RequestGroup {
     public static void userResetUsername(String userName, Callback callback){
         Map<String, String> params = getSystemParams();
         params.put("userName", userName);
-        OkHttpUtils.postString().url(UrlCat.URL_USER_RESET_USERNAME).content(new Gson().toJson(params)).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_USER_RESET_USERNAME).addHeader(KEY_TOKEN,
+                STSign.getInstance().getUserToken()).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -240,6 +238,8 @@ public class RequestGroup {
         params.put("oldPwd", oldPwd);
         params.put("pwd", pwd);
         params.put("rePwd", rePwd);
-        OkHttpUtils.postString().url(UrlCat.URL_ALTER_PASSWORD).content(new Gson().toJson(params)).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_ALTER_PASSWORD).addHeader(KEY_TOKEN,
+                STSign.getInstance().getUserToken()).content(new Gson().toJson(params)).build().execute(callback);
     }
+
 }

app/src/main/res/layout/activity_alterusername.xml

@@ -26,4 +26,6 @@
         android:textSize="@dimen/company_16sp"
         android:text="保存"/>
 
+
+
 </LinearLayout>

app/src/main/res/layout/activity_userinfo.xml

@@ -27,8 +27,7 @@
             android:layout_toLeftOf="@+id/iv_username_go"
             android:layout_marginRight="@dimen/company_10dp"
             android:textSize="@dimen/company_16sp"
-            android:textColor="@color/color_666"
-            android:text="185****1886"/>
+            android:textColor="@color/color_666"/>
 
         <ImageView
             android:id="@+id/iv_username_go"
@@ -136,8 +135,7 @@
             android:layout_toLeftOf="@+id/iv_phone_numbe"
             android:layout_marginRight="@dimen/company_10dp"
             android:textSize="@dimen/company_16sp"
-            android:textColor="@color/color_666"
-            android:text="185****1886"/>
+            android:textColor="@color/color_666"/>
 
         <ImageView
             android:id="@+id/iv_phone_numbe"

app/src/main/res/layout/view_loading.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.common.library.view.progressbar.CircularProgress
+        android:layout_width="@dimen/company_45dp"
+        android:layout_height="@dimen/company_45dp"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true" />
+
+</RelativeLayout>

library/src/main/res/values/colors.xml

@@ -2,14 +2,14 @@
 <resources>
 
     <!-- CircularProgress Default -->
-    <color name="circular_progress_color">#F04848</color>
+    <color name="circular_progress_color">#3791f6</color>
     <bool name="circular_progress_indeterminate">true</bool>
     <dimen name="circular_progress_border_width">4dp</dimen>
     <dimen name="circular_progress_small_size">36dp</dimen>
     <dimen name="circular_progress_normal_size">48dp</dimen>
     <dimen name="circular_progress_large_size">60dp</dimen>
     <integer name="circular_progress_max">100</integer>
-    <color name="circular_progress_color_day">#f04848</color>
+    <color name="circular_progress_color_day">#3791f6</color>
 
     <color name="dialog_card_background">#ffffff</color>
     <color name="dialog_card_shadow">#10000000</color>