This commit is contained in:
jinyuera
2021-02-26 16:29:42 +08:00
parent 088360784a
commit 60fdeb3488
6 changed files with 102 additions and 22 deletions

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

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

View File

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
import android.widget.Toast;
@@ -95,7 +96,7 @@ public class MyAuthorizedFamilyHistory extends BaseActivity<ActivityMyAuthorized
}
}, 0, null, 0,
null, "");
homeId=getIntent().getStringExtra("homeId");
progressDialog = new ProgressDialog(this);
// progressDialog.show();
// progressDialog.setMessage(getString(R.string.loading));
@@ -108,7 +109,7 @@ public class MyAuthorizedFamilyHistory extends BaseActivity<ActivityMyAuthorized
}
private String homeId="";
private void getlist() {
RegisterUser user =
Config.getInstance(MyAuthorizedFamilyHistory.this).getUser();
@@ -120,6 +121,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);

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) {
@@ -359,7 +405,19 @@ public class MyPropertyActivity extends BaseActivity<ActivityMyPropertyBinding>
}
});
baseRecycleViewAdapterv.setOnItemClickListener(new BaseRecycleViewAdapter.OnItemClickListener() {
@Override
public void onItemClick(View itemView, int position) {
if (homegridentityvArrayList.get(position).isString9()){
Intent intent = new Intent(MyPropertyActivity.this,MyAuthorizedFamilyHistory.class);
intent.putExtra("usertitile", "授权家庭");
intent.putExtra("homeId", homegridentityvArrayList.get(position).getString8());
startActivityForResult(intent, 0);
}
}
});
mDataBinding.recyView.setAdapter(baseRecycleViewAdapterv);
baseRecycleViewAdapterv.setData(homegridentityvArrayList);
mDataBinding.myaddress.setOnClickListener(new View.OnClickListener() {
@@ -377,7 +435,7 @@ public class MyPropertyActivity extends BaseActivity<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 +447,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

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"

View File

@@ -328,10 +328,7 @@
android:background="@mipmap/returnme"
android:paddingBottom="7dp"/>
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_rec"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
android:id="@+id/tv_family"
android:text="+添加家庭成员"