diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..a05cb7b --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index aa2fbba..1fc0df0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,9 +8,11 @@ diff --git a/app/build.gradle b/app/build.gradle index 3154dc1..6b78ebe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,8 +38,8 @@ android { minSdkVersion 21 targetSdkVersion 29 // multiDexEnabled true - versionCode 5 - versionName "1.1.5" + versionCode 6 + versionName "1.1.6" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' ndk { diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 0000000..1b0b0cc Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index d317e3c..75bdcc0 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,8 +10,8 @@ { "type": "SINGLE", "filters": [], - "versionCode": 5, - "versionName": "1.1.5", + "versionCode": 6, + "versionName": "1.1.6", "outputFile": "app-release.apk" } ] diff --git a/app/src/main/java/com/sl/house_property/ForgetPwdActivity.java b/app/src/main/java/com/sl/house_property/ForgetPwdActivity.java index c9555b7..8f13743 100644 --- a/app/src/main/java/com/sl/house_property/ForgetPwdActivity.java +++ b/app/src/main/java/com/sl/house_property/ForgetPwdActivity.java @@ -8,6 +8,7 @@ import android.view.View; import android.widget.Toast; import com.cutil.RegexUtils; +import com.gyf.immersionbar.ImmersionBar; import com.sl.house_property.databinding.ActivityForgetPwdBinding; import java.util.HashMap; @@ -33,15 +34,24 @@ public class ForgetPwdActivity extends BaseActivity im protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setAbr("找回密码", new View.OnClickListener() { - @Override - public void onClick(View view) { - finish(); - } - }, 0, null, 0, null, 0, null, ""); +// setAbr("找回密码", new View.OnClickListener() { +// @Override +// public void onClick(View view) { +// finish(); +// } +// }, 0, null, 0, null, 0, null, ""); + ImmersionBar.with(this) + .keyboardEnable(true) + .init(); mDataBinding.getcode.setOnClickListener(this); mDataBinding.register.setOnClickListener(this); + mDataBinding.left.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); } @Override public void onClick(View view) { diff --git a/app/src/main/java/com/sl/house_property/LogoActivity.java b/app/src/main/java/com/sl/house_property/LogoActivity.java index 95c7be4..b79fb1a 100644 --- a/app/src/main/java/com/sl/house_property/LogoActivity.java +++ b/app/src/main/java/com/sl/house_property/LogoActivity.java @@ -106,7 +106,7 @@ public class LogoActivity extends Activity { TextView tvCancel = window.findViewById(R.id.tv_cancel); TextView tvAgree = window.findViewById(R.id.tv_agree); String str = - " 感谢您对智慧豆豆的支持!我们非常重视您的个人信息和隐私保护。为了更好地保障您的个人权益，在您使用我们的产品前，请务必审慎阅读《隐私政策》和《用户协议》内的所有条款。如您同意以上协议内容，请点击“同意”，开始使用我们的产品和服务!"; + " 感谢您对智慧豆豆的支持!我们非常重视您的个人信息和隐私保护。为了更好地保障您的个人权益，在您使用我们的 产品前，请务必审慎阅读《隐私政策》和《用户协议》内的所有条款。如您同意以上协议内容，请点击“同意”，开始使用我们的产品和服务!"; SpannableStringBuilder ssb = new SpannableStringBuilder(); ssb.append(str); int start = str.indexOf("《"); 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 0cb1bfc..e7a7466 100644 --- a/app/src/main/java/com/sl/house_property/RegisterActivity.java +++ b/app/src/main/java/com/sl/house_property/RegisterActivity.java @@ -1,23 +1,21 @@ package com.sl.house_property; import android.app.ProgressDialog; -import android.content.Intent; + import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.view.View; - import com.cutil.RegexUtils; import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; +import com.gyf.immersionbar.ImmersionBar; import com.lxj.xpopup.XPopup; import com.sl.house_property.databinding.ActivityRegisterBinding; - import java.util.HashMap; import java.util.Map; import java.util.Timer; import java.util.TimerTask; - import entity.RegisterUser; import http.ApiConfig; import my_loader.Loader; @@ -42,16 +40,24 @@ public class RegisterActivity extends BaseActivity impl super.onCreate(savedInstanceState); 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, ""); +// setAbr(getString(R.string.register), new View.OnClickListener() { +// @Override +// public void onClick(View view) { +// finish(); +// } +// }, 0, null, 0, null, 0, null, ""); + ImmersionBar.with(this) + .keyboardEnable(true) + .init(); mDataBinding.getcode.setOnClickListener(this); mDataBinding.register.setOnClickListener(this); - + mDataBinding.left.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); // BindHouseDialog bindHouseDialog = new BindHouseDialog(RegisterActivity.this); // bindHouseDialog.setUserId("1"); // bindHouseDialog.setOnBindHouseListener(new BindHouseDialog.OnBindHouseListener() { diff --git a/app/src/main/res/layout/activity_forget_pwd.xml b/app/src/main/res/layout/activity_forget_pwd.xml index d5a30bd..74430f2 100644 --- a/app/src/main/res/layout/activity_forget_pwd.xml +++ b/app/src/main/res/layout/activity_forget_pwd.xml @@ -9,6 +9,38 @@ android:layout_width="match_parent" android:fitsSystemWindows="true" android:layout_height="match_parent"> + + + + + + + + + + + + + + + @@ -199,6 +199,7 @@ android:layout_marginEnd="15dip" android:hint="请输入身份证号" android:inputType="number" + android:digits="0123456789xX" android:textSize="14sp" />