admin/HouseProperty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/renjianbo0118/HouseProperty

Browse Source
This commit is contained in:
jianbo
2020-10-13 14:42:22 +08:00
parent af907543ea 7e6b8c2fc2
commit b29036ca9a
7 changed files with 365 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
app/src/main/java/com/sl/house_property/MyHouseEntity.java Normal file
View File

@@ -0,0 +1,76 @@
package com.sl.house_property;
public class MyHouseEntity {
private String user_home_id;
private String area_name;
private String building_name;
private String unit_name;
private String home_name;
private String relname;
private String idcard;
private String is_verify;
public String getIs_verify() {
return is_verify;
}
public void setIs_verify(String is_verify) {
this.is_verify = is_verify;
}
public String getUser_home_id() {
return user_home_id;
}
public void setUser_home_id(String user_home_id) {
this.user_home_id = user_home_id;
}
public String getArea_name() {
return area_name;
}
public void setArea_name(String area_name) {
this.area_name = area_name;
}
public String getBuilding_name() {
return building_name;
}
public void setBuilding_name(String building_name) {
this.building_name = building_name;
}
public String getUnit_name() {
return unit_name;
}
public void setUnit_name(String unit_name) {
this.unit_name = unit_name;
}
public String getHome_name() {
return home_name;
}
public void setHome_name(String home_name) {
this.home_name = home_name;
}
public String getRelname() {
return relname;
}
public void setRelname(String relname) {
relname = relname;
}
public String getIdcard() {
return idcard;
}
public void setIdcard(String idcard) {
this.idcard = idcard;
}
}

23
app/src/main/java/com/sl/house_property/discovery/ShareCodeActivity.java
View File

