From 60fdeb3488be5242705a2b652e58b9555550c1ce Mon Sep 17 00:00:00 2001 From: jinyuera <454386664@qq.com> Date: Fri, 26 Feb 2021 16:29:42 +0800 Subject: [PATCH 1/5] 1111 --- .../com/sl/house_property/MainFragment.java | 2 +- .../house_property/user/AddFamilyDialog.java | 11 ++- .../user/MyAuthorizedFamilyHistory.java | 8 +- .../user/MyPropertyActivity.java | 85 ++++++++++++++++--- app/src/main/res/layout/dialog_add_family.xml | 13 +++ .../main/res/layout/myhousrmessageitem.xml | 5 +- 6 files changed, 102 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/sl/house_property/MainFragment.java b/app/src/main/java/com/sl/house_property/MainFragment.java index 4e6c045..f6a790a 100644 --- a/app/src/main/java/com/sl/house_property/MainFragment.java +++ b/app/src/main/java/com/sl/house_property/MainFragment.java @@ -267,7 +267,7 @@ public class MainFragment extends BaseFragment implements V // progressDialog.setMessage(getActivity().getString(R.string.loading)); progressDialog = new ProgressDialog(getContext()); intRecycleView(); - //getGankList(ApiConfig.GETHOMEBANNER,new HashMap(),getString(R.string.loading),0); + // getGankList(ApiConfig.GETHOMEBANNER,new HashMap(),getString(R.string.loading),0); mDataBinding.taobaoRefreshLayout.setOnRefreshLoadMoreListener(onrefalshlister); // mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() { // @Override diff --git a/app/src/main/java/com/sl/house_property/user/AddFamilyDialog.java b/app/src/main/java/com/sl/house_property/user/AddFamilyDialog.java index 11387b7..fdb38a2 100644 --- a/app/src/main/java/com/sl/house_property/user/AddFamilyDialog.java +++ b/app/src/main/java/com/sl/house_property/user/AddFamilyDialog.java @@ -14,6 +14,7 @@ public class AddFamilyDialog extends CenterPopupView { private OnAddFamilyListener listener; private EditText etPhone; + private EditText etName; public AddFamilyDialog(@NonNull Context context, OnAddFamilyListener listener) { super(context); @@ -29,16 +30,22 @@ public class AddFamilyDialog extends CenterPopupView { protected void onCreate() { super.onCreate(); etPhone = findViewById(R.id.et_input); + etName = findViewById(R.id.et_name); findViewById(R.id.btn_submit).setOnClickListener(new OnClickListener() { @Override public void onClick(View view) { + String name = etName.getText().toString().trim(); String phone = etPhone.getText().toString().trim(); + if (TextUtils.isEmpty(name)){ + Toast.makeText(getContext(),"请输入家属姓名",Toast.LENGTH_SHORT).show(); + return; + } if (TextUtils.isEmpty(phone)||phone.length()!=11){ Toast.makeText(getContext(),"请输入正确手机号",Toast.LENGTH_SHORT).show(); return; } if (listener!=null){ - listener.click(phone); + listener.click(phone,name); dismiss(); } @@ -53,6 +60,6 @@ public class AddFamilyDialog extends CenterPopupView { } interface OnAddFamilyListener{ - void click(String phone); + void click(String phone,String username); } } 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 4c98840..c7d24b8 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 @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.app.ProgressDialog; import android.content.Intent; import android.os.Bundle; +import android.text.TextUtils; import android.view.Gravity; import android.view.View; import android.widget.Toast; @@ -95,7 +96,7 @@ public class MyAuthorizedFamilyHistory extends BaseActivity homeGridAdapterItemBinding.tvYz.setText("已验证"); } } - + if (homegridentityvArrayList.get(position).isString9()){ + homeGridAdapterItemBinding.tvFamily.setVisibility(VISIBLE); + }else { + homeGridAdapterItemBinding.tvFamily.setVisibility(View.GONE); + } homeGridAdapterItemBinding.tvFamily.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { AddFamilyDialog addFamilyDialog = new AddFamilyDialog(MyPropertyActivity.this, new AddFamilyDialog.OnAddFamilyListener() { @Override - public void click(String phone) { - addFamily(phone); + public void click(String phone,String username) { + addFamily(phone, homegridentityvArrayList.get(position).getString8(),username); } }); new XPopup.Builder(MyPropertyActivity.this).asCustom(addFamilyDialog).show(); @@ -154,7 +159,13 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.qu.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (homegridentityvArrayList.get(position).isString9()) return; + if (homegridentityvArrayList.get(position).isString9()){ + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + intent.putExtra("usertitile", "授权家庭"); + intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); + startActivityForResult(intent, 0); + return; + } RegisterUser user = Config.getInstance(MyPropertyActivity.this).getUser(); Map map = new HashMap<>(); @@ -173,7 +184,13 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.lou.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (homegridentityvArrayList.get(position).isString9()) return; + if (homegridentityvArrayList.get(position).isString9()){ + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + intent.putExtra("usertitile", "授权家庭"); + intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); + startActivityForResult(intent, 0); + return; + } if (homegridentityvArrayList.get(position).getString5() == null || homegridentityvArrayList.get(position).getString5().equals("")) { setToast("请选择小区"); @@ -200,8 +217,13 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.dan.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (homegridentityvArrayList.get(position).isString9()) return; - + if (homegridentityvArrayList.get(position).isString9()){ + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + intent.putExtra("usertitile", "授权家庭"); + intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); + startActivityForResult(intent, 0); + return; + } if (homegridentityvArrayList.get(position).getString5() == null || homegridentityvArrayList.get(position).getString5().equals("")) { setToast("请选择小区"); @@ -233,7 +255,13 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.fang.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (homegridentityvArrayList.get(position).isString9()) return; + if (homegridentityvArrayList.get(position).isString9()){ + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + intent.putExtra("usertitile", "授权家庭"); + intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); + startActivityForResult(intent, 0); + return; + } if (homegridentityvArrayList.get(position).getString5() == null || homegridentityvArrayList.get(position).getString5().equals("")) { @@ -274,7 +302,13 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.xie.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (homegridentityvArrayList.get(position).isString9()) return; + if (homegridentityvArrayList.get(position).isString9()){ + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + intent.putExtra("usertitile", "授权家庭"); + intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); + startActivityForResult(intent, 0); + return; + } RegisterUser user = Config.getInstance(MyPropertyActivity.this).getUser(); @@ -328,7 +362,13 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.hu.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (homegridentityvArrayList.get(position).isString9()) return; + if (homegridentityvArrayList.get(position).isString9()){ + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + intent.putExtra("usertitile", "授权家庭"); + intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); + startActivityForResult(intent, 0); + return; + } new XPopup.Builder(MyPropertyActivity.this).asInputConfirm("", "", "请输入户主姓名", new OnInputConfirmListener() { @Override public void onConfirm(String text) { @@ -340,7 +380,13 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.shen.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (homegridentityvArrayList.get(position).isString9()) return; + if (homegridentityvArrayList.get(position).isString9()){ + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + intent.putExtra("usertitile", "授权家庭"); + intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); + startActivityForResult(intent, 0); + return; + } new XPopup.Builder(MyPropertyActivity.this).asInputConfirm("", "", "请输入身份证号", new OnInputConfirmListener() { @Override public void onConfirm(String text) { @@ -359,7 +405,19 @@ public class MyPropertyActivity extends BaseActivity } }); + baseRecycleViewAdapterv.setOnItemClickListener(new BaseRecycleViewAdapter.OnItemClickListener() { + @Override + public void onItemClick(View itemView, int position) { + if (homegridentityvArrayList.get(position).isString9()){ + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + intent.putExtra("usertitile", "授权家庭"); + intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); + startActivityForResult(intent, 0); + } + + } + }); mDataBinding.recyView.setAdapter(baseRecycleViewAdapterv); baseRecycleViewAdapterv.setData(homegridentityvArrayList); mDataBinding.myaddress.setOnClickListener(new View.OnClickListener() { @@ -377,7 +435,7 @@ public class MyPropertyActivity extends BaseActivity }); } - private void addFamily(String phone) { + private void addFamily(String phone,String homeId,String uername) { mGankLoader = new Loader(); final RegisterUser user = Config.getInstance(MyPropertyActivity.this).getUser(); @@ -389,8 +447,9 @@ public class MyPropertyActivity extends BaseActivity } map.put("app", "Cas"); map.put("class", "AddFamilyMember"); + map.put("home_id", homeId); map.put("phone", phone); - map.put("username", "家庭成员"); + map.put("username", uername); map.put("sign", Md5.md5("Cas" + "AddFamilyMember" + Md5.secret)); mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1() { @Override diff --git a/app/src/main/res/layout/dialog_add_family.xml b/app/src/main/res/layout/dialog_add_family.xml index 5c3fd73..99a270b 100644 --- a/app/src/main/res/layout/dialog_add_family.xml +++ b/app/src/main/res/layout/dialog_add_family.xml @@ -30,6 +30,19 @@ + - + Date: Sat, 27 Feb 2021 23:06:16 +0800 Subject: [PATCH 2/5] d --- app/src/main/AndroidManifest.xml | 1 + .../user/MyAuthorizedFamilyHistoryt.java | 266 ++++++++++++++++++ .../user/MyPropertyActivity.java | 16 +- app/src/main/java/entity/SimpleEntity.java | 12 + ...activity_my_authorized_family_historyt.xml | 66 +++++ .../res/layout/familynumberpermissionn.xml | 87 ++++++ 6 files changed, 440 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistoryt.java create mode 100644 app/src/main/res/layout/activity_my_authorized_family_historyt.xml create mode 100644 app/src/main/res/layout/familynumberpermissionn.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 562f90c..b978ce8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -162,6 +162,7 @@ + diff --git a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistoryt.java b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistoryt.java new file mode 100644 index 0000000..f3a01b4 --- /dev/null +++ b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistoryt.java @@ -0,0 +1,266 @@ +package com.sl.house_property.user; + +import android.annotation.SuppressLint; +import android.app.ProgressDialog; +import android.content.Intent; +import android.os.Bundle; +import android.text.TextUtils; +import android.view.View; + +import com.dalong.refreshlayout.OnRefreshListener; +import com.google.gson.Gson; +import com.google.gson.internal.LinkedTreeMap; +import com.google.gson.reflect.TypeToken; +import com.sl.house_property.BaseActivity; +import com.sl.house_property.R; +import com.sl.house_property.databinding.ActivityMyAuthorizedFamilyHistoryBinding; +import com.sl.house_property.databinding.ActivityMyAuthorizedFamilyHistorytBinding; +import com.sl.house_property.databinding.FamilynumberpermissionBinding; +import com.sl.house_property.databinding.FamilynumberpermissionnBinding; + +import org.json.JSONArray; +import org.json.JSONException; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import adapter.BaseRecycleViewAdapter; +import entity.MyfamilySimpleEntity; +import entity.RegisterUser; +import entity.SimpleEntity; +import http.ApiConfig; +import my_loader.Loader; +import my_loader.Resultcode; +import my_view.tao_bao_refresh.FullyGridLayoutManager; +import rx.Subscription; +import rx.functions.Action1; +import tools.Config; +import utils.Md5; + +public class MyAuthorizedFamilyHistoryt extends BaseActivity { + + private Loader mGankLoader; + + @Override + protected int getLayoutResId() { + return R.layout.activity_my_authorized_family_historyt; + } + + private ProgressDialog progressDialog; + private OnRefreshListener onrefalshlister = new OnRefreshListener() { + @Override + public void onRefresh() { + getlist(); + //getGankList(ApiConfig.GETHOMEBANNER,new HashMap(),getString(R.string.loading),0); + mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() { + @Override + public void run() { + mDataBinding.taobaoRefreshLayout.stopRefresh(true); + } + }, 2000); + + } + + @Override + public void onLoadMore() { + //addRecycleVerization(); + getlist(); + mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() { + @Override + public void run() { + mDataBinding.taobaoRefreshLayout.stopLoadMore(true); + } + }, 3000); + + } + }; + private ArrayList simpleEntities; + private BaseRecycleViewAdapter baseRecycleViewAdapter; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + String usertitile = getIntent().getStringExtra("usertitile"); + setAbr(usertitile, new View.OnClickListener() { + @Override + public void onClick(View view) { + finish(); + } + }, R.mipmap.zengjia, new View.OnClickListener() { + @Override + public void onClick(View view) { +// Intent intet = new Intent(MyAuthorizedFamilyHistoryt.this, AddAnewFamilyNumberPermissionActivity.class); +// startActivity(intet); + } + }, 0, null, 0, + null, ""); + homeId=getIntent().getStringExtra("homeId"); + progressDialog = new ProgressDialog(this); +// progressDialog.show(); +// progressDialog.setMessage(getString(R.string.loading)); + intRecycleVerization(); + //getGankList(ApiConfig.GETHOMEBANNER,new HashMap(),getString(R.string.loading),0); + mDataBinding.taobaoRefreshLayout.setOnRefreshListener(onrefalshlister); + mDataBinding.taobaoRefreshLayout.setAutoRefresh(true); + +// getlist(); + + + } + private String homeId=""; + private void getlist() { + RegisterUser user = + Config.getInstance(MyAuthorizedFamilyHistoryt.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", "FamilyMemberList"); + if (!TextUtils.isEmpty(homeId)){ + map.put("home_id",homeId); + } + + map.put("sign", Md5.md5("Cas" + "FamilyMemberList" + Md5.secret)); + getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.loading), 0); + + } + + + private void getGankList(String myurl, Map map, String msg, final int requstecode) { +// progressDialog.setMessage(msg); +// progressDialog.setCancelable(false); +// progressDialog.show(); + + mGankLoader = new Loader(); + Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1() { + + + @Override + public void call(Resultcode resultcode) { + progressDialog.dismiss(); + mDataBinding.taobaoRefreshLayout.stopRefresh(true); + mDataBinding.taobaoRefreshLayout.stopLoadMore(true); + if (!(resultcode.status == 0)) { + setToast( resultcode.msg); + } + if (resultcode.status == 0) { + if (requstecode == 0) { + Gson gs = new Gson(); + ArrayList adta = (ArrayList) resultcode.data; + String s = gs.toJson(adta); + ArrayList list = null; + try { + JSONArray jsonObject = new JSONArray(s); + + Type type = new TypeToken>() { + }.getType(); + list = new Gson().fromJson(jsonObject.toString(), type); + simplelist(list); + if(list.size()<=0){ + if(page==1){ + mDataBinding.content.setVisibility(View.GONE); + mDataBinding.noDate.setVisibility(View.VISIBLE); + }else { + setToast(getString(R.string.no_more_data)); + } + + }else { + mDataBinding.content.setVisibility(View.VISIBLE); + mDataBinding.noDate.setVisibility(View.GONE); + page = page+1; + } + + } catch (JSONException e) { + e.printStackTrace(); + } + } + } + + } + + + }, new Action1() { + @Override + public void call(Throwable throwable) { + progressDialog.dismiss(); + + setToast( getString(R.string.getdatafailure)); + throwable.printStackTrace(); + } + }); + + addSubscription(subscription); + } + + private void simplelist(ArrayList list) { + + ArrayList mysiplentity = new ArrayList(); + for (int i = 0; i < list.size(); i++) { + SimpleEntity mysiplent = new SimpleEntity(); + mysiplent.setString1(list.get(i).getMember_name()); + mysiplent.setString2(list.get(i).getPhone()); + mysiplent.setString3(list.get(i).getF_id()); + + + mysiplentity.add(mysiplent); + + } + simpleEntities = mysiplentity; + baseRecycleViewAdapter.setData(mysiplentity); + } + + + private void intRecycleVerization() { + simpleEntities = new ArrayList(); + + final FullyGridLayoutManager mgr = new FullyGridLayoutManager(this, 1); + mgr.setOrientation(FullyGridLayoutManager.VERTICAL); + mgr.setSmoothScrollbarEnabled(true); + mDataBinding.recyView.setLayoutManager(mgr); + baseRecycleViewAdapter = new BaseRecycleViewAdapter(this, R.layout.familynumberpermissionn); + simpleEntities = new ArrayList<>(); + baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() { + @SuppressLint("ClickableViewAccessibility") + @Override + public void onBindViewHolder(Object b, final int position) { + if (!(position >= simpleEntities.size())) { + final FamilynumberpermissionnBinding homeGridAdapterItemBinding = (FamilynumberpermissionnBinding) b; + simpleEntities.get(position).setString12(position+1+""); + homeGridAdapterItemBinding.setMyentity(simpleEntities.get(position)); + homeGridAdapterItemBinding.edit.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { +// Intent intet = new Intent(MyAuthorizedFamilyHistoryt.this, AddAnewFamilyNumberPermissionActivity.class); +// intet.putExtra("stringentity", simpleEntities.get(position)); +// startActivityForResult(intet,1); + } + }); + } + + } + }); + + + mDataBinding.recyView.setAdapter(baseRecycleViewAdapter); + baseRecycleViewAdapter.setData(simpleEntities); + + + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if(resultCode==100){ + mDataBinding.taobaoRefreshLayout.setAutoRefresh(true); + } + } + + +} + + 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 214b9c6..f87b115 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 @@ -160,7 +160,7 @@ public class MyPropertyActivity extends BaseActivity @Override public void onClick(View view) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); @@ -185,7 +185,7 @@ public class MyPropertyActivity extends BaseActivity @Override public void onClick(View view) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); @@ -218,7 +218,7 @@ public class MyPropertyActivity extends BaseActivity @Override public void onClick(View view) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); @@ -256,7 +256,7 @@ public class MyPropertyActivity extends BaseActivity @Override public void onClick(View view) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); @@ -303,7 +303,7 @@ public class MyPropertyActivity extends BaseActivity @Override public void onClick(View view) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); @@ -363,7 +363,7 @@ public class MyPropertyActivity extends BaseActivity @Override public void onClick(View v) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); @@ -381,7 +381,7 @@ public class MyPropertyActivity extends BaseActivity @Override public void onClick(View v) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); @@ -410,7 +410,7 @@ public class MyPropertyActivity extends BaseActivity public void onItemClick(View itemView, int position) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); diff --git a/app/src/main/java/entity/SimpleEntity.java b/app/src/main/java/entity/SimpleEntity.java index 5400b98..0c77916 100644 --- a/app/src/main/java/entity/SimpleEntity.java +++ b/app/src/main/java/entity/SimpleEntity.java @@ -55,6 +55,18 @@ public class SimpleEntity extends BaseObservable implements Serializable { private String string8; @Bindable private String string1; + + public String getString12() { + return string12; + } + + public void setString12(String string12) { + this.string12 = string12; + notifyPropertyChanged(BR.string10); + } + + @Bindable + private String string12; @Bindable private String string2; @Bindable diff --git a/app/src/main/res/layout/activity_my_authorized_family_historyt.xml b/app/src/main/res/layout/activity_my_authorized_family_historyt.xml new file mode 100644 index 0000000..6a55d31 --- /dev/null +++ b/app/src/main/res/layout/activity_my_authorized_family_historyt.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/familynumberpermissionn.xml b/app/src/main/res/layout/familynumberpermissionn.xml new file mode 100644 index 0000000..033bb7f --- /dev/null +++ b/app/src/main/res/layout/familynumberpermissionn.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 665f8d8d893aef989fa7523b5140af75ae95b6ce Mon Sep 17 00:00:00 2001 From: renjianbo0118 <18133922183> Date: Sun, 28 Feb 2021 01:30:13 +0800 Subject: [PATCH 3/5] d --- .../user/MyPropertyActivity.java | 122 ++++++++++-------- .../main/res/layout/myhousrmessageitem.xml | 45 +++++++ 2 files changed, 112 insertions(+), 55 deletions(-) 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 f87b115..9d9f042 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 @@ -159,13 +159,13 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.qu.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); - intent.putExtra("usertitile", "授权家庭"); - intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); - startActivityForResult(intent, 0); - return; - } +// if (homegridentityvArrayList.get(position).isString9()){ +// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); +// intent.putExtra("usertitile", "授权家庭"); +// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); +// startActivityForResult(intent, 0); +// return; +// } RegisterUser user = Config.getInstance(MyPropertyActivity.this).getUser(); Map map = new HashMap<>(); @@ -184,13 +184,13 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.lou.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); - intent.putExtra("usertitile", "授权家庭"); - intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); - startActivityForResult(intent, 0); - return; - } +// if (homegridentityvArrayList.get(position).isString9()){ +// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); +// intent.putExtra("usertitile", "授权家庭"); +// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); +// startActivityForResult(intent, 0); +// return; +// } if (homegridentityvArrayList.get(position).getString5() == null || homegridentityvArrayList.get(position).getString5().equals("")) { setToast("请选择小区"); @@ -217,13 +217,13 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.dan.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); - intent.putExtra("usertitile", "授权家庭"); - intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); - startActivityForResult(intent, 0); - return; - } +// if (homegridentityvArrayList.get(position).isString9()){ +// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); +// intent.putExtra("usertitile", "授权家庭"); +// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); +// startActivityForResult(intent, 0); +// return; +// } if (homegridentityvArrayList.get(position).getString5() == null || homegridentityvArrayList.get(position).getString5().equals("")) { setToast("请选择小区"); @@ -255,13 +255,13 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.fang.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); - intent.putExtra("usertitile", "授权家庭"); - intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); - startActivityForResult(intent, 0); - return; - } +// if (homegridentityvArrayList.get(position).isString9()){ +// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); +// intent.putExtra("usertitile", "授权家庭"); +// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); +// startActivityForResult(intent, 0); +// return; +// } if (homegridentityvArrayList.get(position).getString5() == null || homegridentityvArrayList.get(position).getString5().equals("")) { @@ -302,13 +302,13 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.xie.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); - intent.putExtra("usertitile", "授权家庭"); - intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); - startActivityForResult(intent, 0); - return; - } +// if (homegridentityvArrayList.get(position).isString9()){ +// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); +// intent.putExtra("usertitile", "授权家庭"); +// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); +// startActivityForResult(intent, 0); +// return; +// } RegisterUser user = Config.getInstance(MyPropertyActivity.this).getUser(); @@ -362,13 +362,13 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.hu.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); - intent.putExtra("usertitile", "授权家庭"); - intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); - startActivityForResult(intent, 0); - return; - } +// if (homegridentityvArrayList.get(position).isString9()){ +// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); +// intent.putExtra("usertitile", "授权家庭"); +// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); +// startActivityForResult(intent, 0); +// return; +// } new XPopup.Builder(MyPropertyActivity.this).asInputConfirm("", "", "请输入户主姓名", new OnInputConfirmListener() { @Override public void onConfirm(String text) { @@ -380,13 +380,13 @@ public class MyPropertyActivity extends BaseActivity homeGridAdapterItemBinding.shen.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); - intent.putExtra("usertitile", "授权家庭"); - intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); - startActivityForResult(intent, 0); - return; - } +// if (homegridentityvArrayList.get(position).isString9()){ +// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); +// intent.putExtra("usertitile", "授权家庭"); +// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); +// startActivityForResult(intent, 0); +// return; +// } new XPopup.Builder(MyPropertyActivity.this).asInputConfirm("", "", "请输入身份证号", new OnInputConfirmListener() { @Override public void onConfirm(String text) { @@ -401,6 +401,18 @@ public class MyPropertyActivity extends BaseActivity } }); + homeGridAdapterItemBinding.llJt.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (homegridentityvArrayList.get(position).isString9()){ + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); + intent.putExtra("usertitile", "授权家庭"); + intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); + startActivityForResult(intent, 0); + return; + } + } + }); } } @@ -409,12 +421,12 @@ public class MyPropertyActivity extends BaseActivity @Override public void onItemClick(View itemView, int position) { - if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); - intent.putExtra("usertitile", "授权家庭"); - intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); - startActivityForResult(intent, 0); - } +// if (homegridentityvArrayList.get(position).isString9()){ +// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); +// intent.putExtra("usertitile", "授权家庭"); +// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); +// startActivityForResult(intent, 0); +// } } }); diff --git a/app/src/main/res/layout/myhousrmessageitem.xml b/app/src/main/res/layout/myhousrmessageitem.xml index 3c74d60..edf8774 100644 --- a/app/src/main/res/layout/myhousrmessageitem.xml +++ b/app/src/main/res/layout/myhousrmessageitem.xml @@ -329,6 +329,51 @@ android:paddingBottom="7dp"/> + + + + + + + + + + + Date: Sun, 28 Feb 2021 19:36:01 +0800 Subject: [PATCH 4/5] 1111 --- .../com/sl/house_property/Main4Fragment.java | 6 +- .../sl/house_property/MainTabActivity.java | 20 +- .../user/MyAuthorizedFamilyHistory.java | 108 ++++--- .../user/MyAuthorizedFamilyHistoryt.java | 266 ------------------ .../user/MyPropertyActivity.java | 40 +-- app/src/main/res/layout/activity_main_tab.xml | 2 + .../activity_my_authorized_family_history.xml | 22 +- app/src/main/res/layout/fragment_main4.xml | 174 +++++++++++- 8 files changed, 281 insertions(+), 357 deletions(-) delete mode 100644 app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistoryt.java 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 286c383..77b9e3d 100644 --- a/app/src/main/java/com/sl/house_property/Main4Fragment.java +++ b/app/src/main/java/com/sl/house_property/Main4Fragment.java @@ -91,7 +91,7 @@ public class Main4Fragment extends BaseFragment implements protected void onCreateVew(LayoutInflater inflater, Bundle savedInstanceState) { super.onCreateVew(inflater, savedInstanceState); baseActivity = (BaseActivity) getActivity(); - mDataBinding.setting.setOnClickListener(new View.OnClickListener() { + mDataBinding.ll4.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { Intent intent = new Intent(getActivity(), SettingActivity.class); @@ -177,7 +177,7 @@ public class Main4Fragment extends BaseFragment implements startActivityForResult(intent, 0); } }); - mDataBinding.llFangchan.setOnClickListener(new View.OnClickListener() { + mDataBinding.ll2.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Intent intent = new Intent(getActivity(), MyPropertyActivity.class); @@ -195,7 +195,7 @@ public class Main4Fragment extends BaseFragment implements } }); - mDataBinding.llRenxiang.setOnClickListener(new View.OnClickListener() { + mDataBinding.ll3.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { //弹出激活对话框 diff --git a/app/src/main/java/com/sl/house_property/MainTabActivity.java b/app/src/main/java/com/sl/house_property/MainTabActivity.java index 67983de..fc29f62 100644 --- a/app/src/main/java/com/sl/house_property/MainTabActivity.java +++ b/app/src/main/java/com/sl/house_property/MainTabActivity.java @@ -44,7 +44,7 @@ public class MainTabActivity extends BaseActivity private Main3Fragment fragment2; private CartFragment fragment3; private Main4Fragment fragment4; - private LikeFragment likeFragment; + // private LikeFragment likeFragment; private Fragment currentFragment; private int myeditcode = 1000; @@ -201,15 +201,15 @@ public class MainTabActivity extends BaseActivity } currentFragment = fragment4; break; - case R.id.like: - if (likeFragment == null) { - likeFragment = LikeFragment.newInstance(); - fragmentTransaction.add(R.id.mycontent, likeFragment, "likeFragment"); - } else { - fragmentTransaction.show(likeFragment); - } - currentFragment = likeFragment; - break; +// case R.id.like: +// if (likeFragment == null) { +// likeFragment = LikeFragment.newInstance(); +// fragmentTransaction.add(R.id.mycontent, likeFragment, "likeFragment"); +// } else { +// fragmentTransaction.show(likeFragment); +// } +// currentFragment = likeFragment; +// break; } try { fragmentTransaction.commit(); 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 c7d24b8..0a3bc6d 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 @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.app.ProgressDialog; import android.content.Intent; import android.os.Bundle; +import android.support.annotation.NonNull; import android.text.TextUtils; import android.view.Gravity; import android.view.View; @@ -13,6 +14,8 @@ import com.dalong.refreshlayout.OnRefreshListener; import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; import com.google.gson.reflect.TypeToken; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; import com.sl.house_property.BaseActivity; import com.sl.house_property.R; import com.sl.house_property.databinding.ActivityMyAuthorizedFamilyHistoryBinding; @@ -49,33 +52,33 @@ public class MyAuthorizedFamilyHistory extends BaseActivity(),getString(R.string.loading),0); - mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() { - @Override - public void run() { - mDataBinding.taobaoRefreshLayout.stopRefresh(true); - } - }, 2000); - - } - - @Override - public void onLoadMore() { - //addRecycleVerization(); - getlist(); - mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() { - @Override - public void run() { - mDataBinding.taobaoRefreshLayout.stopLoadMore(true); - } - }, 3000); - - } - }; +// private OnRefreshListener onrefalshlister = new OnRefreshListener() { +// @Override +// public void onRefresh() { +// getlist(); +// //getGankList(ApiConfig.GETHOMEBANNER,new HashMap(),getString(R.string.loading),0); +// mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() { +// @Override +// public void run() { +// mDataBinding.taobaoRefreshLayout.stopRefresh(true); +// } +// }, 2000); +// +// } +// +// @Override +// public void onLoadMore() { +// //addRecycleVerization(); +// getlist(); +// mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() { +// @Override +// public void run() { +// mDataBinding.taobaoRefreshLayout.stopLoadMore(true); +// } +// }, 3000); +// +// } +// }; private ArrayList simpleEntities; private BaseRecycleViewAdapter baseRecycleViewAdapter; @@ -83,27 +86,39 @@ public class MyAuthorizedFamilyHistory extends BaseActivity(),getString(R.string.loading),0); - mDataBinding.taobaoRefreshLayout.setOnRefreshListener(onrefalshlister); - mDataBinding.taobaoRefreshLayout.setAutoRefresh(true); + mDataBinding.taobaoRefreshLayout.autoRefresh(); // getlist(); @@ -143,8 +158,8 @@ public class MyAuthorizedFamilyHistory extends BaseActivity(); baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() { - @SuppressLint("ClickableViewAccessibility") + @Override public void onBindViewHolder(Object b, final int position) { if (!(position >= simpleEntities.size())) { @@ -255,7 +270,8 @@ public class MyAuthorizedFamilyHistory extends BaseActivity { - - private Loader mGankLoader; - - @Override - protected int getLayoutResId() { - return R.layout.activity_my_authorized_family_historyt; - } - - private ProgressDialog progressDialog; - private OnRefreshListener onrefalshlister = new OnRefreshListener() { - @Override - public void onRefresh() { - getlist(); - //getGankList(ApiConfig.GETHOMEBANNER,new HashMap(),getString(R.string.loading),0); - mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() { - @Override - public void run() { - mDataBinding.taobaoRefreshLayout.stopRefresh(true); - } - }, 2000); - - } - - @Override - public void onLoadMore() { - //addRecycleVerization(); - getlist(); - mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() { - @Override - public void run() { - mDataBinding.taobaoRefreshLayout.stopLoadMore(true); - } - }, 3000); - - } - }; - private ArrayList simpleEntities; - private BaseRecycleViewAdapter baseRecycleViewAdapter; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - String usertitile = getIntent().getStringExtra("usertitile"); - setAbr(usertitile, new View.OnClickListener() { - @Override - public void onClick(View view) { - finish(); - } - }, R.mipmap.zengjia, new View.OnClickListener() { - @Override - public void onClick(View view) { -// Intent intet = new Intent(MyAuthorizedFamilyHistoryt.this, AddAnewFamilyNumberPermissionActivity.class); -// startActivity(intet); - } - }, 0, null, 0, - null, ""); - homeId=getIntent().getStringExtra("homeId"); - progressDialog = new ProgressDialog(this); -// progressDialog.show(); -// progressDialog.setMessage(getString(R.string.loading)); - intRecycleVerization(); - //getGankList(ApiConfig.GETHOMEBANNER,new HashMap(),getString(R.string.loading),0); - mDataBinding.taobaoRefreshLayout.setOnRefreshListener(onrefalshlister); - mDataBinding.taobaoRefreshLayout.setAutoRefresh(true); - -// getlist(); - - - } - private String homeId=""; - private void getlist() { - RegisterUser user = - Config.getInstance(MyAuthorizedFamilyHistoryt.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", "FamilyMemberList"); - if (!TextUtils.isEmpty(homeId)){ - map.put("home_id",homeId); - } - - map.put("sign", Md5.md5("Cas" + "FamilyMemberList" + Md5.secret)); - getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.loading), 0); - - } - - - private void getGankList(String myurl, Map map, String msg, final int requstecode) { -// progressDialog.setMessage(msg); -// progressDialog.setCancelable(false); -// progressDialog.show(); - - mGankLoader = new Loader(); - Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1() { - - - @Override - public void call(Resultcode resultcode) { - progressDialog.dismiss(); - mDataBinding.taobaoRefreshLayout.stopRefresh(true); - mDataBinding.taobaoRefreshLayout.stopLoadMore(true); - if (!(resultcode.status == 0)) { - setToast( resultcode.msg); - } - if (resultcode.status == 0) { - if (requstecode == 0) { - Gson gs = new Gson(); - ArrayList adta = (ArrayList) resultcode.data; - String s = gs.toJson(adta); - ArrayList list = null; - try { - JSONArray jsonObject = new JSONArray(s); - - Type type = new TypeToken>() { - }.getType(); - list = new Gson().fromJson(jsonObject.toString(), type); - simplelist(list); - if(list.size()<=0){ - if(page==1){ - mDataBinding.content.setVisibility(View.GONE); - mDataBinding.noDate.setVisibility(View.VISIBLE); - }else { - setToast(getString(R.string.no_more_data)); - } - - }else { - mDataBinding.content.setVisibility(View.VISIBLE); - mDataBinding.noDate.setVisibility(View.GONE); - page = page+1; - } - - } catch (JSONException e) { - e.printStackTrace(); - } - } - } - - } - - - }, new Action1() { - @Override - public void call(Throwable throwable) { - progressDialog.dismiss(); - - setToast( getString(R.string.getdatafailure)); - throwable.printStackTrace(); - } - }); - - addSubscription(subscription); - } - - private void simplelist(ArrayList list) { - - ArrayList mysiplentity = new ArrayList(); - for (int i = 0; i < list.size(); i++) { - SimpleEntity mysiplent = new SimpleEntity(); - mysiplent.setString1(list.get(i).getMember_name()); - mysiplent.setString2(list.get(i).getPhone()); - mysiplent.setString3(list.get(i).getF_id()); - - - mysiplentity.add(mysiplent); - - } - simpleEntities = mysiplentity; - baseRecycleViewAdapter.setData(mysiplentity); - } - - - private void intRecycleVerization() { - simpleEntities = new ArrayList(); - - final FullyGridLayoutManager mgr = new FullyGridLayoutManager(this, 1); - mgr.setOrientation(FullyGridLayoutManager.VERTICAL); - mgr.setSmoothScrollbarEnabled(true); - mDataBinding.recyView.setLayoutManager(mgr); - baseRecycleViewAdapter = new BaseRecycleViewAdapter(this, R.layout.familynumberpermissionn); - simpleEntities = new ArrayList<>(); - baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() { - @SuppressLint("ClickableViewAccessibility") - @Override - public void onBindViewHolder(Object b, final int position) { - if (!(position >= simpleEntities.size())) { - final FamilynumberpermissionnBinding homeGridAdapterItemBinding = (FamilynumberpermissionnBinding) b; - simpleEntities.get(position).setString12(position+1+""); - homeGridAdapterItemBinding.setMyentity(simpleEntities.get(position)); - homeGridAdapterItemBinding.edit.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { -// Intent intet = new Intent(MyAuthorizedFamilyHistoryt.this, AddAnewFamilyNumberPermissionActivity.class); -// intet.putExtra("stringentity", simpleEntities.get(position)); -// startActivityForResult(intet,1); - } - }); - } - - } - }); - - - mDataBinding.recyView.setAdapter(baseRecycleViewAdapter); - baseRecycleViewAdapter.setData(simpleEntities); - - - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if(resultCode==100){ - mDataBinding.taobaoRefreshLayout.setAutoRefresh(true); - } - } - - -} - - 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 f87b115..84afee7 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 @@ -160,7 +160,7 @@ public class MyPropertyActivity extends BaseActivity @Override public void onClick(View view) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); @@ -185,7 +185,7 @@ public class MyPropertyActivity extends BaseActivity @Override public void onClick(View view) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); @@ -218,7 +218,7 @@ public class MyPropertyActivity extends BaseActivity @Override public void onClick(View view) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); @@ -256,7 +256,7 @@ public class MyPropertyActivity extends BaseActivity @Override public void onClick(View view) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); @@ -303,7 +303,7 @@ public class MyPropertyActivity extends BaseActivity @Override public void onClick(View view) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); @@ -363,7 +363,7 @@ public class MyPropertyActivity extends BaseActivity @Override public void onClick(View v) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); @@ -381,7 +381,7 @@ public class MyPropertyActivity extends BaseActivity @Override public void onClick(View v) { if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); + Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); intent.putExtra("usertitile", "授权家庭"); intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); startActivityForResult(intent, 0); @@ -405,19 +405,19 @@ public class MyPropertyActivity extends BaseActivity } }); - baseRecycleViewAdapterv.setOnItemClickListener(new BaseRecycleViewAdapter.OnItemClickListener() { - @Override - public void onItemClick(View itemView, int position) { - - if (homegridentityvArrayList.get(position).isString9()){ - Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistoryt.class); - intent.putExtra("usertitile", "授权家庭"); - intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); - startActivityForResult(intent, 0); - } - - } - }); +// baseRecycleViewAdapterv.setOnItemClickListener(new BaseRecycleViewAdapter.OnItemClickListener() { +// @Override +// public void onItemClick(View itemView, int position) { +// +// if (homegridentityvArrayList.get(position).isString9()){ +// Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class); +// intent.putExtra("usertitile", "授权家庭"); +// intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8()); +// startActivityForResult(intent, 0); +// } +// +// } +// }); mDataBinding.recyView.setAdapter(baseRecycleViewAdapterv); baseRecycleViewAdapterv.setData(homegridentityvArrayList); mDataBinding.myaddress.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/res/layout/activity_main_tab.xml b/app/src/main/res/layout/activity_main_tab.xml index 05393d4..147edc2 100644 --- a/app/src/main/res/layout/activity_main_tab.xml +++ b/app/src/main/res/layout/activity_main_tab.xml @@ -75,6 +75,7 @@ android:textColor="@color/radiobuttoncolor" /> + > @@ -21,16 +21,14 @@ android:background="#F7F7F7" android:layout_height="match_parent"> - - - + android:layout_height="wrap_content" /> + - - + - - + + diff --git a/app/src/main/res/layout/fragment_main4.xml b/app/src/main/res/layout/fragment_main4.xml index c2a12dd..de26d3a 100644 --- a/app/src/main/res/layout/fragment_main4.xml +++ b/app/src/main/res/layout/fragment_main4.xml @@ -28,6 +28,7 @@ android:background="@mipmap/beijing"> + android:layout_centerVertical="true"> --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date: Sun, 28 Feb 2021 23:44:32 +0800 Subject: [PATCH 5/5] d --- .idea/jarRepositories.xml | 15 ++++ .../user/MyAuthorizedFamilyHistory.java | 17 ++--- .../user/MyPropertyActivity.java | 68 +++++++++++-------- app/src/main/java/entity/SimpleEntity.java | 3 +- .../res/layout/familynumberpermission.xml | 37 ++++++---- app/src/main/res/layout/fragment_main.xml | 1 + 6 files changed, 91 insertions(+), 50 deletions(-) diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 8d8034e..0748d83 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -86,5 +86,20 @@