Parcourir la source

对接注册接口

316044749 il y a 7 ans
Parent
commit
5c70daf306

+ 16 - 0
app/src/main/java/com/ynstkz/shitu/android/activity/HomeActivity.java

@@ -23,9 +23,12 @@ import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.data.SharedPreferencesDao;
 import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
 import com.ynstkz.shitu.android.event.LocationChangedEvent;
+import com.ynstkz.shitu.android.event.RegisterSuccessEvent;
 import com.ynstkz.shitu.android.fragment.ConfirmationDialogFragment;
 
 import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -82,6 +85,9 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
     }
 
     private void initView() {
+
+        EventBus.getDefault().register(this);
+
         mFragments = new Fragment[3];
         mFragments[0] = getSupportFragmentManager().findFragmentById(R.id.fm_home);
         mFragments[1] = getSupportFragmentManager().findFragmentById(R.id.fm_nearby);
@@ -211,4 +217,14 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
         }
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(RegisterSuccessEvent event) {
+        changleLayout(2);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
 }

+ 18 - 1
app/src/main/java/com/ynstkz/shitu/android/activity/LoginActivity.java

@@ -19,8 +19,14 @@ 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.data.RequestGroup;
+import com.ynstkz.shitu.android.event.LocationChangedEvent;
+import com.ynstkz.shitu.android.event.RegisterSuccessEvent;
 import com.ynstkz.shitu.android.utils.StatusBarUtil;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import butterknife.Bind;
 import butterknife.ButterKnife;
 import okhttp3.Call;
@@ -65,7 +71,7 @@ public class LoginActivity extends TitleBarActivity {
     }
 
     private void initView(){
-
+        EventBus.getDefault().register(this);
     }
 
     private void initData(){
@@ -156,4 +162,15 @@ public class LoginActivity extends TitleBarActivity {
         }
         return true;
     }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(RegisterSuccessEvent event) {
+        finish();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
 }

+ 79 - 9
app/src/main/java/com/ynstkz/shitu/android/activity/RegisterActivity.java

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Build;
 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;
@@ -11,17 +12,24 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 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.event.RegisterSuccessEvent;
+import com.ynstkz.shitu.android.listener.CheckVerifyCodeCallback;
+import com.ynstkz.shitu.android.listener.VerifyCodeCallback;
 import com.ynstkz.shitu.android.utils.StatusBarUtil;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import butterknife.Bind;
-import butterknife.ButterKnife;
 
 /**
  * 作者:fuchangle on 2018/1/31 16:29
  */
 
-public class RegisterActivity extends TitleBarActivity {
+public class RegisterActivity extends TitleBarActivity implements VerifyCodeCallback, CheckVerifyCodeCallback{
 
     @Bind(R.id.iv_cancel)
     ImageView ivCancel;
@@ -29,10 +37,14 @@ public class RegisterActivity extends TitleBarActivity {
     TextView tvLogin;
     @Bind(R.id.edit_phone_number)
     EditText editPhoneNumber;
-    @Bind(R.id.edit_password)
-    EditText editPassword;
+    @Bind(R.id.edit_verify_code)
+    EditText editVerifyCode;
     @Bind(R.id.btn_next)
     Button btnNext;
+    @Bind(R.id.tv_verifycode)
+    TextView tvVerifycode;
+
+    String phoneNumber;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -51,15 +63,15 @@ public class RegisterActivity extends TitleBarActivity {
         return R.layout.activity_register;
     }
 
-    private void initView(){
-
+    private void initView() {
+        EventBus.getDefault().register(this);
     }
 
-    private void initData(){
+    private void initData() {
 
     }
 
-    private void setListener(){
+    private void setListener() {
         //关闭
         ivCancel.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -74,12 +86,70 @@ public class RegisterActivity extends TitleBarActivity {
                 startActivity(new Intent(RegisterActivity.this, LoginActivity.class));
             }
         });
+
+        //获取验证码
+        tvVerifycode.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                phoneNumber = editPhoneNumber.getText().toString().trim();
+                if(!TextUtils.isEmpty(phoneNumber)){
+                    STSign.getInstance().getVerifycode(1, phoneNumber, RegisterActivity.this);
+                } else {
+                    showToast(getString(R.string.empty_username));
+                }
+            }
+        });
+
         //下一步
         btnNext.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                startActivity(new Intent(RegisterActivity.this, RegisterSubmitActivity.class));
+                if(TextUtils.isEmpty(phoneNumber)){
+                    showToast(getString(R.string.empty_username));
+                    return;
+                }
+                if(TextUtils.isEmpty(editVerifyCode.getText().toString().trim())){
+                    showToast(getString(R.string.empty_verifyCode));
+                    return;
+                }
+                STSign.getInstance().checkVerifycode(1, phoneNumber,
+                        editVerifyCode.getText().toString().trim(), RegisterActivity.this);
             }
         });
     }
