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