diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 01e6008..ff43c7c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -121,6 +121,11 @@ android:theme="@style/myErrorDialogTheme" android:screenOrientation="portrait" /> + 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.GONE); + mDataBinding.lyfuwu.setVisibility(View.VISIBLE); + mDataBinding.lyyinsi.setVisibility(View.VISIBLE); + }else { + mDataBinding.rlzhuce.setVisibility(View.GONE); + mDataBinding.lyfuwu.setVisibility(View.VISIBLE); + mDataBinding.lyyinsi.setVisibility(View.VISIBLE); + } } @Override @@ -90,6 +103,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 +246,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/Main4Fragment.java b/app/src/main/java/com/sl/house_property/Main4Fragment.java index 2b9fd29..8c8511d 100644 --- a/app/src/main/java/com/sl/house_property/Main4Fragment.java +++ b/app/src/main/java/com/sl/house_property/Main4Fragment.java @@ -120,6 +120,12 @@ public class Main4Fragment extends BaseFragment implements startActivity(intent); } }); + mDataBinding.ll5.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + WebActivitytwo.runActivity(getActivity(), "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19"); + } + }); //mDataBinding.myRecyView; mDataBinding.userImage.setOnClickListener(new View.OnClickListener() { @Override 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= 100) { + pb.setVisibility(View.GONE); + } + } + }); + + webView.setWebViewClient(new WebViewClient() { + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + view.loadUrl(url); + return true; + } + }); + webView.loadUrl(url); + + } + + private void initView() { + webView = (WebView) findViewById(R.id.webView); + webView.setOnClickListener(this); + pb = (ProgressBar) findViewById(R.id.pb); + mLayTopLeftTv = (RelativeLayout) findViewById(R.id.layTop_left_tv); + mLayTopLeftTv.setOnClickListener(this); + mLayTopTitle = (TextView) findViewById(R.id.layTop_title); + mRight = (TextView) findViewById(R.id.right); + mIvCode = (ImageView) findViewById(R.id.iv_code); + mPb = (ProgressBar) findViewById(R.id.pb); + mWebView = (WebView) findViewById(R.id.webView); + mLayTopTitle.setText("智慧豆豆"); + } + + @Override + public void onClick(View v) { + switch (v.getId()) { + default: + break; + case R.id.webView: + break; + case R.id.layTop_left_tv: + finish(); + break; + } + } +} diff --git a/app/src/main/java/com/sl/house_property/discovery/HeaderAndFooterAdapter.java b/app/src/main/java/com/sl/house_property/discovery/HeaderAndFooterAdapter.java index de03a03..f7655be 100644 --- a/app/src/main/java/com/sl/house_property/discovery/HeaderAndFooterAdapter.java +++ b/app/src/main/java/com/sl/house_property/discovery/HeaderAndFooterAdapter.java @@ -30,7 +30,7 @@ public class HeaderAndFooterAdapter extends BaseQuickAdapter statuses; private RecyclerView mRecyclerView; private HeaderAndFooterAdapter headerAndFooterAdapter; + private String address; @Override protected int getLayoutResId() { @@ -90,9 +91,9 @@ public class ShareCodeActivity extends BaseActivity commentBeanDatas1 = commentDao.queryInByCustom("isdelete","0"); @@ -155,6 +156,7 @@ public class ShareCodeActivity extends BaseActivity 0) { mDataBinding.tvAddress.setText(list.get(position).getAddress()); + address=list.get(position).getAddress(); } } @@ -227,9 +229,9 @@ public class ShareCodeActivity extends BaseActivity + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index ca0438b..684bd16 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -112,6 +112,8 @@ android:textSize="16sp" /> + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_my_user_message.xml b/app/src/main/res/layout/activity_my_user_message.xml index d8230c5..23d3768 100644 --- a/app/src/main/res/layout/activity_my_user_message.xml +++ b/app/src/main/res/layout/activity_my_user_message.xml @@ -3,6 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_main4.xml b/app/src/main/res/layout/fragment_main4.xml index 81dca0b..8dac1c4 100644 --- a/app/src/main/res/layout/fragment_main4.xml +++ b/app/src/main/res/layout/fragment_main4.xml @@ -250,6 +250,47 @@ android:layout_height="1dp" + android:background="@color/light" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-xxhdpi/clound_code.png b/app/src/main/res/mipmap-xxhdpi/clound_code.png new file mode 100644 index 0000000..be6438a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/clound_code.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_back.png b/app/src/main/res/mipmap-xxhdpi/icon_back.png new file mode 100644 index 0000000..b6fd092 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_back.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 55aa125..12a7fa7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -57,6 +57,7 @@ 获取验证码 我已同意以上条约 我已同意《注册协议》 + 我已同意《隐私政策》 下一步 秒后重新获取