+
+    /**
+     * 下一步
+     * @param phoneNumber
+     */
+    private void nextEvent(String phoneNumber) {
+        Intent intent = new Intent(RegisterActivity.this, RegisterSubmitActivity.class);
+        intent.putExtra("phoneNumber", phoneNumber);
+        startActivity(intent);
+    }
+
+    @Override
+    public void codeCallback(int type, String verifyCode) {
+        if(type == 1){
+
+        }
+    }
+
+    @Override
+    public void isVerifyCodeSuccess(int type, String phoneNumber, boolean isSuccess) {
+        if(isSuccess){
+            nextEvent(phoneNumber);
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(RegisterSuccessEvent event) {
+        finish();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+    }
 }

+ 30 - 4
app/src/main/java/com/ynstkz/shitu/android/activity/RegisterSubmitActivity.java

@@ -12,14 +12,20 @@ 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.data.RequestGroup;
+import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
+import com.ynstkz.shitu.android.event.RegisterSuccessEvent;
 import com.ynstkz.shitu.android.utils.StatusBarUtil;
 
+import org.greenrobot.eventbus.EventBus;
+
 import butterknife.Bind;
 import okhttp3.Call;
 import okhttp3.Response;
@@ -44,6 +50,8 @@ public class RegisterSubmitActivity extends TitleBarActivity {
     @Bind(R.id.btn_register)
     Button btnRegister;
 
+    private String phoneNumber;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -66,7 +74,7 @@ public class RegisterSubmitActivity extends TitleBarActivity {
     }
 
     private void initData(){
-
+        phoneNumber = getIntent().getStringExtra("phoneNumber");
     }
 
     private void setListener(){
@@ -77,12 +85,11 @@ public class RegisterSubmitActivity extends TitleBarActivity {
         btnRegister.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                String mobile = "18561761886";
                 String userName = editUsername.getText().toString().trim();
                 String pwd = editPassword.getText().toString().trim();
                 String rePwd = editPasswordAgain.getText().toString().trim();
-                if(verifyData(mobile, userName, pwd, rePwd)){
-                    register(mobile, userName, pwd, rePwd);
+                if(verifyData(phoneNumber, userName, pwd, rePwd)){
+                    register(phoneNumber, userName, pwd, rePwd);
                 }
             }
         });
@@ -111,6 +118,25 @@ public class RegisterSubmitActivity extends TitleBarActivity {
             @Override
             public void onResponse(Object response, int id) {
                 RegisterBean bean = (RegisterBean)response;
+                if(bean != null){
+                    if("200".equals(bean.getCode())){
+                        if(bean.getData() != null){
+
+                            SharedPreferencesUtils.setLogin(true);
+                            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("UserBean", userBean);
+                            finish();
+                        }
+                    } else {
+                        showToast(bean.getMsg());
+                    }
+                }
             }
         });
     }

+ 101 - 0
app/src/main/java/com/ynstkz/shitu/android/application/STSign.java

@@ -0,0 +1,101 @@
+package com.ynstkz.shitu.android.application;
+
+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.data.RequestGroup;
+import com.ynstkz.shitu.android.listener.CheckVerifyCodeCallback;
+import com.ynstkz.shitu.android.listener.VerifyCodeCallback;
+
+import okhttp3.Call;
+import okhttp3.Response;
+
+/**
+ * 作者:fuchangle on 2018/2/22 13:52
+ */
+
+public class STSign {
+
+    private static final STSign ourInstance = new STSign();
+
+    public static STSign getInstance() {
+        return ourInstance;
+    }
+
+    private STSign() {
+    }
+
+    private UserBean userBean;
+
+    /**
+     * 获取用户信息
+     * @return
+     */
+    public UserBean getUser(){
+        if(userBean != null){
+            return userBean;
+        }
+        Cache<UserBean> userBeanCache = new Cache<>();
+        userBean = userBeanCache.get("UserBean");
+        if(userBean == null){
+            userBean = new UserBean();
+        }
+        return userBean;
+    }
+
+    /**
+     * 获取验证码
+     * 1-注册;2-登录;3-重置密码;4-修改手机号
+     * @param phoneNumber
+     */
+    public void getVerifycode(final int type, final String phoneNumber, final VerifyCodeCallback callback){
+
+        RequestGroup.snedSms(String.valueOf(type), phoneNumber, 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) {
+                if(callback != null){
+                    callback.codeCallback(type, "123456");
+                }
+            }
+        });
+    }
+
+    /**
+     * 校验验证码
+     * 1-注册;2-登录;3-重置密码;4-修改手机号
+     * @param phoneNumber
+     */
+    public void checkVerifycode(final int type, final String phoneNumber, String code, final CheckVerifyCodeCallback callback){
+
+        RequestGroup.verifySms(String.valueOf(type), phoneNumber, code, new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return null;
+            }
+
+            @Override
+            public void onError(Call call, Exception e, int id) {
+                if(callback != null){
+                    callback.isVerifyCodeSuccess(type, phoneNumber, true);
+                }
+            }
+
+            @Override
+            public void onResponse(Object response, int id) {
+                if(callback != null){
+                    callback.isVerifyCodeSuccess(type, phoneNumber, true);
+                }
+            }
+        });
+    }
+}

