From 84086e9aae4ef8de4e8979f8344fc18536563cfd Mon Sep 17 00:00:00 2001 From: jinyuera <454386664@qq.com> Date: Sun, 28 Feb 2021 19:36:01 +0800 Subject: [PATCH] 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"> --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +