This commit is contained in:
jinyuer
2022-01-28 09:58:12 +08:00
parent c728e759df
commit 71d91699d1
12 changed files with 129 additions and 24 deletions

17
.idea/deploymentTargetDropDown.xml generated Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="SERIAL_NUMBER" />
<value value="192.168.0.246:5555" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2022-01-28T01:34:06.092244700Z" />
</component>
</project>

6
.idea/misc.xml generated
View File

@@ -8,9 +8,11 @@
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_add_acar.xml" value="0.3558974358974359" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_add_address.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_add_discovery.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_adevise.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_forget_pwd.xml" value="0.3558974358974359" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_like.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_login.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_logo.xml" value="0.3614583333333333" />
@@ -20,7 +22,10 @@
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_my_property.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_my_user_message.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_propery.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_qrcode.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_register.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_setting.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/dialog_bind_house.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/dialog_initmate.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/fragment_discovery.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/fragment_like.xml" value="0.3614583333333333" />
@@ -28,6 +33,7 @@
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/fragment_main3.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/item_discovery.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/layout_history_record.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/tab_actionbar.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/welcome_image.xml" value="0.3614583333333333" />
</map>
</option>

View File

@@ -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 {

BIN
app/release/app-release.apk Normal file

Binary file not shown.

View File

@@ -10,8 +10,8 @@
{
"type": "SINGLE",
"filters": [],
"versionCode": 5,
"versionName": "1.1.5",
"versionCode": 6,
"versionName": "1.1.6",
"outputFile": "app-release.apk"
}
]

View File

@@ -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<ActivityForgetPwdBinding> 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) {

View File

@@ -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<ActivityRegisterBinding> 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() {

View File

@@ -9,6 +9,38 @@
android:layout_width="match_parent"
android:fitsSystemWindows="true"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/ll"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="@dimen/mystatusbar"
android:orientation="horizontal">
<ImageView
android:id="@+id/left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:paddingLeft="16dp"
android:paddingTop="5dp"
android:paddingRight="5dp"
android:paddingBottom="5dp"
android:src="@mipmap/fanhui" />
<TextView
android:id="@+id/tv_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:gravity="center"
android:text="忘记密码"
android:textColor="@color/white"
android:textSize="16sp" />
</RelativeLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"

View File

@@ -103,13 +103,15 @@
android:layout_width="match_parent"
android:layout_height="40dp"
android:text="我已阅读并同意隐私政策和用户协议"
android:drawablePadding="5dp"
android:drawablePadding="12dp"
android:textSize="12sp"
android:gravity="center_vertical"
android:textColor="@color/text2"
android:drawableLeft="@mipmap/icon_publish_selected2"
android:layout_marginLeft="20dip"
/>
<TextView
android:id="@+id/logintext"
android:layout_width="match_parent"
android:layout_height="45dp"

View File

@@ -10,7 +10,38 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/ll"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="@dimen/mystatusbar"
android:orientation="horizontal">
<ImageView
android:id="@+id/left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:paddingLeft="16dp"
android:paddingTop="5dp"
android:paddingRight="5dp"
android:paddingBottom="5dp"
android:src="@mipmap/fanhui" />
<TextView
android:id="@+id/tv_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:gravity="center"
android:text="注册"
android:textColor="@color/white"
android:textSize="16sp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"

View File

@@ -187,7 +187,7 @@
android:layout_height="50dp"
android:layout_marginStart="15dip"
android:layout_marginEnd="15dip"
android:digits="0123456789xX"
android:inputType="text"
android:hint="请输入户主姓名"
android:textSize="14sp" />
@@ -199,6 +199,7 @@
android:layout_marginEnd="15dip"
android:hint="请输入身份证号"
android:inputType="number"
android:digits="0123456789xX"
android:textSize="14sp" />
<View