+ 18 - 0
app/src/main/java/com/ynstkz/shitu/android/base/BaseBean.java

@@ -8,5 +8,23 @@ import java.io.Serializable;
 
 public class BaseBean implements Serializable{
 
+    private String code;
+    private String msg;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
 
 }

+ 52 - 0
app/src/main/java/com/ynstkz/shitu/android/bean/RegisterBean.java

@@ -9,4 +9,56 @@ import com.ynstkz.shitu.android.base.BaseBean;
 public class RegisterBean extends BaseBean{
 
 
+    /**
+     * code : 200
+     * data : {"userName":"testmap","userId":2,"token":"2_f48d1f8a220c46ee86bde13d64966fa4"}
+     * msg : 恭喜,注册成功
+     */
+
+    private DataBean data;
+
+
+    public DataBean getData() {
+        return data;
+    }
+
+    public void setData(DataBean data) {
+        this.data = data;
+    }
+
+    public static class DataBean {
+        /**
+         * userName : testmap
+         * userId : 2
+         * token : 2_f48d1f8a220c46ee86bde13d64966fa4
+         */
+
+        private String userName;
+        private int userId;
+        private String token;
+
+        public String getUserName() {
+            return userName;
+        }
+
+        public void setUserName(String userName) {
+            this.userName = userName;
+        }
+
+        public int getUserId() {
+            return userId;
+        }
+
+        public void setUserId(int userId) {
+            this.userId = userId;
+        }
+
+        public String getToken() {
+            return token;
+        }
+
+        public void setToken(String token) {
+            this.token = token;
+        }
+    }
 }

+ 40 - 0
app/src/main/java/com/ynstkz/shitu/android/bean/UserBean.java

@@ -0,0 +1,40 @@
+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;
+    }
+}

+ 23 - 13
app/src/main/java/com/ynstkz/shitu/android/data/RequestGroup.java

@@ -2,6 +2,11 @@ package com.ynstkz.shitu.android.data;
 
 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 org.json.JSONObject;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -19,6 +24,11 @@ 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;
     }
 
