diff --git a/app/src/main/java/com/sl/house_property/LoginActivity.java b/app/src/main/java/com/sl/house_property/LoginActivity.java index a3a226e..1e609f7 100644 --- a/app/src/main/java/com/sl/house_property/LoginActivity.java +++ b/app/src/main/java/com/sl/house_property/LoginActivity.java @@ -26,6 +26,8 @@ import tools.Config; import http.ApiConfig; import rx.Subscription; import rx.functions.Action1; +import utils.DateUtils; +import utils.DateUtilss; import utils.Md5; import utils.SPUtils; @@ -56,7 +58,15 @@ public class LoginActivity extends BaseActivity implements mDataBinding.logintext.setOnClickListener(this); mDataBinding.forgetpaw.setOnClickListener(this); mDataBinding.gotoregister.setOnClickListener(this); - + //获取当前日期 + String gettimetwo = DateUtilss.gettimetwo(); + Log.e("当前日期",gettimetwo); + if(!gettimetwo.equals("2021年04月02日")||!gettimetwo.equals("2021年04月03日")||!gettimetwo.equals("2021年04月04日")||!gettimetwo.equals("2021年04月05日")||!gettimetwo.equals("2021年04月06日")){ + mDataBinding.rlzhuce.setVisibility(View.VISIBLE); + }else { + mDataBinding.lyfuwu.setVisibility(View.GONE); + mDataBinding.lyyinsi.setVisibility(View.GONE); + } } @Override @@ -90,6 +100,16 @@ public class LoginActivity extends BaseActivity implements setToast(getString(R.string.me_input_password_tip)); return; } + if (!mDataBinding.agreewhitemeg.isChecked()) { + setToast("请先同意注册协议"); + + return; + } + if (!mDataBinding.agreewhitemegy.isChecked()) { + setToast("请先同意隐私政策"); + + return; + } Map map = new HashMap<>(); map.put("phone", phone); map.put("password", password); @@ -223,6 +243,23 @@ public class LoginActivity extends BaseActivity implements addSubscription(subscription); } - + /** + * 用户协议 + * + * @param v v + */ + public void agreementEvent(View v) { +// Intent intent = new Intent(this, RegisterAgreementActivity.class); +// startActivity(intent); + WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1"); + } + /** + * 隐私政策 + * + * @param v v + */ + public void yinagreementEvent(View v) { + WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19"); + } } diff --git a/app/src/main/java/com/sl/house_property/RegisterActivity.java b/app/src/main/java/com/sl/house_property/RegisterActivity.java index e731c55..d13d050 100644 --- a/app/src/main/java/com/sl/house_property/RegisterActivity.java +++ b/app/src/main/java/com/sl/house_property/RegisterActivity.java @@ -116,6 +116,12 @@ public class RegisterActivity extends BaseActivity impl return; } + if (!mDataBinding.agreewhitemegy.isChecked()) { + setToast("请先同意隐私政策"); + + return; + } + register(view.getId()); break; @@ -263,8 +269,16 @@ public class RegisterActivity extends BaseActivity impl * @param v v */ public void agreementEvent(View v) { - Intent intent = new Intent(this, RegisterAgreementActivity.class); - startActivity(intent); +// Intent intent = new Intent(this, RegisterAgreementActivity.class); +// startActivity(intent); + WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1"); + } + /** + * 隐私政策 + * + * @param v v + */ + public void yinagreementEvent(View v) { + WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19"); } - } diff --git a/app/src/main/java/com/sl/house_property/RegisterAgreementActivity.java b/app/src/main/java/com/sl/house_property/RegisterAgreementActivity.java index 2a98737..0ababb8 100644 --- a/app/src/main/java/com/sl/house_property/RegisterAgreementActivity.java +++ b/app/src/main/java/com/sl/house_property/RegisterAgreementActivity.java @@ -25,7 +25,8 @@ public class RegisterAgreementActivity extends BaseActivity + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml index 4f9f816..bcb4cef 100644 --- a/app/src/main/res/layout/activity_register.xml +++ b/app/src/main/res/layout/activity_register.xml @@ -244,6 +244,33 @@ + + + + + 获取验证码 我已同意以上条约 我已同意《注册协议》 + 我已同意《隐私政策》 下一步 秒后重新获取