admin/HouseProperty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/renjianbo0118/HouseProperty

Browse Source 
 Conflicts:
	.idea/jarRepositories.xml
This commit is contained in:
jianbo
2021-03-01 10:10:16 +08:00
parent be162c7694 fce732a659
commit c3c9995ad1
18 changed files with 624 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/jarRepositories.xml generated
View File

@@ -89,17 +89,17 @@
<remote-repository>
<option name="id" value="E:\AndroidSDK\extras\google\m2repository" />
<option name="name" value="E:\AndroidSDK\extras\google\m2repository" />
<option name="url" value="file:/$PROJECT_DIR$/../../AndroidSDK/extras/google/m2repository/" />
<option name="url" value="file:/E:/AndroidSDK/extras/google/m2repository/" />
</remote-repository>
<remote-repository>
<option name="id" value="E:\AndroidSDK\extras\m2repository" />
<option name="name" value="E:\AndroidSDK\extras\m2repository" />
<option name="url" value="file:/$PROJECT_DIR$/../../AndroidSDK/extras/m2repository/" />
<option name="url" value="file:/E:/AndroidSDK/extras/m2repository/" />
</remote-repository>
<remote-repository>
<option name="id" value="E:\AndroidSDK\extras\android\m2repository" />
<option name="name" value="E:\AndroidSDK\extras\android\m2repository" />
<option name="url" value="file:/$PROJECT_DIR$/../../AndroidSDK/extras/android/m2repository/" />
<option name="url" value="file:/E:/AndroidSDK/extras/android/m2repository/" />
</remote-repository>
</component>
</project>

1
app/src/main/AndroidManifest.xml
View File

@@ -162,6 +162,7 @@
<activity android:name="com.sl.house_property.user.MyServiceHistory" />
<activity android:name="com.sl.house_property.user.MyGuaranteeHistory" />
<activity android:name="com.sl.house_property.user.MyAuthorizedFamilyHistory" />
<activity android:name="com.sl.house_property.user.MyAuthorizedFamilyHistoryt" />
<activity android:name="com.sl.house_property.user.MyPropertyActivity" />
<activity android:name="com.sl.house_property.user.MyKeyManagement" />
<activity android:name="com.sl.house_property.user.MyChargeActivity" />

6
app/src/main/java/com/sl/house_property/Main4Fragment.java
View File

@@ -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) {
//弹出激活对话框

2
app/src/main/java/com/sl/house_property/MainFragment.java
View File

@@ -267,7 +267,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> implements V
// progressDialog.setMessage(getActivity().getString(R.string.loading));
progressDialog = new ProgressDialog(getContext());
intRecycleView();
//getGankList(ApiConfig.GETHOMEBANNER,new HashMap<String, String>(),getString(R.string.loading),0);
// getGankList(ApiConfig.GETHOMEBANNER,new HashMap<String, String>(),getString(R.string.loading),0);
mDataBinding.taobaoRefreshLayout.setOnRefreshLoadMoreListener(onrefalshlister);
// mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() {
// @Override

20
app/src/main/java/com/sl/house_property/MainTabActivity.java
View File

@@ -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();

11
app/src/main/java/com/sl/house_property/user/AddFamilyDialog.java
View File

@@ -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);
}
}

133
app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
View File

@@ -4,6 +4,8 @@ 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;
import android.widget.Toast;
@@ -12,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;
@@ -48,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;
@@ -82,33 +86,45 @@ 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();
}
private String homeId="";
private void getlist() {
RegisterUser user =
Config.getInstance(MyAuthorizedFamilyHistory.this).getUser();
@@ -120,6 +136,9 @@ public class MyAuthorizedFamilyHistory extends BaseActivity<ActivityMyAuthorized
}
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);
@@ -139,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);
}
@@ -221,20 +240,21 @@ 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())) {
final FamilynumberpermissionBinding homeGridAdapterItemBinding = (FamilynumberpermissionBinding) 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(MyAuthorizedFamilyHistory.this, AddAnewFamilyNumberPermissionActivity.class);
intet.putExtra("stringentity", simpleEntities.get(position));
startActivityForResult(intet,1);
}
});
// homeGridAdapterItemBinding.edit.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View view) {
// Intent intet = new Intent(MyAuthorizedFamilyHistory.this, AddAnewFamilyNumberPermissionActivity.class);
// intet.putExtra("stringentity", simpleEntities.get(position));
// startActivityForResult(intet,1);
// }
// });
}
}
@@ -251,7 +271,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();
}
}

99
app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java
View File

@@ -1,5 +1,6 @@
package com.sl.house_property.user;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Gravity;
@@ -105,14 +106,18 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
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<ActivityMyPropertyBinding>
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<String, String> map = new HashMap<>();
@@ -173,7 +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()) 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<ActivityMyPropertyBinding>
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<ActivityMyPropertyBinding>
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<ActivityMyPropertyBinding>
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<ActivityMyPropertyBinding>
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<ActivityMyPropertyBinding>
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) {
@@ -354,12 +400,36 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
}).show();
}
});
homeGridAdapterItemBinding.llJt.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
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;
}
}
});
}
}
});
// 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 +447,7 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
});
}
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 +459,9 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
}
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<Resultcode>() {
@Override

13
app/src/main/java/entity/SimpleEntity.java
View File

@@ -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.string12);
}
@Bindable
private String string12;
@Bindable
private String string2;
@Bindable
@@ -143,4 +155,5 @@ public class SimpleEntity extends BaseObservable implements Serializable {
this.string5 = string5;
notifyPropertyChanged(BR.string5);
}
}