@@ -128,17 +128,17 @@ public class ShareCodeActivity extends BaseActivity<com.sl.house_property.databi
mDataBinding.confirm.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (list == null || list.isEmpty()) {
setToast("还没有房间");
return;
}
// if (list == null || list.isEmpty()) {
// setToast("还没有房间");
// return;
// }
String phone = mDataBinding.telephone.getText().toString().trim();
if (TextUtils.isEmpty(phone)) {
setToast("请输入访客手机号");
return;
}
hideKeyboard(mDataBinding.telephone);
// String phone = mDataBinding.telephone.getText().toString().trim();
// if (TextUtils.isEmpty(phone)) {
// setToast("请输入访客手机号");
// return;
// }
// hideKeyboard(mDataBinding.telephone);
getPwd();
}
@@ -235,6 +235,7 @@ public class ShareCodeActivity extends BaseActivity<com.sl.house_property.databi
// map.put("validity_time", mDataBinding.daytiems.getText().toString().trim());
map.put("user_home_id", user_home_id);
progressDialog.show();
mGankLoader = new Loader();
Subscription subscribe = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
@Override
public void call(Resultcode resultcode) {
@@ -279,7 +280,7 @@ public class ShareCodeActivity extends BaseActivity<com.sl.house_property.databi
map.put("app", "Door");
map.put("class", "SendCustomerCode");
map.put("type", "password");
map.put("phone", mDataBinding.telephone.getText().toString().trim());
// map.put("phone", mDataBinding.telephone.getText().toString().trim());
// map.put("validity_time", mDataBinding.daytiems.getText().toString().trim());
map.put("user_home_id", user_home_id);
Subscription subscribe = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {

159
app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java
View File

@@ -1,15 +1,18 @@
package com.sl.house_property.user;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
import android.widget.Toast;
import com.selectpicker.OptionsPopupWindow;
import com.google.gson.Gson;
import com.google.gson.internal.LinkedTreeMap;
import com.google.gson.reflect.TypeToken;
import com.lxj.xpopup.XPopup;
import com.lxj.xpopup.interfaces.OnInputConfirmListener;
import com.selectpicker.OptionsPopupWindow;
import com.sl.house_property.BaseActivity;
import com.sl.house_property.MyHouseEntity;
import com.sl.house_property.R;
import com.sl.house_property.databinding.ActivityMyPropertyBinding;
import com.sl.house_property.databinding.MyhousrmessageitemBinding;
@@ -21,17 +24,15 @@ import java.util.Map;
import adapter.BaseRecycleViewAdapter;
import entity.MyHomequEntity;
import entity.MySimpleHomequEntity;
import entity.RegisterUser;
import entity.SimpleEntity;
import http.ApiConfig;
import my_loader.Loader;
import my_loader.Resultcode;
import my_view.RadiolistDialog;
import my_view.tao_bao_refresh.FullyGridLayoutManager;
import tools.Config;
import http.ApiConfig;
import rx.Subscription;
import rx.functions.Action1;
import tools.Config;
import utils.Md5;
import static android.view.View.VISIBLE;
@@ -73,9 +74,9 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
map.put("userid", 0 + "");
}
map.put("app", "Cas");
map.put("class", "BeforeFamilyMember");
map.put("class", "MyHouseList");
//map.put("home_id", "GetHomeByPid");
map.put("sign", Md5.md5("Cas" + "BeforeFamilyMember" + Md5.secret));
map.put("sign", Md5.md5("Cas" + "MyHouseList" + Md5.secret));
getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0);
@@ -86,6 +87,25 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
if (!(position >= homegridentityvArrayList.size())) {
MyhousrmessageitemBinding homeGridAdapterItemBinding = (MyhousrmessageitemBinding) b;
homeGridAdapterItemBinding.setMyentity(homegridentityvArrayList.get(position));
if (TextUtils.isEmpty(homegridentityvArrayList.get(position).getString10()) && homegridentityvArrayList.get(position).isString9()) {
homeGridAdapterItemBinding.llH.setVisibility(View.GONE);
} else {
homeGridAdapterItemBinding.llH.setVisibility(VISIBLE);
}
if (TextUtils.isEmpty(homegridentityvArrayList.get(position).getString11()) && homegridentityvArrayList.get(position).isString9()) {
homeGridAdapterItemBinding.llS.setVisibility(View.GONE);
} else {
homeGridAdapterItemBinding.llS.setVisibility(VISIBLE);
}
if (homegridentityvArrayList.get(position).getIs_verify()!=null){
if (homegridentityvArrayList.get(position).getIs_verify().equals("0")) {
homeGridAdapterItemBinding.tvYz.setText("未验证");
} else {
homeGridAdapterItemBinding.tvYz.setText("已验证");
}
}
homeGridAdapterItemBinding.delete.setOnClickListener(new View.OnClickListener() {
@Override
@@ -113,6 +133,7 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
adding = false;
return;
}
progressDialog.show();
map.put("user_home_id", homegridentityvArrayList.get(position).getString8());
map.put("sign", Md5.md5("Cas" + "DelMyHouse" + Md5.secret));
getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 100000 + position);
@@ -275,13 +296,53 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
setToast("请选择房号");
return;
}
if (homegridentityvArrayList.get(position).getString10() == null
|| homegridentityvArrayList.get(position).getString10().equals("")) {
setToast("请输入户主姓名");
return;
}
if (homegridentityvArrayList.get(position).getString11() == null
|| homegridentityvArrayList.get(position).getString11().equals("")) {
setToast("请输入身份证号");
return;
}
map.put("home_id", homegridentityvArrayList.get(position).getString8());
//map.put("home_id", "GetHomeByPid");
map.put("sign", Md5.md5("Cas" + "AddMyHouse" + Md5.secret));
map.put("relname", homegridentityvArrayList.get(position).getString10());
map.put("idcard", homegridentityvArrayList.get(position).getString11());
getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 200000 + position);
}
});
homeGridAdapterItemBinding.hu.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (homegridentityvArrayList.get(position).isString9()) return;
new XPopup.Builder(MyPropertyActivity.this).asInputConfirm("", "", "请输入户主姓名", new OnInputConfirmListener() {
@Override
public void onConfirm(String text) {
homegridentityvArrayList.get(position).setString10(text);
}
}).show();
}
});
homeGridAdapterItemBinding.shen.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (homegridentityvArrayList.get(position).isString9()) return;
new XPopup.Builder(MyPropertyActivity.this).asInputConfirm("", "", "请输入身份证号", new OnInputConfirmListener() {
@Override
public void onConfirm(String text) {
if (text.length() != 18) {
setToast("请输入正确的身份证号码");
} else {
homegridentityvArrayList.get(position).setString11(text);
}
}
}).show();
}
});
}
@@ -293,11 +354,11 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
mDataBinding.myaddress.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if(!adding){
if (!adding) {
adding = true;
homegridentityvArrayList.add(new SimpleEntity());
baseRecycleViewAdapterv.setData(homegridentityvArrayList);
}else {
} else {
setToast("您添加的信息尚未保存，请先保存信息");
}
@@ -306,7 +367,6 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
}
private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode) {
// progressDialog.setMessage(msg);
// progressDialog.setCancelable(false);
@@ -326,40 +386,52 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
ArrayList<LinkedTreeMap> adta = (ArrayList<LinkedTreeMap>) resultcode.data;
String s = gs.toJson(adta);
//final ArrayList<MyHomequEntity> list = null;
Type type = new TypeToken<ArrayList<MySimpleHomequEntity>>() {
Type type = new TypeToken<ArrayList<MyHouseEntity>>() {
}.getType();
final ArrayList<MySimpleHomequEntity> list = new Gson().fromJson(s, type);
final ArrayList<MyHouseEntity> list = new Gson().fromJson(s, type);
for (int i = 0; i < list.size(); i++) {
if (list.get(i).getAddress().contains("小区")) {
list.get(i).setAddress(list.get(i).getAddress().replace("小区", "小区 "));
}
if (list.get(i).getAddress().contains("楼")) {
list.get(i).setAddress(list.get(i).getAddress().replace("楼", "楼 "));
}
if (list.get(i).getAddress().contains("单元")) {
list.get(i).setAddress(list.get(i).getAddress().replace("单元", "单元 "));
}
String a[] = list.get(i).getAddress().split(" ");
// if (list.get(i).getAddress().contains("小区")) {
// list.get(i).setAddress(list.get(i).getAddress().replace("小区", "小区 "));
// }
// if (list.get(i).getAddress().contains("楼")) {
// list.get(i).setAddress(list.get(i).getAddress().replace("楼", "楼 "));
// }
// if (list.get(i).getAddress().contains("单元")) {
// list.get(i).setAddress(list.get(i).getAddress().replace("单元", "单元 "));
// }
// String a[] = list.get(i).getAddress().split(" ");
SimpleEntity simpleEntity = new SimpleEntity();
if (a.length == 4) {
simpleEntity.setString1(a[0]);
simpleEntity.setString2(a[1]);
simpleEntity.setString3(a[2]);
simpleEntity.setString4(a[3]);
simpleEntity.setString9(true);
simpleEntity.setString8(list.get(i).getUser_home_id());
homegridentityvArrayList.add(simpleEntity);
} else {
simpleEntity.setString4(a[0]);
simpleEntity.setString9(true);
simpleEntity.setString8(list.get(i).getUser_home_id());
homegridentityvArrayList.add(simpleEntity);
}
simpleEntity.setString1(list.get(i).getArea_name());
simpleEntity.setString2(list.get(i).getBuilding_name());
simpleEntity.setString3(list.get(i).getUnit_name());
simpleEntity.setString4(list.get(i).getHome_name());
simpleEntity.setString10(list.get(i).getRelname());
simpleEntity.setString11(list.get(i).getIdcard());
simpleEntity.setIs_verify(list.get(i).getIs_verify());
simpleEntity.setString8(list.get(i).getUser_home_id());
simpleEntity.setString9(true);
homegridentityvArrayList.add(simpleEntity);
// if (a.length == 4) {
//
// simpleEntity.setString1(a[0]);
// simpleEntity.setString2(a[1]);
// simpleEntity.setString3(a[2]);
// simpleEntity.setString4(a[3]);
// simpleEntity.setString10(list.get(i).getRelname());
// simpleEntity.setString11(list.get(i).getIdcard());
// simpleEntity.setString9(true);
// simpleEntity.setString8(list.get(i).getUser_home_id());
// homegridentityvArrayList.add(simpleEntity);
//
// } else {
//
// simpleEntity.setString4(a[0]);
//
// simpleEntity.setString9(true);
// simpleEntity.setString8(list.get(i).getUser_home_id());
// homegridentityvArrayList.add(simpleEntity);
//
// }
}
@@ -509,5 +581,4 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
}
}

