对接找回密码接口

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

@@ -29,8 +29,8 @@ public class FindPasswordActivity extends TitleBarActivity {
     TextView tvLogin;
     @Bind(R.id.edit_phone_number)
     EditText editPhoneNumber;
-    @Bind(R.id.edit_password)
-    EditText editVerifycode;
+    @Bind(R.id.edit_verify_code)
+    EditText editVerifyCode;
     @Bind(R.id.tv_verifycode)
     TextView tvVerifycode;
     @Bind(R.id.btn_next)
@@ -50,7 +50,7 @@ public class FindPasswordActivity extends TitleBarActivity {
 
     @Override
     protected int getLayoutId() {
-        return R.layout.activity_register;
+        return R.layout.activity_find_pwd;
     }
 
     private void initView() {
@@ -80,8 +80,19 @@ public class FindPasswordActivity extends TitleBarActivity {
         btnNext.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                startActivity(new Intent(FindPasswordActivity.this, FindPasswordAffirmActivity.class));
+                startActivityForResult(new Intent(FindPasswordActivity.this, FindPasswordAffirmActivity.class),10);
             }
         });
     }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode){
+            case 10:
+                if(resultCode == RESULT_OK){
+                    finish();
+                }
+                break;
+        }
+    }
 }

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

@@ -1,20 +1,52 @@
 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.TextView;
 
+import com.common.library.okhttp.callback.Callback;
+import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
+import com.ynstkz.shitu.android.base.BaseBean;
 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/8 17:56
  */
 
-public class FindPasswordAffirmActivity extends TitleBarActivity{
+public class FindPasswordAffirmActivity extends TitleBarActivity {
+
+    @Bind(R.id.iv_cancel)
+    ImageView ivCancel;
+    @Bind(R.id.tv_register)
+    TextView tvRegister;
+    @Bind(R.id.edit_password)
+    EditText editPassword;
+    @Bind(R.id.edit_password_again)
+    EditText editPasswordAgain;
+    @Bind(R.id.btn_submit)
+    Button btnSubmit;
+
+    private String phoneNumber;
+    private ProgressDialog progressDialog;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        initView();
+        initData();
+        setListener();
     }
 
     @Override
@@ -22,4 +54,73 @@ public class FindPasswordAffirmActivity extends TitleBarActivity{
         return R.layout.activity_findpassword_affirm;
     }
 
+    private void initView(){
+
+    }
+
+    private void initData(){
+        phoneNumber = getIntent().getStringExtra("phoneNumber");
+    }
+
+    private void setListener(){
+
+        btnSubmit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String pwd = editPassword.getText().toString().trim();
+                String rePwd = editPasswordAgain.getText().toString().trim();
+                if (TextUtils.isEmpty(pwd)){
+                    showToast("密码不能为空！");
+                    return;
+                }
+                if(TextUtils.isEmpty(rePwd)){
+                    showToast("确认密码不能为空！");
+                    return;
+                }
+                progressDialog = new ProgressDialog(FindPasswordAffirmActivity.this);
+                progressDialog.setMessage("正在提交");
+                progressDialog.show();
+                userFindPwd("18561761886", pwd, rePwd);
+            }
+        });
+    }
+
+    /**
+     * 找回密码
+     * @param mobile
+     * @param pwd
+     * @param rePwd
+     */
+    private void userFindPwd(String mobile, String pwd, String rePwd){
+
+        RequestGroup.userFindPwd(mobile, pwd, rePwd, new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                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())){
+                        setResult(RESULT_OK);
+                        finish();
+                    }
+                }
+            }
+        });
+    }
 }

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

@@ -212,7 +212,8 @@ public class RequestGroup {
      */
     public static void getMyCollectList(Callback callback){
         Map<String, String> params = getSystemParams();
-        OkHttpUtils.get().url(UrlCat.URL_MY_COLLECT).params(params).build().execute(callback);
+        OkHttpUtils.get().url(UrlCat.URL_MY_COLLECT).addHeader(KEY_TOKEN,
+                SharedPreferencesUtils.getToken()).params(params).build().execute(callback);
     }
 
     /**
@@ -220,7 +221,8 @@ public class RequestGroup {
      */
     public static void getMyCommentList(Callback callback){
         Map<String, String> params = getSystemParams();
-        OkHttpUtils.get().url(UrlCat.URL_MY_COMMENT).params(params).build().execute(callback);
+        OkHttpUtils.get().url(UrlCat.URL_MY_COMMENT).addHeader(KEY_TOKEN,
+                SharedPreferencesUtils.getToken()).params(params).build().execute(callback);
     }
 
     /**

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

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="@dimen/default_content_margin"
+        android:paddingTop="@dimen/default_content_margin"
+        android:paddingRight="@dimen/default_content_margin">
+
+        <ImageView
+            android:id="@+id/iv_cancel"
+            android:layout_width="@dimen/company_20dp"
+            android:layout_height="@dimen/company_20dp"
+            android:src="@drawable/login_cancel_icon" />
+
+        <TextView
+            android:id="@+id/tv_login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:text="登录"
+            android:textColor="@color/main_color"
+            android:textSize="@dimen/company_18sp" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/company_30dp"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="62dp"
+            android:layout_height="62dp"
+            android:src="@drawable/logo" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/company_6dp"
+            android:text="仕  途  网"
+            android:textColor="@color/main_color"
+            android:textSize="@dimen/company_18sp"
+            android:textStyle="bold" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="@dimen/company_15dp"
+        android:paddingTop="@dimen/company_15dp"
+        android:paddingRight="@dimen/company_15dp">
+
+        <EditText
+            android:id="@+id/edit_phone_number"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/company_50dp"
+            android:layout_marginTop="@dimen/company_10dp"
+            android:background="@drawable/shapre_default_edit_bg"
+            android:hint="请输入用户名称/手机号/邮箱"
+            android:maxLines="1"
+            android:textCursorDrawable="@null"
+            android:textSize="@dimen/company_14sp" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/company_50dp"
+            android:layout_marginTop="@dimen/company_20dp"
+            android:background="@drawable/shapre_default_edit_bg">
+
+            <EditText
+                android:id="@+id/edit_verify_code"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:hint="请输入验证码"
+                android:inputType="textPassword"
+                android:maxLines="1"
+                android:layout_toLeftOf="@+id/tv_verifycode"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/company_14sp"
+                android:background="@null"/>
+
+            <TextView
+                android:id="@+id/tv_verifycode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:textSize="@dimen/company_14sp"
+                android:textColor="@color/main_color"
+                android:text="获取手机验证码"/>
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btn_next"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/company_50dp"
+        android:layout_marginTop="@dimen/company_20dp"
+        android:background="@drawable/shape_default_btn_bg"
+        android:layout_marginLeft="@dimen/default_content_margin"
+        android:layout_marginRight="@dimen/default_content_margin"
+        android:textColor="@color/white"
+        android:textSize="@dimen/company_16sp"
+        android:text="下一步"/>
+
+</LinearLayout>

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

@@ -67,6 +67,7 @@
             android:layout_marginTop="@dimen/company_10dp"
             android:background="@drawable/shapre_default_edit_bg"
             android:hint="请输入密码"
+            android:inputType="textPassword"
             android:maxLines="1"
             android:textCursorDrawable="@null"
             android:textSize="@dimen/company_14sp" />