diff --git a/app/src/main/java/com/sl/house_property/MainFragment.java b/app/src/main/java/com/sl/house_property/MainFragment.java index 4e6c045..f6a790a 100644 --- a/app/src/main/java/com/sl/house_property/MainFragment.java +++ b/app/src/main/java/com/sl/house_property/MainFragment.java @@ -267,7 +267,7 @@ public class MainFragment extends BaseFragment implements V // progressDialog.setMessage(getActivity().getString(R.string.loading)); progressDialog = new ProgressDialog(getContext()); intRecycleView(); - //getGankList(ApiConfig.GETHOMEBANNER,new HashMap(),getString(R.string.loading),0); + // getGankList(ApiConfig.GETHOMEBANNER,new HashMap(),getString(R.string.loading),0); mDataBinding.taobaoRefreshLayout.setOnRefreshLoadMoreListener(onrefalshlister); // mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() { // @Override diff --git a/app/src/main/java/com/sl/house_property/user/AddFamilyDialog.java b/app/src/main/java/com/sl/house_property/user/AddFamilyDialog.java index 11387b7..fdb38a2 100644 --- a/app/src/main/java/com/sl/house_property/user/AddFamilyDialog.java +++ b/app/src/main/java/com/sl/house_property/user/AddFamilyDialog.java @@ -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); } } diff --git a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java index 4c98840..c7d24b8 100644 --- a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java +++ b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.app.ProgressDialog; import android.content.Intent; import android.os.Bundle; +import android.text.TextUtils; import android.view.Gravity; import android.view.View; import android.widget.Toast; @@ -95,7 +96,7 @@ public class MyAuthorizedFamilyHistory extends BaseActivity 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 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 map = new HashMap<>(); @@ -173,7 +184,13 @@ public class MyPropertyActivity extends BaseActivity 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 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 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 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 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 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 } }); + 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 }); } - 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 } 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() { @Override diff --git a/app/src/main/res/layout/dialog_add_family.xml b/app/src/main/res/layout/dialog_add_family.xml index 5c3fd73..99a270b 100644 --- a/app/src/main/res/layout/dialog_add_family.xml +++ b/app/src/main/res/layout/dialog_add_family.xml @@ -30,6 +30,19 @@ + - +