From d9c886270d66782df9de5f6a7b877a269a273aa5 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 12 十二月 2023 09:25:52 +0800
Subject: [PATCH] 卡标识设置添加选择器

---
 app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java |   55 ++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java b/app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java
index bd19709..9ad290f 100644
--- a/app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java
@@ -9,10 +9,13 @@
 import com.dayu.recharge.adapter.RechargeAdapter;
 import com.dayu.recharge.databinding.ActivityRechargeListBinding;
 import com.dayu.recharge.dbBean.RechargeBean;
+import com.dayu.recharge.model.RechargeListModel;
 import com.dayu.recharge.utils.ArithUtil;
+import com.dayu.recharge.utils.TipUtil;
 import com.dayu.recharge.view.datepicker.CustomDatePicker;
 import com.dayu.recharge.view.datepicker.DateFormatUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -25,12 +28,14 @@
 
     ActivityRechargeListBinding rechargeListBinding;
     RechargeAdapter adapter;
-    List<RechargeBean> rechargeList;
+    List<RechargeBean> rechargeList = new ArrayList<>();
 
     private CustomDatePicker beginDatePicker;
     private CustomDatePicker endDatePicker;
     long beginTime;
     long endTime;
+
+    RechargeListModel rechargeListModel;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -44,11 +49,14 @@
     }
 
     private void setData() {
-//        try {
-//            rechargeList = SqLite_DB_Utile.getInit(this).findAll(RechargeBean.class);
-//        } catch (DbException e) {
-//            e.printStackTrace();
-//        }
+
+        rechargeListModel = new RechargeListModel(this);
+        rechargeListModel.getAllRechargeList().observe(this, myList -> {
+            rechargeList.clear();
+            rechargeList.addAll(myList);
+            adapter.notifyDataSetChanged();
+            getTotal();
+        });
         adapter = new RechargeAdapter(this, rechargeList);
         rechargeListBinding.rechargeList.setAdapter(adapter);
     }
@@ -99,21 +107,26 @@
         endDatePicker = new CustomDatePicker(this, "閫夋嫨缁撴潫鏃堕棿", new CustomDatePicker.Callback() {
             @Override
             public void onTimeSelected(long timestamp) {
-//                endTime = timestamp;
-//                if ((endTime < beginTime) && endTime != beginTime) {
-//                    ToastUtil.show(RechargeListActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
-//                } else {
-//                    try {
-//                        endTime = endTime + (1000 * 60 * 60 * 24) - 1;
-//                        List<RechargeBean> userList = SqLite_DB_Utile.getInit(RechargeListActivity.this).selector(RechargeBean.class).where("date", ">=", beginTime).and("date", "<=", endTime).findAll();
-//                        rechargeList.clear();
-//                        rechargeList.addAll(userList);
-//                        adapter.notifyDataSetChanged();
-//                        getTotal();
-//                    } catch (DbException e) {
-//                        e.printStackTrace();
-//                    }
-//                }
+                endTime = timestamp;
+                if ((endTime < beginTime) && endTime != beginTime) {
+                    TipUtil.show(RechargeListActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
+                } else {
+                    endTime = endTime + (1000 * 60 * 60 * 24) - 1;
+
+                    rechargeListModel.getRechargeList(beginTime, endTime).observe(RechargeListActivity.this, list -> {
+                        if (rechargeList != null) {
+                            rechargeList.clear();
+                            rechargeList.addAll(list);
+                            adapter.notifyDataSetChanged();
+                            getTotal();
+                        } else {
+                            TipUtil.show(RechargeListActivity.this, "鏈煡璇㈠埌鏁版嵁!");
+                        }
+
+                    });
+
+
+                }
             }
         }, beginTimestamp, endTimestamp);
         // 涓嶅厑璁哥偣鍑诲睆骞曟垨鐗╃悊杩斿洖閿叧闂�

--
Gitblit v1.8.0