diff --git a/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeFragment.java b/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeFragment.java index a3b7a18..93d6e5a 100644 --- a/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeFragment.java +++ b/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeFragment.java @@ -1,7 +1,6 @@ package cc.niushuai.didicheck.ui.main.home; import android.os.Bundle; -import android.text.format.DateUtils; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -17,10 +16,15 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import java.util.ArrayList; import java.util.Date; +import java.util.List; +import cc.niushuai.didicheck.biz.entity.CheckRecord; +import cc.niushuai.didicheck.biz.enums.CheckTypeEnum; import cc.niushuai.didicheck.databinding.FragmentHomeBinding; import cn.hutool.core.date.DateUtil; @@ -65,6 +69,23 @@ public class HomeFragment extends Fragment { itemAnimator.setRemoveDuration(1000); homeDataZoneRecyclerView.setItemAnimator(itemAnimator); + List recordList = new ArrayList<>(); + for (int i = 0; i < 50; i++) { + CheckRecord record = new CheckRecord(); + record.setId(new Date().getTime()); + record.setCheckType(CheckTypeEnum.ADD); + record.setName("recordName" + i); + record.setDescription(null); + record.setDeleted(0); + record.setCreateDate(new Date()); + recordList.add(record); + } + + HomeRecycleViewAdapter homeRecycleViewAdapter = new HomeRecycleViewAdapter(this.getActivity(), recordList); + homeDataZoneRecyclerView.setAdapter(homeRecycleViewAdapter); + LinearLayoutManager layoutManager = new LinearLayoutManager(this.getActivity()); + homeDataZoneRecyclerView.setLayoutManager(layoutManager); + return rootLayout; } diff --git a/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeRecycleViewAdapter.java b/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeRecycleViewAdapter.java index 07a3c8f..dae454e 100644 --- a/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeRecycleViewAdapter.java +++ b/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeRecycleViewAdapter.java @@ -1,25 +1,45 @@ package cc.niushuai.didicheck.ui.main.home; +import android.content.Context; +import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import java.util.ArrayList; +import java.util.List; + +import cc.niushuai.didicheck.R; +import cc.niushuai.didicheck.biz.entity.CheckRecord; +import cn.hutool.core.date.DateUtil; + public class HomeRecycleViewAdapter extends RecyclerView.Adapter { + private final List checkRecordList = new ArrayList<>(); + private final Context context; + + public HomeRecycleViewAdapter(Context context, List checkRecordList) { + this.context = context; + this.checkRecordList.addAll(checkRecordList); + } + @NonNull @Override public HomeRecycleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - return null; + View view = View.inflate(context, R.layout.item_list, null); + return new HomeRecycleViewHolder(view); } @Override public void onBindViewHolder(@NonNull HomeRecycleViewHolder holder, int position) { - + CheckRecord checkRecord = checkRecordList.get(position); + holder.titleTextView.setText(checkRecord.getName()); + holder.contentTextView.setText(DateUtil.formatDate(checkRecord.getCreateDate())); } @Override public int getItemCount() { - return 0; + return checkRecordList.size(); } } diff --git a/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeRecycleViewHolder.java b/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeRecycleViewHolder.java index dad6fb4..f7d53dd 100644 --- a/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeRecycleViewHolder.java +++ b/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeRecycleViewHolder.java @@ -1,13 +1,21 @@ package cc.niushuai.didicheck.ui.main.home; import android.view.View; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import cc.niushuai.didicheck.R; + public class HomeRecycleViewHolder extends RecyclerView.ViewHolder { + protected TextView titleTextView; + protected TextView contentTextView; + public HomeRecycleViewHolder(@NonNull View itemView) { super(itemView); + titleTextView = itemView.findViewById(R.id.item_list_title_textView); + contentTextView = itemView.findViewById(R.id.item_list_content_textView); } } diff --git a/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeViewModel.java b/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeViewModel.java index f39d2a9..3ac2e6f 100644 --- a/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeViewModel.java +++ b/app/src/main/java/cc/niushuai/didicheck/ui/main/home/HomeViewModel.java @@ -10,9 +10,9 @@ import cc.niushuai.didicheck.biz.entity.CheckRecord; public class HomeViewModel extends ViewModel { - private MutableLiveData title = new MutableLiveData<>(); - private MutableLiveData selectDate = new MutableLiveData<>(); - private MutableLiveData> checkRecordList = new MutableLiveData<>(); + private final MutableLiveData title = new MutableLiveData<>(); + private final MutableLiveData selectDate = new MutableLiveData<>(); + private final MutableLiveData> checkRecordList = new MutableLiveData<>(); public MutableLiveData getTitle() { return title; @@ -22,14 +22,14 @@ public class HomeViewModel extends ViewModel { this.title.setValue(title); } - public void setSelectDate(Date value) { - this.selectDate.setValue(value); - } - public MutableLiveData getSelectDate() { return this.selectDate; } + public void setSelectDate(Date value) { + this.selectDate.setValue(value); + } + public MutableLiveData> getCheckRecordList() { return checkRecordList; } diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml index 4d4560d..b93bf40 100644 --- a/app/src/main/res/layout/item_list.xml +++ b/app/src/main/res/layout/item_list.xml @@ -1,8 +1,29 @@ + + + \ No newline at end of file