From 20c67ce39724ef22baf2b25f05d3508b64e648ae Mon Sep 17 00:00:00 2001 From: jianbo <263303411@qq.com> Date: Mon, 8 Mar 2021 15:36:55 +0800 Subject: [PATCH] d --- .../user/MyAuthorizedFamilyHistory.java | 15 ++++- .../user/MyPropertyActivity.java | 64 +++++-------------- app/src/main/java/entity/SimpleEntity.java | 11 ++++ .../res/layout/familynumberpermission.xml | 2 +- 4 files changed, 41 insertions(+), 51 deletions(-) diff --git a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java index 488ba62..092a44d 100644 --- a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java +++ b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java @@ -245,12 +245,23 @@ public class MyAuthorizedFamilyHistory extends BaseActivity= simpleEntities.size())) { final FamilynumberpermissionBinding homeGridAdapterItemBinding = (FamilynumberpermissionBinding) b; - simpleEntities.get(position).setString12(position+1+""); + + if(position==0){ + simpleEntities.get(position).setString14("户主"); + simpleEntities.get(position).setString12(""); + }else { + simpleEntities.get(position).setString14("家庭成员"); + simpleEntities.get(position).setString12(position+""); + } + homeGridAdapterItemBinding.setMyentity(simpleEntities.get(position)); homeGridAdapterItemBinding.edit.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - DelFamilyMember(simpleEntities.get(position).getString3()); + if(position>0){ + DelFamilyMember(simpleEntities.get(position).getString3());}else { + setToast("户主不能删除自己"); + } } }); } diff --git a/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java b/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java index 11e6a6b..9db6cea 100644 --- a/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java +++ b/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java @@ -10,13 +10,10 @@ import android.view.View; import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; import com.google.gson.reflect.TypeToken; -import com.lljjcoder.style.citylist.Toast.ToastUtils; 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.DoConfig; -import com.sl.house_property.LoginActivity; import com.sl.house_property.MyHouseEntity; import com.sl.house_property.R; import com.sl.house_property.databinding.ActivityMyPropertyBinding; @@ -39,7 +36,6 @@ import rx.Subscription; import rx.functions.Action1; import tools.Config; import utils.Md5; -import utils.SPUtils; import static android.view.View.VISIBLE; @@ -103,15 +99,19 @@ public class MyPropertyActivity extends BaseActivity } else { homeGridAdapterItemBinding.llS.setVisibility(VISIBLE); } + // MyHouseList 返回了一个 is_verify 参数，1.是已通过 2.是未通过 0.是待验证 + if (homegridentityvArrayList.get(position).getIs_verify() != null) { if (homegridentityvArrayList.get(position).getIs_verify().equals("0")) { - homeGridAdapterItemBinding.tvYz.setText("未验证"); - } else { - homeGridAdapterItemBinding.tvYz.setText("已验证"); + homeGridAdapterItemBinding.tvYz.setText("待验证"); + } else if(homegridentityvArrayList.get(position).getIs_verify().equals("1")){ + homeGridAdapterItemBinding.tvYz.setText("已通过"); + }else { + homeGridAdapterItemBinding.tvYz.setText("未通过"); } }else { - homeGridAdapterItemBinding.tvYz.setText("未验证"); + homeGridAdapterItemBinding.tvYz.setText(""); } if (homegridentityvArrayList.get(position).isString9()){ homeGridAdapterItemBinding.tvFamily.setVisibility(VISIBLE); @@ -140,7 +140,8 @@ public class MyPropertyActivity extends BaseActivity public void onClick(View view) { if (homegridentityvArrayList.get(position).getIs_verify() != null) { - if (homegridentityvArrayList.get(position).getIs_verify().equals("0")) { + + if (homegridentityvArrayList.get(position).getIs_verify().equals("0")||homegridentityvArrayList.get(position).getIs_verify().equals("2")) { RegisterUser user = Config.getInstance(MyPropertyActivity.this).getUser(); Map map = new HashMap<>(); @@ -169,38 +170,9 @@ public class MyPropertyActivity extends BaseActivity getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 100000 + position); } else { - setToast(2, "已验证房产无法删除如需帮助请联系物业"); + setToast("已验证通过的不允许删除"); } - }else { - RegisterUser user = - Config.getInstance(MyPropertyActivity.this).getUser(); - Map map = new HashMap<>(); - if (user != null) { - map.put("userid", user.getUserid()); - } else { - map.put("userid", 0 + ""); - } - map.put("app", "Cas"); - map.put("class", "DelMyHouse"); - if (homegridentityvArrayList.get(position).getString8() == null || homegridentityvArrayList.get(position).getString8().equals("")) { - homegridentityvArrayList.remove(position); - baseRecycleViewAdapterv.setData(homegridentityvArrayList); - adding = false; - return; - } - if (homegridentityvArrayList.get(position).isString9() == false) { - homegridentityvArrayList.remove(position); - baseRecycleViewAdapterv.setData(homegridentityvArrayList); - 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); - } - } }); homeGridAdapterItemBinding.qu.setOnClickListener(new View.OnClickListener() { @@ -482,14 +454,17 @@ public class MyPropertyActivity extends BaseActivity mDataBinding.myaddress.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { + Log.e("dsfsdfdsfs",adding+""); if (!adding) { adding = true; homegridentityvArrayList.add(new SimpleEntity()); baseRecycleViewAdapterv.setData(homegridentityvArrayList); +// int size = homegridentityvArrayList.size(); +// Log.e("dsfsdfsdfs",size+""); +// mDataBinding.recyView.scrollToPosition(size+2); // 将ListView定位到最后一行 } else { setToast("您添加的信息尚未保存，请先保存信息"); } - } }); } @@ -563,14 +538,6 @@ public class MyPropertyActivity extends BaseActivity Type type = new TypeToken>() { }.getType(); final ArrayList list = new Gson().fromJson(s, type); - if(list.size()==0){ - SPUtils.setSP(MyPropertyActivity.this, DoConfig.FANGCHAN_DATA, "0"); - Log.e("fuzhi","0"); - }else { - SPUtils.setSP(MyPropertyActivity.this, DoConfig.FANGCHAN_DATA, "1"); - Log.e("fuzhi","1"); - - } for (int i = 0; i < list.size(); i++) { // if (list.get(i).getAddress().contains("小区")) { // list.get(i).setAddress(list.get(i).getAddress().replace("小区", "小区 ")); @@ -742,6 +709,7 @@ public class MyPropertyActivity extends BaseActivity homegridentityvArrayList.remove(requstecode - 100000); } if (requstecode >= 200000) { + adding=false; homegridentityvArrayList.get(requstecode - 200000).setString9(true); } diff --git a/app/src/main/java/entity/SimpleEntity.java b/app/src/main/java/entity/SimpleEntity.java index d03f566..0a40385 100644 --- a/app/src/main/java/entity/SimpleEntity.java +++ b/app/src/main/java/entity/SimpleEntity.java @@ -56,6 +56,17 @@ public class SimpleEntity extends BaseObservable implements Serializable { @Bindable private String string1; + public String getString14() { + return string14; + } + + public void setString14(String string14) { + this.string14 = string14; + notifyPropertyChanged(BR.string12); + } + + @Bindable + private String string14; public String getString12() { return string12; } diff --git a/app/src/main/res/layout/familynumberpermission.xml b/app/src/main/res/layout/familynumberpermission.xml index c6ab397..fd3dd64 100644 --- a/app/src/main/res/layout/familynumberpermission.xml +++ b/app/src/main/res/layout/familynumberpermission.xml @@ -36,7 +36,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_vertical" - android:text="家庭成员" + android:text="@{myentity.string14}" android:textColor="#333333" android:textSize="19sp" />