Merge branch 'master' of https://gitee.com/renjianbo0118/HouseProperty
Conflicts: app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java
This commit is contained in:
@@ -91,7 +91,7 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> 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<FragmentMain4Binding> 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<FragmentMain4Binding> implements
|
||||
|
||||
}
|
||||
});
|
||||
mDataBinding.llRenxiang.setOnClickListener(new View.OnClickListener() {
|
||||
mDataBinding.ll3.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
//弹出激活对话框
|
||||
|
||||
@@ -44,7 +44,7 @@ public class MainTabActivity extends BaseActivity<ActivityMainTabBinding>
|
||||
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<ActivityMainTabBinding>
|
||||
}
|
||||
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();
|
||||
|
||||
@@ -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<ActivityMyAuthorized
|
||||
}
|
||||
|
||||
private ProgressDialog progressDialog;
|
||||
private OnRefreshListener onrefalshlister = new OnRefreshListener() {
|
||||
@Override
|
||||
public void onRefresh() {
|
||||
getlist();
|
||||
//getGankList(ApiConfig.GETHOMEBANNER,new HashMap<String, String>(),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<String, String>(),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<SimpleEntity> simpleEntities;
|
||||
private BaseRecycleViewAdapter baseRecycleViewAdapter;
|
||||
|
||||
@@ -83,27 +86,39 @@ public class MyAuthorizedFamilyHistory extends BaseActivity<ActivityMyAuthorized
|
||||
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(MyAuthorizedFamilyHistory.this, AddAnewFamilyNumberPermissionActivity.class);
|
||||
startActivity(intet);
|
||||
}
|
||||
}, 0, null, 0,
|
||||
null, "");
|
||||
// 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(MyAuthorizedFamilyHistory.this, AddAnewFamilyNumberPermissionActivity.class);
|
||||
// startActivity(intet);
|
||||
// }
|
||||
// }, 0, null, 0,
|
||||
// null, "");
|
||||
homeId=getIntent().getStringExtra("homeId");
|
||||
progressDialog = new ProgressDialog(this);
|
||||
mDataBinding.taobaoRefreshLayout.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
|
||||
@Override
|
||||
public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
|
||||
getlist();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
|
||||
page=1;
|
||||
getlist();
|
||||
}
|
||||
});
|
||||
mDataBinding.taobaoRefreshLayout.autoRefresh();
|
||||
// progressDialog.show();
|
||||
// progressDialog.setMessage(getString(R.string.loading));
|
||||
intRecycleVerization();
|
||||
//getGankList(ApiConfig.GETHOMEBANNER,new HashMap<String, String>(),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<ActivityMyAuthorized
|
||||
@Override
|
||||
public void call(Resultcode resultcode) {
|
||||
progressDialog.dismiss();
|
||||
mDataBinding.taobaoRefreshLayout.stopRefresh(true);
|
||||
mDataBinding.taobaoRefreshLayout.stopLoadMore(true);
|
||||
mDataBinding.taobaoRefreshLayout.finishLoadMore();
|
||||
mDataBinding.taobaoRefreshLayout.finishRefresh();
|
||||
if (!(resultcode.status == 0)) {
|
||||
setToast( resultcode.msg);
|
||||
}
|
||||
@@ -225,7 +240,7 @@ public class MyAuthorizedFamilyHistory extends BaseActivity<ActivityMyAuthorized
|
||||
baseRecycleViewAdapter = new BaseRecycleViewAdapter(this, R.layout.familynumberpermission);
|
||||
simpleEntities = new ArrayList<>();
|
||||
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<ActivityMyAuthorized
|
||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
if(resultCode==100){
|
||||
mDataBinding.taobaoRefreshLayout.setAutoRefresh(true);
|
||||
page=1;
|
||||
getlist();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,266 +0,0 @@
|
||||
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<ActivityMyAuthorizedFamilyHistorytBinding> {
|
||||
|
||||
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<String, String>(),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<SimpleEntity> 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<String, String>(),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<String, String> 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<String, String> 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<Resultcode>() {
|
||||
|
||||
|
||||
@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<LinkedTreeMap> adta = (ArrayList<LinkedTreeMap>) resultcode.data;
|
||||
String s = gs.toJson(adta);
|
||||
ArrayList<MyfamilySimpleEntity> list = null;
|
||||
try {
|
||||
JSONArray jsonObject = new JSONArray(s);
|
||||
|
||||
Type type = new TypeToken<ArrayList<MyfamilySimpleEntity>>() {
|
||||
}.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<Throwable>() {
|
||||
@Override
|
||||
public void call(Throwable throwable) {
|
||||
progressDialog.dismiss();
|
||||
|
||||
setToast( getString(R.string.getdatafailure));
|
||||
throwable.printStackTrace();
|
||||
}
|
||||
});
|
||||
|
||||
addSubscription(subscription);
|
||||
}
|
||||
|
||||
private void simplelist(ArrayList<MyfamilySimpleEntity> list) {
|
||||
|
||||
ArrayList<SimpleEntity> mysiplentity = new ArrayList<SimpleEntity>();
|
||||
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<SimpleEntity>();
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -159,13 +159,13 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
|
||||
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,MyAuthorizedFamilyHistory.class);
|
||||
intent.putExtra("usertitile", "授权家庭");
|
||||
intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
|
||||
startActivityForResult(intent, 0);
|
||||
return;
|
||||
}
|
||||
RegisterUser user =
|
||||
Config.getInstance(MyPropertyActivity.this).getUser();
|
||||
Map<String, String> map = new HashMap<>();
|
||||
@@ -184,13 +184,13 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
|
||||
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,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("请选择小区");
|
||||
@@ -217,13 +217,13 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
|
||||
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,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("请选择小区");
|
||||
@@ -255,13 +255,13 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
|
||||
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,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("")) {
|
||||
@@ -302,13 +302,13 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
|
||||
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,MyAuthorizedFamilyHistory.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<ActivityMyPropertyBinding>
|
||||
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,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) {
|
||||
@@ -380,13 +380,13 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
|
||||
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,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) {
|
||||
@@ -401,35 +401,23 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
|
||||
}
|
||||
});
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
baseRecycleViewAdapterv.setOnItemClickListener(new BaseRecycleViewAdapter.OnItemClickListener() {
|
||||
@Override
|
||||
public void onItemClick(View itemView, int position) {
|
||||
|
||||
// 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 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() {
|
||||
|
||||
@@ -75,6 +75,7 @@
|
||||
android:textColor="@color/radiobuttoncolor" />
|
||||
|
||||
<RadioButton
|
||||
android:visibility="gone"
|
||||
android:id="@+id/like"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
@@ -86,6 +87,7 @@
|
||||
android:textColor="@color/radiobuttoncolor" />
|
||||
|
||||
<RadioButton
|
||||
android:visibility="gone"
|
||||
android:id="@+id/button3"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginBottom="0dip"
|
||||
android:fitsSystemWindows="true"
|
||||
tools:context=".Main1Fragment">
|
||||
>
|
||||
|
||||
<!-- TODO: Update blank fragment layout -->
|
||||
|
||||
@@ -21,16 +21,14 @@
|
||||
android:background="#F7F7F7"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<my_view.tao_bao_refresh.TaoBaoRefreshLayout
|
||||
<com.scwang.smartrefresh.layout.SmartRefreshLayout
|
||||
android:id="@+id/taobao_refresh_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<my_view.tao_bao_refresh.ScrollViewExtend
|
||||
android:id="@+id/scroll_view_extend"
|
||||
android:fillViewport="true"
|
||||
<com.scwang.smartrefresh.layout.header.ClassicsHeader
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
@@ -39,18 +37,20 @@
|
||||
android:layout_height="match_parent">
|
||||
|
||||
|
||||
<my_view.tao_bao_refresh.RecyView
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:layout_width="match_parent"
|
||||
android:id="@+id/recy_view"
|
||||
|
||||
android:layout_height="match_parent">
|
||||
|
||||
</my_view.tao_bao_refresh.RecyView>
|
||||
</android.support.v7.widget.RecyclerView>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
</my_view.tao_bao_refresh.ScrollViewExtend>
|
||||
</my_view.tao_bao_refresh.TaoBaoRefreshLayout>
|
||||
<com.scwang.smartrefresh.layout.footer.ClassicsFooter
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
android:background="@mipmap/beijing">
|
||||
|
||||
<ImageView
|
||||
android:visibility="gone"
|
||||
android:id="@+id/setting"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -40,7 +41,7 @@
|
||||
android:id="@+id/userLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true">
|
||||
android:layout_centerVertical="true">
|
||||
|
||||
<tools.RoundedCornerImageView
|
||||
android:id="@+id/userImage"
|
||||
@@ -85,6 +86,174 @@
|
||||
|
||||
<!-- </my_view.tao_bao_refresh.RecyView>-->
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_1"
|
||||
android:layout_marginTop="16dp"
|
||||
android:background="@color/white"
|
||||
android:layout_width="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:layout_height="50dp">
|
||||
<ImageView
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@mipmap/fangchan"
|
||||
/>
|
||||
<TextView
|
||||
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical"
|
||||
android:textSize="16sp"
|
||||
android:textColor="#000"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:text="我的点赞"
|
||||
|
||||
/>
|
||||
<ImageView
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_width="15dp"
|
||||
android:layout_height="15dp"
|
||||
android:src="@mipmap/returnme"
|
||||
|
||||
/>
|
||||
</LinearLayout>
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="5dp"
|
||||
|
||||
|
||||
android:background="@color/light" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_2"
|
||||
android:background="@color/white"
|
||||
android:layout_width="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:layout_height="50dp">
|
||||
<ImageView
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@mipmap/fangchan"
|
||||
/>
|
||||
<TextView
|
||||
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical"
|
||||
android:textSize="16sp"
|
||||
android:textColor="#000"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:text="我的房产"
|
||||
|
||||
/>
|
||||
<ImageView
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_width="15dp"
|
||||
android:layout_height="15dp"
|
||||
android:src="@mipmap/returnme"
|
||||
|
||||
/>
|
||||
</LinearLayout>
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
|
||||
|
||||
android:background="@color/light" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_3"
|
||||
android:background="@color/white"
|
||||
android:layout_width="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:layout_height="50dp">
|
||||
<ImageView
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@mipmap/fangchan"
|
||||
/>
|
||||
<TextView
|
||||
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical"
|
||||
android:textSize="16sp"
|
||||
android:textColor="#000"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:text="上传人脸"
|
||||
|
||||
/>
|
||||
<ImageView
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_width="15dp"
|
||||
android:layout_height="15dp"
|
||||
android:src="@mipmap/returnme"
|
||||
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="5dp"
|
||||
|
||||
|
||||
android:background="@color/light" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_4"
|
||||
android:background="@color/white"
|
||||
android:layout_width="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:layout_height="50dp">
|
||||
<ImageView
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@mipmap/fangchan"
|
||||
/>
|
||||
<TextView
|
||||
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical"
|
||||
android:textSize="16sp"
|
||||
android:textColor="#000"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:text="设置"
|
||||
|
||||
/>
|
||||
<ImageView
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_width="15dp"
|
||||
android:layout_height="15dp"
|
||||
android:src="@mipmap/returnme"
|
||||
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
|
||||
|
||||
android:background="@color/light" />
|
||||
|
||||
<LinearLayout
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
android:layout_height="wrap_content"
|
||||
@@ -160,6 +329,7 @@
|
||||
android:background="@color/divider_line_color" />
|
||||
|
||||
<LinearLayout
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginTop="1dp"
|
||||
@@ -292,6 +462,7 @@
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="16dp"
|
||||
@@ -371,6 +542,7 @@
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="16dp"
|
||||
|
||||
Reference in New Issue
Block a user