From 9c11fb9a45b0f1ff2a86eb139078e5361216434b Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 29 十一月 2023 14:59:10 +0800
Subject: [PATCH] 读取模拟卡修改后注释(未完成)

---
 app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 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 6c0b70e..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,11 +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;
 
 /**
@@ -26,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) {
@@ -46,8 +50,13 @@
 
     private void setData() {
 
-        rechargeList = baseDao.rechargeDao().findAll();
-
+        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);
     }
@@ -103,11 +112,19 @@
                     TipUtil.show(RechargeListActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
                 } else {
                     endTime = endTime + (1000 * 60 * 60 * 24) - 1;
-                    List<RechargeBean> userList = baseDao.rechargeDao().findByTime(beginTime, endTime);
-                    rechargeList.clear();
-                    rechargeList.addAll(userList);
-                    adapter.notifyDataSetChanged();
-                    getTotal();
+
+                    rechargeListModel.getRechargeList(beginTime, endTime).observe(RechargeListActivity.this, list -> {
+                        if (rechargeList != null) {
+                            rechargeList.clear();
+                            rechargeList.addAll(list);
+                            adapter.notifyDataSetChanged();
+                            getTotal();
+                        } else {
+                            TipUtil.show(RechargeListActivity.this, "鏈煡璇㈠埌鏁版嵁!");
+                        }
+
+                    });
+
 
                 }
             }

--
Gitblit v1.8.0