1
This commit is contained in:
@@ -5,11 +5,12 @@ import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
import android.view.Gravity;
|
||||
import android.view.View;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.cutil.RegexUtils;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.internal.LinkedTreeMap;
|
||||
import com.lxj.xpopup.XPopup;
|
||||
import com.sl.house_property.databinding.ActivityRegisterBinding;
|
||||
|
||||
import java.util.HashMap;
|
||||
@@ -17,9 +18,10 @@ import java.util.Map;
|
||||
import java.util.Timer;
|
||||
import java.util.TimerTask;
|
||||
|
||||
import entity.RegisterUser;
|
||||
import http.ApiConfig;
|
||||
import my_loader.Loader;
|
||||
import my_loader.Resultcode;
|
||||
import http.ApiConfig;
|
||||
import rx.Subscription;
|
||||
import rx.functions.Action1;
|
||||
import utils.Md5;
|
||||
@@ -30,7 +32,6 @@ public class RegisterActivity extends BaseActivity<ActivityRegisterBinding> impl
|
||||
private Loader mGankLoader;
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
protected int getLayoutResId() {
|
||||
return R.layout.activity_register;
|
||||
@@ -39,14 +40,14 @@ public class RegisterActivity extends BaseActivity<ActivityRegisterBinding> impl
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
progressDialog=new ProgressDialog(RegisterActivity.this);
|
||||
progressDialog = new ProgressDialog(RegisterActivity.this);
|
||||
|
||||
setAbr(getString(R.string.register), new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
finish();
|
||||
}
|
||||
},0,null,0,null,0,null,"");
|
||||
}, 0, null, 0, null, 0, null, "");
|
||||
mDataBinding.getcode.setOnClickListener(this);
|
||||
|
||||
mDataBinding.register.setOnClickListener(this);
|
||||
@@ -54,37 +55,37 @@ public class RegisterActivity extends BaseActivity<ActivityRegisterBinding> impl
|
||||
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
switch (view.getId()){
|
||||
switch (view.getId()) {
|
||||
|
||||
|
||||
case R.id.getcode:
|
||||
if(mDataBinding.registerphone.getText().toString().length()<1){
|
||||
case R.id.getcode:
|
||||
if (mDataBinding.registerphone.getText().toString().length() < 1) {
|
||||
setToast(getString(R.string.me_input_phone_tip));
|
||||
return;
|
||||
}
|
||||
if(!RegexUtils.isMobileExact(mDataBinding.registerphone.getText().toString())){
|
||||
if (!RegexUtils.isMobileExact(mDataBinding.registerphone.getText().toString())) {
|
||||
setToast(getString(R.string.me_input_phone_error_tip));
|
||||
return;
|
||||
}
|
||||
getMesgCode(R.id.getcode);
|
||||
break;
|
||||
case R.id.register:
|
||||
if(mDataBinding.registerphone.getText().toString().length()==0){
|
||||
case R.id.register:
|
||||
if (mDataBinding.registerphone.getText().toString().length() == 0) {
|
||||
setToast(getString(R.string.me_input_phone_tip));
|
||||
return;
|
||||
}
|
||||
if(!RegexUtils.isMobileExact(mDataBinding.registerphone.getText().toString())){
|
||||
if (!RegexUtils.isMobileExact(mDataBinding.registerphone.getText().toString())) {
|
||||
setToast(getString(R.string.me_input_phone_error_tip));
|
||||
return;
|
||||
}
|
||||
|
||||
if(mDataBinding.logincode.getText().toString().length()<1){
|
||||
if (mDataBinding.logincode.getText().toString().length() < 1) {
|
||||
setToast(getString(R.string.me_input_verification_tip));
|
||||
return;
|
||||
}
|
||||
|
||||
String password = mDataBinding.editpaw.getText().toString();
|
||||
if(password.length()<1){
|
||||
String password = mDataBinding.editpaw.getText().toString();
|
||||
if (password.length() < 1) {
|
||||
setToast(getString(R.string.me_input_password_tip));
|
||||
return;
|
||||
}
|
||||
@@ -93,24 +94,24 @@ public class RegisterActivity extends BaseActivity<ActivityRegisterBinding> impl
|
||||
//
|
||||
// return;
|
||||
// }
|
||||
if(!tools.RegexUtils.checkPassword(password)){
|
||||
if (!tools.RegexUtils.checkPassword(password)) {
|
||||
setToast(getString(R.string.me_input_password_fail_tip));
|
||||
return;
|
||||
}
|
||||
|
||||
String againPassword = mDataBinding.editagainpaw.getText().toString().trim();
|
||||
if(againPassword.length()<1){
|
||||
if (againPassword.length() < 1) {
|
||||
setToast(getString(R.string.me_input_again_password_tip));
|
||||
return;
|
||||
}
|
||||
|
||||
if(!mDataBinding.editpaw.getText().toString().trim().equals(mDataBinding.editagainpaw.getText().toString().trim())){
|
||||
if (!mDataBinding.editpaw.getText().toString().trim().equals(mDataBinding.editagainpaw.getText().toString().trim())) {
|
||||
setToast(getString(R.string.me_password_Inconsistent_tip));
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if(!mDataBinding.agreewhitemeg.isChecked()){
|
||||
if (!mDataBinding.agreewhitemeg.isChecked()) {
|
||||
setToast("请先同意注册协议");
|
||||
|
||||
return;
|
||||
@@ -122,14 +123,14 @@ public class RegisterActivity extends BaseActivity<ActivityRegisterBinding> impl
|
||||
}
|
||||
|
||||
private void register(int id) {
|
||||
Map<String,String> map=new HashMap<>();
|
||||
map.put("phone",mDataBinding.registerphone.getText().toString().trim());
|
||||
map.put("password",mDataBinding.editpaw.getText().toString().trim());
|
||||
map.put("code",mDataBinding.logincode.getText().toString().trim());
|
||||
map.put("sign", Md5.md5("Cas"+"UserReg"+Md5.secret));
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("phone", mDataBinding.registerphone.getText().toString().trim());
|
||||
map.put("password", mDataBinding.editpaw.getText().toString().trim());
|
||||
map.put("code", mDataBinding.logincode.getText().toString().trim());
|
||||
map.put("sign", Md5.md5("Cas" + "UserReg" + Md5.secret));
|
||||
map.put("app", "Cas");
|
||||
map.put("class", "UserReg");
|
||||
getGankList(ApiConfig.BASE_URL,map, getResources().getString(R.string.registering),id);
|
||||
getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.registering), id);
|
||||
}
|
||||
|
||||
|
||||
@@ -139,13 +140,13 @@ public class RegisterActivity extends BaseActivity<ActivityRegisterBinding> impl
|
||||
/* getRegisterCode.setTextColor(getResources().getColor(R.color.regitergrey));*/
|
||||
|
||||
mDataBinding.getcode.setClickable(false);
|
||||
Map<String,String> map=new HashMap<>();
|
||||
map.put("sendto",mDataBinding.registerphone.getText().toString().trim());
|
||||
map.put("action","register");
|
||||
map.put("sign", Md5.md5("Cas"+"SendCode"+Md5.secret));
|
||||
Map<String, String> map = new HashMap<>();
|
||||
map.put("sendto", mDataBinding.registerphone.getText().toString().trim());
|
||||
map.put("action", "register");
|
||||
map.put("sign", Md5.md5("Cas" + "SendCode" + Md5.secret));
|
||||
map.put("app", "Cas");
|
||||
map.put("class", "SendCode");
|
||||
getGankList(ApiConfig.BASE_URL,map, getResources().getString(R.string.getthecodenow),id);
|
||||
getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.getthecodenow), id);
|
||||
// map = new HashMap<String, Object>();
|
||||
// map.put("telephone", editPhoneNo.getText().toString().trim());
|
||||
// getAsyTask(1, map, HttpUrl.registerUser(), "正在获取验证码", HttpNet.PROGRESSVISIBLE, HttpNet.POSTTYPE);//联网
|
||||
@@ -164,34 +165,43 @@ public class RegisterActivity extends BaseActivity<ActivityRegisterBinding> impl
|
||||
progressDialog.dismiss();
|
||||
//setToast(1, getString(R.string.timeout));
|
||||
}
|
||||
},13000);
|
||||
mGankLoader = new Loader();
|
||||
}, 13000);
|
||||
mGankLoader = new Loader();
|
||||
/* Map<String,String> map=new HashMap<String,String>();
|
||||
map.put("phone");*/
|
||||
Subscription subscription = mGankLoader.getMovie(myurl,map).subscribe(new Action1<Resultcode>() {
|
||||
Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
|
||||
@Override
|
||||
public void call(Resultcode resultcode) {
|
||||
progressDialog.dismiss();
|
||||
//setToast(0,resultcode.status);
|
||||
if((!(resultcode.status==0))){
|
||||
setToast( resultcode.msg);
|
||||
if ((!(resultcode.status == 0))) {
|
||||
setToast(resultcode.msg);
|
||||
mDataBinding.getcode.setClickable(true);
|
||||
return;
|
||||
}
|
||||
switch (getcode1) {
|
||||
case R.id.getcode:
|
||||
setToast( getString(R.string.megissucess));
|
||||
startTimer();
|
||||
case R.id.getcode:
|
||||
setToast(getString(R.string.megissucess));
|
||||
startTimer();
|
||||
break;
|
||||
|
||||
case R.id.register:
|
||||
setToast( getString(R.string.registersucess));
|
||||
mDataBinding.getRoot().postDelayed(new Runnable() {
|
||||
setToast(getString(R.string.registersucess));
|
||||
Gson gs = new Gson();
|
||||
LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
|
||||
String s = gs.toJson(adta);
|
||||
RegisterUser user = gs.fromJson(s, RegisterUser.class);//把JSON字符串转为对象
|
||||
BindHouseDialog bindHouseDialog = new BindHouseDialog(RegisterActivity.this);
|
||||
bindHouseDialog.setUserId(user.getUserid());
|
||||
bindHouseDialog.setOnBindHouseListener(new BindHouseDialog.OnBindHouseListener() {
|
||||
@Override
|
||||
public void run() {
|
||||
public void onSubmit() {
|
||||
|
||||
setToast("提交成功");
|
||||
finish();
|
||||
}
|
||||
},1500);
|
||||
});
|
||||
new XPopup.Builder(RegisterActivity.this).asCustom(bindHouseDialog).show();
|
||||
|
||||
break;
|
||||
|
||||
@@ -213,7 +223,7 @@ public class RegisterActivity extends BaseActivity<ActivityRegisterBinding> impl
|
||||
addSubscription(subscription);
|
||||
}
|
||||
|
||||
private void startTimer(){
|
||||
private void startTimer() {
|
||||
final Timer timer = new Timer();
|
||||
final Handler handler = new Handler() {
|
||||
@Override
|
||||
@@ -249,9 +259,10 @@ public class RegisterActivity extends BaseActivity<ActivityRegisterBinding> impl
|
||||
|
||||
/**
|
||||
* 用户协议
|
||||
*
|
||||
* @param v v
|
||||
*/
|
||||
public void agreementEvent(View v){
|
||||
public void agreementEvent(View v) {
|
||||
Intent intent = new Intent(this, RegisterAgreementActivity.class);
|
||||
startActivity(intent);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user