From e6014ef123350d5c0cadabe9c18e26b3d5a3c729 Mon Sep 17 00:00:00 2001
From: guoshen <3129367635@qq.com>
Date: 星期六, 29 六月 2024 15:41:25 +0800
Subject: [PATCH] Revert "Initial commit"
---
app/src/main/java/com/application/zhangshi_app_android/ui/home/GenealogyActivity.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/home/GenealogyActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/home/GenealogyActivity.java
index a71d397..0dd1bf7 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/home/GenealogyActivity.java
+++ b/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
--
Gitblit v1.9.1