2
app/src/main/res/layout/activity_main_tab.xml
View File

@@ -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"

22
app/src/main/res/layout/activity_my_authorized_family_history.xml
View File

@@ -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>

66
app/src/main/res/layout/activity_my_authorized_family_historyt.xml Normal file
View File

@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="0dip"
android:fitsSystemWindows="true"
tools:context=".Main1Fragment">
<!-- TODO: Update blank fragment layout -->
<RelativeLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_marginTop="0dip"
android:background="#F7F7F7"
android:layout_height="match_parent">
<my_view.tao_bao_refresh.TaoBaoRefreshLayout
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"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<my_view.tao_bao_refresh.RecyView
android:layout_width="match_parent"
android:id="@+id/recy_view"
android:layout_height="match_parent">
</my_view.tao_bao_refresh.RecyView>
</LinearLayout>
</my_view.tao_bao_refresh.ScrollViewExtend>
</my_view.tao_bao_refresh.TaoBaoRefreshLayout>
</RelativeLayout>
<include
android:id="@+id/noDate"
layout="@layout/no_data_view"
android:visibility="gone">
</include>
</FrameLayout>
</layout>

13
app/src/main/res/layout/dialog_add_family.xml
View File

@@ -30,6 +30,19 @@
</LinearLayout>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="#000"
android:inputType="text"
android:id="@+id/et_name"
android:layout_marginTop="16dp"
android:hint="请输入姓名"
android:layout_marginRight="8dp"
android:layout_marginLeft="8dp"
/>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"

37
app/src/main/res/layout/familynumberpermission.xml
View File

@@ -19,11 +19,11 @@
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="10dip"
android:layout_height="2dip"
android:background="@color/f7" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="60dp">
android:layout_height="50dp">
<LinearLayout
android:layout_width="match_parent"
@@ -31,24 +31,34 @@
android:paddingLeft="12dp"
android:gravity="center_vertical"
android:background="@color/white"
android:orientation="vertical">
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="6dp"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="家庭成员"
android:textColor="#333333"
android:textSize="19sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="@{myentity.string12}"
android:textColor="#333333"
android:textSize="19sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:gravity="center_vertical"
android:text="@{myentity.string1}"
android:textColor="#333333"
android:textSize="19sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_marginBottom="6dp"
android:gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="@{myentity.string2}"
android:textColor="@color/lightlittleGrey"
android:textSize="15sp" />
@@ -69,6 +79,7 @@
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:layout_marginStart="24dip"
android:visibility="gone"
android:layout_marginEnd="24dip"
android:background="@mipmap/xie" />
</RelativeLayout>

87
app/src/main/res/layout/familynumberpermissionn.xml Normal file
View File

@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="myentity"
type="entity.SimpleEntity">
</variable>
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="2dip"
android:background="@color/f7" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="50dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:paddingLeft="12dp"
android:gravity="center_vertical"
android:background="@color/white"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="家庭成员"
android:textColor="#333333"
android:textSize="19sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="@{myentity.string12}"
android:textColor="#333333"
android:textSize="19sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:gravity="center_vertical"
android:text="@{myentity.string1}"
android:textColor="#333333"
android:textSize="19sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="@{myentity.string2}"
android:textColor="@color/lightlittleGrey"
android:textSize="15sp" />
</LinearLayout>
<View
android:layout_width="0.5dip"
android:layout_margin="15dp"
android:background="@color/LightGray"
android:layout_toLeftOf="@+id/edit"
android:layout_height="match_parent"/>
<ImageView
android:id="@+id/edit"
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:layout_marginStart="24dip"
android:visibility="gone"
android:layout_marginEnd="24dip"
android:background="@mipmap/xie" />
</RelativeLayout>
</LinearLayout>
</layout>

1
app/src/main/res/layout/fragment_main.xml
View File

@@ -139,6 +139,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dip"
android:visibility="gone"
android:layout_weight="1"
android:background="@mipmap/garage">

174
app/src/main/res/layout/fragment_main4.xml
View File

@@ -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"

48
app/src/main/res/layout/myhousrmessageitem.xml
View File

@@ -328,10 +328,52 @@
android:background="@mipmap/returnme"
android:paddingBottom="7dp"/>
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_rec"
<View
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="0.5dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip"
android:background="@color/lighteeeeee" />
<LinearLayout
android:id="@+id/ll_jt"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginStart="15dip"
android:layout_marginEnd="15dip"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="家庭成员"
android:textColor="#333333"
android:textSize="16sp" />
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_marginLeft="20dip"
android:visibility="invisible"
android:layout_weight="1"
android:background="@null"
android:hint="成员"
android:text="@{myentity.string11}"
android:textColor="#333333"
android:textSize="16sp" />
<ImageView
android:layout_width="8dp"
android:layout_height="14dp"
android:layout_marginLeft="20dip"
android:layout_gravity="center_vertical"
android:background="@mipmap/returnme"
android:paddingBottom="7dp"/>
</LinearLayout>
<TextView
android:id="@+id/tv_family"
android:text="+添加家庭成员"