|
@@ -1,5 +1,6 @@
|
|
|
package com.ynstkz.shitu.android.activity;
|
|
|
|
|
|
+import android.content.Intent;
|
|
|
import android.os.Build;
|
|
|
import android.os.Bundle;
|
|
|
import android.support.annotation.Nullable;
|
|
@@ -7,6 +8,7 @@ import android.text.TextUtils;
|
|
|
import android.util.Patterns;
|
|
|
import android.view.View;
|
|
|
import android.widget.Button;
|
|
|
+import android.widget.CheckBox;
|
|
|
import android.widget.EditText;
|
|
|
import android.widget.ImageView;
|
|
|
import android.widget.TextView;
|
|
@@ -47,6 +49,10 @@ public class RegisterSubmitActivity extends TitleBarActivity {
|
|
|
EditText editPasswordAgain;
|
|
|
@Bind(R.id.btn_register)
|
|
|
Button btnRegister;
|
|
|
+ @Bind(R.id.cb_agree)
|
|
|
+ CheckBox cbAgree;
|
|
|
+ @Bind(R.id.tv_agreement)
|
|
|
+ TextView tvAgreement;
|
|
|
|
|
|
private String phoneNumber;
|
|
|
private String thirdId;
|
|
@@ -70,18 +76,28 @@ public class RegisterSubmitActivity extends TitleBarActivity {
|
|
|
return R.layout.activity_register_submint;
|
|
|
}
|
|
|
|
|
|
- private void initView(){
|
|
|
+ private void initView() {
|
|
|
|
|
|
}
|
|
|
|
|
|
- private void initData(){
|
|
|
+ private void initData() {
|
|
|
phoneNumber = getIntent().getStringExtra("phoneNumber");
|
|
|
thirdId = getIntent().getStringExtra("thirdId");
|
|
|
thirdType = getIntent().getStringExtra("thirdType");
|
|
|
code = getIntent().getStringExtra("code");
|
|
|
}
|
|
|
|
|
|
- private void setListener(){
|
|
|
+ private void setListener() {
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 关闭
|
|
|
+ */
|
|
|
+ ivCancel.setOnClickListener(new View.OnClickListener() {
|
|
|
+ @Override
|
|
|
+ public void onClick(View view) {
|
|
|
+ finish();
|
|
|
+ }
|
|
|
+ });
|
|
|
|
|
|
/**
|
|
|
* 注册
|
|
@@ -89,24 +105,40 @@ public class RegisterSubmitActivity extends TitleBarActivity {
|
|
|
btnRegister.setOnClickListener(new View.OnClickListener() {
|
|
|
@Override
|
|
|
public void onClick(View view) {
|
|
|
+ if(!cbAgree.isChecked()) {
|
|
|
+ showToast("请阅读并同意注册协议");
|
|
|
+ return;
|
|
|
+ }
|
|
|
String userName = editUsername.getText().toString().trim();
|
|
|
String pwd = editPassword.getText().toString().trim();
|
|
|
String rePwd = editPasswordAgain.getText().toString().trim();
|
|
|
- if(verifyData(phoneNumber, userName, pwd, rePwd)){
|
|
|
+ if (verifyData(phoneNumber, userName, pwd, rePwd)) {
|
|
|
register(phoneNumber, userName, pwd, rePwd, code);
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
+
|
|
|
+ /**
|
|
|
+ *登陆
|
|
|
+ */
|
|
|
+ tvLogin.setOnClickListener(new View.OnClickListener() {
|
|
|
+ @Override
|
|
|
+ public void onClick(View view) {
|
|
|
+ startActivity(new Intent(RegisterSubmitActivity.this, LoginActivity.class));
|
|
|
+ finish();
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 注册
|
|
|
+ *
|
|
|
* @param mobile
|
|
|
* @param userName
|
|
|
* @param pwd
|
|
|
* @param rePwd
|
|
|
*/
|
|
|
- private void register(String mobile, String userName, String pwd, final String rePwd, String code){
|
|
|
+ private void register(String mobile, String userName, String pwd, final String rePwd, String code) {
|
|
|
|
|
|
RequestGroup.register(mobile, userName, pwd, rePwd, code, new Callback() {
|
|
|
@Override
|
|
@@ -121,21 +153,20 @@ 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){
|
|
|
+ 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());
|
|
|
-
|
|
|
SharedPreferencesUtils.saveToken(bean.getData().getToken());
|
|
|
SharedPreferencesUtils.saveUserId(bean.getData().getUserId());
|
|
|
|
|
|
- if(!TextUtils.isEmpty(thirdId) && !TextUtils.isEmpty(thirdType)){
|
|
|
+ if (!TextUtils.isEmpty(thirdId) && !TextUtils.isEmpty(thirdType)) {
|
|
|
thirdBind(thirdId, thirdType);
|
|
|
} else {
|
|
|
+ EventBus.getDefault().post(new RegisterSuccessEvent());
|
|
|
+ showToast(bean.getMsg());
|
|
|
finish();
|
|
|
}
|
|
|
}
|
|
@@ -149,34 +180,35 @@ public class RegisterSubmitActivity extends TitleBarActivity {
|
|
|
|
|
|
/**
|
|
|
* 校验数据
|
|
|
+ *
|
|
|
* @param mobile
|
|
|
* @param userName
|
|
|
* @param pwd
|
|
|
* @param rePwd
|
|
|
* @return
|
|
|
*/
|
|
|
- private boolean verifyData(String mobile, String userName, String pwd, String rePwd){
|
|
|
- if(TextUtils.isEmpty(mobile)){
|
|
|
+ private boolean verifyData(String mobile, String userName, String pwd, String rePwd) {
|
|
|
+ if (TextUtils.isEmpty(mobile)) {
|
|
|
showToast("手机号码不能为空!");
|
|
|
return false;
|
|
|
}
|
|
|
- if(!Patterns.PHONE.matcher(mobile).matches()){
|
|
|
+ if (!Patterns.PHONE.matcher(mobile).matches()) {
|
|
|
showToast("手机号码不正确!");
|
|
|
return false;
|
|
|
}
|
|
|
- if(TextUtils.isEmpty(userName)){
|
|
|
+ if (TextUtils.isEmpty(userName)) {
|
|
|
showToast("用户名不能为空!");
|
|
|
return false;
|
|
|
}
|
|
|
- if(TextUtils.isEmpty(pwd)){
|
|
|
+ if (TextUtils.isEmpty(pwd)) {
|
|
|
showToast("密码不能为空!");
|
|
|
return false;
|
|
|
}
|
|
|
- if(TextUtils.isEmpty(rePwd)){
|
|
|
+ if (TextUtils.isEmpty(rePwd)) {
|
|
|
showToast("确认密码不能为空!");
|
|
|
return false;
|
|
|
}
|
|
|
- if(!pwd.equals(rePwd)){
|
|
|
+ if (!pwd.equals(rePwd)) {
|
|
|
showToast("密码输入不一致");
|
|
|
return false;
|
|
|
}
|
|
@@ -185,10 +217,11 @@ public class RegisterSubmitActivity extends TitleBarActivity {
|
|
|
|
|
|
/**
|
|
|
* 三方账号绑定
|
|
|
+ *
|
|
|
* @param thirdId
|
|
|
* @param thirdType
|
|
|
*/
|
|
|
- private void thirdBind(String thirdId, String thirdType){
|
|
|
+ private void thirdBind(String thirdId, String thirdType) {
|
|
|
|
|
|
RequestGroup.thirdBind(thirdId, thirdType, new Callback() {
|
|
|
@Override
|
|
@@ -204,9 +237,10 @@ public class RegisterSubmitActivity extends TitleBarActivity {
|
|
|
|
|
|
@Override
|
|
|
public void onResponse(Object response, int id) {
|
|
|
- BaseBean baseBean = (BaseBean)response;
|
|
|
- if(baseBean != null){
|
|
|
- if("200".equals(baseBean.getCode())){
|
|
|
+ BaseBean baseBean = (BaseBean) response;
|
|
|
+ if (baseBean != null) {
|
|
|
+ if ("200".equals(baseBean.getCode())) {
|
|
|
+ EventBus.getDefault().post(new RegisterSuccessEvent());
|
|
|
finish();
|
|
|
}
|
|
|
showToast(baseBean.getMsg());
|