@@ -35,7 +45,7 @@ public class RequestGroup {
         params.put("userName", userName);
         params.put("pwd", pwd);
         params.put("rePwd", rePwd);
-        OkHttpUtils.post().url(UrlCat.URL_REGISTER).params(params).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_REGISTER).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -48,7 +58,7 @@ public class RequestGroup {
         Map<String, String> params = getSystemParams();
         params.put("userName", userName);
         params.put("userPwd", userPwd);
-        OkHttpUtils.post().url(UrlCat.URL_LOGIN).params(params).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_LOGIN).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -68,7 +78,7 @@ public class RequestGroup {
         Map<String, String> params = getSystemParams();
         params.put("type", type);
         params.put("mobile", mobile);
-        OkHttpUtils.post().url(UrlCat.URL_SMS_SEND).params(params).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_SMS_SEND).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -81,7 +91,7 @@ public class RequestGroup {
         params.put("type", type);
         params.put("mobile", mobile);
         params.put("code", code);
-        OkHttpUtils.post().url(UrlCat.URL_SMS_VERIFY).params(params).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_SMS_VERIFY).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -104,7 +114,7 @@ public class RequestGroup {
         params.put("isParent", isParent);
         params.put("realName", realName);
         params.put("idCardNum", idCardNum);
-        OkHttpUtils.post().url(UrlCat.URL_USER_AUTH).params(params).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_USER_AUTH).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -118,7 +128,7 @@ public class RequestGroup {
         params.put("mobile", mobile);
         params.put("pwd", pwd);
         params.put("rePwd", rePwd);
-        OkHttpUtils.post().url(UrlCat.URL_USER_FINDPWD).params(params).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_USER_FINDPWD).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -126,7 +136,7 @@ public class RequestGroup {
      */
     public static void userInfo(Callback callback){
         Map<String, String> params = getSystemParams();
-        OkHttpUtils.post().url(UrlCat.URL_USER_INFO).params(params).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_USER_INFO).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -138,7 +148,7 @@ public class RequestGroup {
         Map<String, String> params = getSystemParams();
         params.put("mobile", mobile);
         params.put("code", code);
-        OkHttpUtils.post().url(UrlCat.URL_LOGIN_CODE).params(params).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_LOGIN_CODE).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -150,7 +160,7 @@ public class RequestGroup {
         Map<String, String> params = getSystemParams();
         params.put("thirdId", thirdId);
         params.put("thirdType", thirdType);
-        OkHttpUtils.post().url(UrlCat.URL_LOGIN_THIRD).params(params).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_LOGIN_THIRD).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -160,7 +170,7 @@ public class RequestGroup {
      */
     public static void userResetHeadpic(String headPic, Callback callback){
         Map<String, String> params = getSystemParams();
-        OkHttpUtils.post().url(UrlCat.URL_USER_HEADPIC).params(params).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_USER_HEADPIC).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -170,7 +180,7 @@ public class RequestGroup {
     public static void userResetMobile(String mobile, Callback callback){
         Map<String, String> params = getSystemParams();
         params.put("mobile", mobile);
-        OkHttpUtils.post().url(UrlCat.URL_USER_RESET_MOBILE).params(params).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_USER_RESET_MOBILE).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**
@@ -181,7 +191,7 @@ public class RequestGroup {
         params.put("oldPwd", oldPwd);
         params.put("pwd", pwd);
         params.put("rePwd", rePwd);
-        OkHttpUtils.post().url(UrlCat.URL_USER_RESET_PWD).params(params).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_USER_RESET_PWD).content(new Gson().toJson(params)).build().execute(callback);
     }
 
     /**修改用户名
@@ -191,6 +201,6 @@ public class RequestGroup {
     public static void userResetUsername(String userName, Callback callback){
         Map<String, String> params = getSystemParams();
         params.put("userName", userName);
-        OkHttpUtils.post().url(UrlCat.URL_USER_RESET_USERNAME).params(params).build().execute(callback);
+        OkHttpUtils.postString().url(UrlCat.URL_USER_RESET_USERNAME).content(new Gson().toJson(params)).build().execute(callback);
     }
 }

+ 4 - 0
app/src/main/java/com/ynstkz/shitu/android/data/SharedPreferencesUtils.java

@@ -18,6 +18,10 @@ public class SharedPreferencesUtils {
         return (Boolean)SharedPreferencesDao.get(IS_LOGIN, false);
     }
 
+    public static void setLogin(boolean isLogin){
+        SharedPreferencesDao.set(IS_LOGIN, isLogin);
+    }
+
     public static void setLocation (String location){
         SharedPreferencesDao.set(KEY_LOCATION, location);
     }

+ 9 - 0
app/src/main/java/com/ynstkz/shitu/android/event/RegisterSuccessEvent.java

@@ -0,0 +1,9 @@
+package com.ynstkz.shitu.android.event;
+
+/**
+ * 作者:fuchangle on 2018/2/22 15:04
+ */
+
+public class RegisterSuccessEvent {
+
+}

+ 10 - 0
app/src/main/java/com/ynstkz/shitu/android/listener/CheckVerifyCodeCallback.java

@@ -0,0 +1,10 @@
+package com.ynstkz.shitu.android.listener;
+
+/**
+ * 作者:fuchangle on 2018/2/22 14:45
+ */
+
+public interface CheckVerifyCodeCallback {
+
+    void isVerifyCodeSuccess(int type, String phoneNumber, boolean isSuccess);
+}

+ 10 - 0
app/src/main/java/com/ynstkz/shitu/android/listener/VerifyCodeCallback.java

@@ -0,0 +1,10 @@
+package com.ynstkz.shitu.android.listener;
+
+/**
+ * 作者:fuchangle on 2018/2/22 14:21
+ */
+
+public interface VerifyCodeCallback {
+
+    void codeCallback(int type, String verifyCode);
+}

+ 1 - 1
app/src/main/res/layout/activity_register.xml

@@ -78,7 +78,7 @@
             android:background="@drawable/shapre_default_edit_bg">
 
             <EditText
-                android:id="@+id/edit_password"
+                android:id="@+id/edit_verify_code"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:hint="请输入验证码"

+ 2 - 0
app/src/main/res/values/strings.xml

@@ -4,4 +4,6 @@
     <string name="lab_nearby">附近</string>
     <string name="lab_usercenter"></string>
     <string name="error_msg">服务器连接失败,请稍后再试</string>
+    <string name="empty_username">用户名不能为空</string>
+    <string name="empty_verifyCode">验证码不能为空</string>
 </resources>