diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 68cf444..0748d83 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -89,17 +89,17 @@ \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 562f90c..b978ce8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -162,6 +162,7 @@ + diff --git a/app/src/main/java/com/sl/house_property/Main4Fragment.java b/app/src/main/java/com/sl/house_property/Main4Fragment.java index 286c383..77b9e3d 100644 --- a/app/src/main/java/com/sl/house_property/Main4Fragment.java +++ b/app/src/main/java/com/sl/house_property/Main4Fragment.java @@ -91,7 +91,7 @@ public class Main4Fragment extends BaseFragment 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 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 implements } }); - mDataBinding.llRenxiang.setOnClickListener(new View.OnClickListener() { + mDataBinding.ll3.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { //弹出激活对话框 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/MainTabActivity.java b/app/src/main/java/com/sl/house_property/MainTabActivity.java index 67983de..fc29f62 100644 --- a/app/src/main/java/com/sl/house_property/MainTabActivity.java +++ b/app/src/main/java/com/sl/house_property/MainTabActivity.java @@ -44,7 +44,7 @@ public class MainTabActivity extends BaseActivity 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 } 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(); 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..3f61912 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,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(),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(),getString(R.string.loading),0); +// mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() { +// @Override +// public void run() { +// mDataBinding.taobaoRefreshLayout.stopRefresh(true); +// } +// }, 2000); +// +// } +// +// @Override +// public void onLoadMore() { +// //addRecycleVerization(); +// getlist(); +// mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() { +// @Override +// public void run() { +// mDataBinding.taobaoRefreshLayout.stopLoadMore(true); +// } +// }, 3000); +// +// } +// }; private ArrayList simpleEntities; private BaseRecycleViewAdapter baseRecycleViewAdapter; @@ -82,33 +86,45 @@ public class MyAuthorizedFamilyHistory extends BaseActivity(),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(); 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 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) { @@ -354,12 +400,36 @@ public class MyPropertyActivity extends BaseActivity }).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 }); } - 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 } 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/java/entity/SimpleEntity.java b/app/src/main/java/entity/SimpleEntity.java index 5400b98..ca19c82 100644 --- a/app/src/main/java/entity/SimpleEntity.java +++ b/app/src/main/java/entity/SimpleEntity.java @@ -55,6 +55,18 @@ public class SimpleEntity extends BaseObservable implements Serializable { private String string8; @Bindable private String string1; + + public String getString12() { + return string12; + } + + public void setString12(String string12) { + this.string12 = string12; + notifyPropertyChanged(BR.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); } + } diff --git a/app/src/main/res/layout/activity_main_tab.xml b/app/src/main/res/layout/activity_main_tab.xml index 05393d4..147edc2 100644 --- a/app/src/main/res/layout/activity_main_tab.xml +++ b/app/src/main/res/layout/activity_main_tab.xml @@ -75,6 +75,7 @@ android:textColor="@color/radiobuttoncolor" /> + > @@ -21,16 +21,14 @@ android:background="#F7F7F7" android:layout_height="match_parent"> - - - + android:layout_height="wrap_content" /> + - - + - - + + diff --git a/app/src/main/res/layout/activity_my_authorized_family_historyt.xml b/app/src/main/res/layout/activity_my_authorized_family_historyt.xml new file mode 100644 index 0000000..6a55d31 --- /dev/null +++ b/app/src/main/res/layout/activity_my_authorized_family_historyt.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/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 @@ + + android:layout_height="50dp"> - + android:orientation="horizontal"> + + @@ -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" /> diff --git a/app/src/main/res/layout/familynumberpermissionn.xml b/app/src/main/res/layout/familynumberpermissionn.xml new file mode 100644 index 0000000..033bb7f --- /dev/null +++ b/app/src/main/res/layout/familynumberpermissionn.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 1336cd9..6b1c8ba 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -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"> diff --git a/app/src/main/res/layout/fragment_main4.xml b/app/src/main/res/layout/fragment_main4.xml index c2a12dd..de26d3a 100644 --- a/app/src/main/res/layout/fragment_main4.xml +++ b/app/src/main/res/layout/fragment_main4.xml @@ -28,6 +28,7 @@ android:background="@mipmap/beijing"> + android:layout_centerVertical="true"> --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + android:layout_height="0.5dip" + android:layout_marginLeft="15dip" + android:layout_marginRight="15dip" + android:background="@color/lighteeeeee" /> + + + + + + + + + +