对新接口进行了适配

张钢

2024-09-02 63608b5dca9eebb6fa2cb1a8652b395f1d910c3e

 app/src/main/java/com/application/zhangshi_app_android/ui/home/GenealogyActivity.java

@@ -14,6 +14,7 @@
import com.application.zhangshi_app_android.BR;
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.adapter.HomeMemberAdapter;
import com.application.zhangshi_app_android.bean.HomeMemberBean;
import com.application.zhangshi_app_android.databinding.ActivityGenealogyBinding;
import com.application.zhangshi_app_android.ui.DLBaseActivity;
import com.github.gzuliyujiang.wheelpicker.DatePicker;
@@ -122,7 +123,10 @@
            picker.show();
        });
        binding.etIdentity.setOnClickListener(v -> {
            List<String> list = Arrays.asList("1","2","3","4");
            List<String> list = new ArrayList<>();
            for (int i = 1; i < 100; i++) {
                list.add(i+"");
            }
            OptionPicker picker = getOptionPicker(list);
            picker.setTitle("身份代数");
            picker.setOnOptionPickedListener(new OnOptionPickedListener() {
@@ -158,10 +162,24 @@
    @Override
    public void initLiveDataObserve() {
        viewModel.getDataListLiveData().observe(this, list -> {
            adapter.setData(list);
            List<HomeMemberBean> realList = new ArrayList<>();
            for (HomeMemberBean homeMemberBean : list) {
                realList.add(homeMemberBean);
                if (homeMemberBean.getSpouse() != null){
                    realList.add(homeMemberBean.getSpouse());
                }
            }
            adapter.setData(realList);
        });
        viewModel.getMoreListLiveData().observe(this, list -> {
            adapter.addData(list);
            List<HomeMemberBean> realList = new ArrayList<>();
            for (HomeMemberBean homeMemberBean : list) {
                realList.add(homeMemberBean);
                if (homeMemberBean.getSpouse() != null){
                    realList.add(homeMemberBean.getSpouse());
                }
            }
            adapter.addData(realList);
        });
    }
    @Override