对接注册验证码

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

@@ -153,9 +153,10 @@ public class RegisterActivity extends TitleBarActivity implements VerifyCodeCall
      * 下一步
      * @param phoneNumber
      */
-    private void nextEvent(String phoneNumber) {
+    private void nextEvent(String phoneNumber, String code) {
         Intent intent = new Intent(RegisterActivity.this, RegisterSubmitActivity.class);
         intent.putExtra("phoneNumber", phoneNumber);
+        intent.putExtra("code", code);
         if(!TextUtils.isEmpty(thirdId) && !TextUtils.isEmpty(thirdType)){
             intent.putExtra("thirdId", thirdId);
             intent.putExtra("thirdType", thirdType);
@@ -171,9 +172,9 @@ public class RegisterActivity extends TitleBarActivity implements VerifyCodeCall
     }
 
     @Override
-    public void isVerifyCodeSuccess(int type, String phoneNumber, boolean isSuccess) {
+    public void isVerifyCodeSuccess(int type, String phoneNumber, String code, boolean isSuccess) {
         if(type == 1 && isSuccess){
-            nextEvent(phoneNumber);
+            nextEvent(phoneNumber, code);
         }
     }
 

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

@@ -51,6 +51,7 @@ public class RegisterSubmitActivity extends TitleBarActivity {
     private String phoneNumber;
     private String thirdId;
     private String thirdType;
+    private String code;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -77,6 +78,7 @@ public class RegisterSubmitActivity extends TitleBarActivity {
         phoneNumber = getIntent().getStringExtra("phoneNumber");
         thirdId = getIntent().getStringExtra("thirdId");
         thirdType = getIntent().getStringExtra("thirdType");
+        code = getIntent().getStringExtra("code");
     }
 
     private void setListener(){
@@ -91,7 +93,7 @@ public class RegisterSubmitActivity extends TitleBarActivity {
                 String pwd = editPassword.getText().toString().trim();
                 String rePwd = editPasswordAgain.getText().toString().trim();
                 if(verifyData(phoneNumber, userName, pwd, rePwd)){
-                    register(phoneNumber, userName, pwd, rePwd);
+                    register(phoneNumber, userName, pwd, rePwd, code);
                 }
             }
         });
@@ -104,9 +106,9 @@ public class RegisterSubmitActivity extends TitleBarActivity {
      * @param pwd
      * @param rePwd
      */
-    private void register(String mobile, String userName, String pwd, final String rePwd){
+    private void register(String mobile, String userName, String pwd, final String rePwd, String code){
 
-        RequestGroup.register(mobile, userName, pwd, rePwd, new Callback() {
+        RequestGroup.register(mobile, userName, pwd, rePwd, code, new Callback() {
             @Override
             public Object parseNetworkResponse(Response response, int id) throws Exception {
                 return new Gson().fromJson(response.body().string(), RegisterBean.class);

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

@@ -99,7 +99,7 @@ public class STSign {
      * 1-注册;2-登录;3-重置密码;4-修改手机号
      * @param phoneNumber
      */
-    public void checkVerifycode(final int type, final String phoneNumber, String code, final CheckVerifyCodeCallback callback){
+    public void checkVerifycode(final int type, final String phoneNumber, final String code, final CheckVerifyCodeCallback callback){
 
         RequestGroup.verifySms(String.valueOf(type), phoneNumber, code, new Callback() {
             @Override
@@ -110,7 +110,7 @@ public class STSign {
             @Override
             public void onError(Call call, Exception e, int id) {
                 if(callback != null){
-                    callback.isVerifyCodeSuccess(type, phoneNumber, false);
+                    callback.isVerifyCodeSuccess(type, phoneNumber, code, false);
                 }
             }
 
@@ -120,7 +120,7 @@ public class STSign {
                 if(baseBean != null){
                     if("200".equals(baseBean.getCode())){
                         if(callback != null){
-                            callback.isVerifyCodeSuccess(type, phoneNumber, true);
+                            callback.isVerifyCodeSuccess(type, phoneNumber, code, true);
                         }
                     }
                     Toast.makeText(STApplication.getContext(), baseBean.getMsg(), Toast.LENGTH_SHORT).show();

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

@@ -43,12 +43,13 @@ public class RequestGroup {
      * @param pwd
      * @param rePwd
      */
-    public static void register(String mobile, String userName, String pwd, String rePwd, Callback callback){
+    public static void register(String mobile, String userName, String pwd, String rePwd, String code, Callback callback){
         Map<String, String> params = getSystemParams();
         params.put("mobile", mobile);
         params.put("userName", userName);
         params.put("pwd", pwd);
         params.put("rePwd", rePwd);
+        params.put("code", code);
         OkHttpUtils.postString().url(UrlCat.URL_REGISTER).content(new Gson().toJson(params)).build().execute(callback);
     }
 

app/src/main/java/com/ynstkz/shitu/android/listener/CheckVerifyCodeCallback.java

@@ -6,5 +6,5 @@ package com.ynstkz.shitu.android.listener;
 
 public interface CheckVerifyCodeCallback {
 
-    void isVerifyCodeSuccess(int type, String phoneNumber, boolean isSuccess);
+    void isVerifyCodeSuccess(int type, String phoneNumber, String code, boolean isSuccess);
 }

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

@@ -82,7 +82,6 @@
                 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"