17
app/src/main/java/entity/MySimpleHomequEntity.java
View File

@@ -16,7 +16,24 @@ public class MySimpleHomequEntity extends BaseObservable implements Serializable
private String address;
private String area;
private String Relname;
private String idcard;
public String getRelname() {
return Relname;
}
public void setRelname(String relname) {
Relname = relname;
}
public String getIdcard() {
return idcard;
}
public void setIdcard(String idcard) {
this.idcard = idcard;
}
public String getUser_home_id() {
return user_home_id;

48
app/src/main/java/entity/SimpleEntity.java
View File

@@ -2,10 +2,12 @@ package entity;
import android.databinding.BaseObservable;
import android.databinding.Bindable;
import com.sl.house_property.BR;
import java.io.Serializable;
public class SimpleEntity extends BaseObservable implements Serializable {
public class SimpleEntity extends BaseObservable implements Serializable {
private static final long serialVersionUID = 1L;
@Bindable
private String string7;
@@ -18,6 +20,15 @@ public class SimpleEntity extends BaseObservable implements Serializable {
this.string9 = string9;
notifyPropertyChanged(BR.string9);
}
private String is_verify;
public String getIs_verify() {
return is_verify;
}
public void setIs_verify(String is_verify) {
this.is_verify = is_verify;
}
@Bindable
private boolean string9;
@@ -41,17 +52,40 @@ public class SimpleEntity extends BaseObservable implements Serializable {
}
@Bindable
private String string8;
private String string8;
@Bindable
private String string1;
@Bindable
private String string2;
private String string2;
@Bindable
private String string3;
private String string3;
@Bindable
private String string4;
private String string4;
@Bindable
private String string5;
private String string5;
@Bindable
private String string10;
@Bindable
private String string11;
public String getString10() {
return string10;
}
public void setString10(String string10) {
this.string10 = string10;
notifyPropertyChanged(BR.string10);
}
public String getString11() {
return string11;
}
public void setString11(String string11) {
this.string11 = string11;
notifyPropertyChanged(BR.string11);
}
public String getString6() {
return string6;
@@ -63,7 +97,7 @@ public class SimpleEntity extends BaseObservable implements Serializable {
@Bindable
private String string6;
private String string6;
public String getString1() {
return string1;

1
app/src/main/res/layout/activity_entranceguard_control2.xml
View File

@@ -142,6 +142,7 @@
<!-- </RadioGroup>-->
<!-- </LinearLayout>-->
<LinearLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content">

103
app/src/main/res/layout/myhousrmessageitem.xml
View File

@@ -28,6 +28,12 @@
android:background="@drawable/my_property_item_top_background"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_weight="1"
android:layout_width="wrap_content"
android:orientation="horizontal"
android:layout_height="wrap_content">
<TextView
android:layout_width="0dp"
@@ -38,6 +44,16 @@
android:text="房屋信息"
android:textColor="#333333"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_yz"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_centerVertical="true"
android:layout_marginLeft="15dip"
android:textColor="#333333"
android:textSize="14sp" />
</LinearLayout>
<ImageView
android:id="@+id/delete"
@@ -224,6 +240,93 @@
android:paddingBottom="7dp"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip"
android:background="@color/lighteeeeee" />
<LinearLayout
android:id="@+id/ll_h"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="15dip"
android:layout_marginEnd="15dip"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="户主姓名"
android:textColor="#333333"
android:textSize="16sp" />
<TextView
android:id="@+id/hu"
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_marginLeft="20dip"
android:layout_weight="1"
android:background="@null"
android:hint="请输入户主姓名"
android:text="@{myentity.string10}"
android:textColor="#333333"
android:textSize="16sp" />
<ImageView
android:layout_width="8dp"
android:layout_height="14dp"
android:layout_marginLeft="20dip"
android:layout_gravity="center_vertical"
android:background="@mipmap/returnme"
android:paddingBottom="7dp"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip"
android:background="@color/lighteeeeee" />
<LinearLayout
android:id="@+id/ll_s"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="15dip"
android:layout_marginEnd="15dip"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="身份证号"
android:textColor="#333333"
android:textSize="16sp" />
<TextView
android:id="@+id/shen"
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_marginLeft="20dip"
android:layout_weight="1"
android:background="@null"
android:hint="请输入身份证号"
android:text="@{myentity.string11}"
android:textColor="#333333"
android:textSize="16sp" />
<ImageView
android:layout_width="8dp"
android:layout_height="14dp"
android:layout_marginLeft="20dip"
android:layout_gravity="center_vertical"
android:background="@mipmap/returnme"
android:paddingBottom="7dp"/>
</LinearLayout>
</LinearLayout>
</layout>