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 |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 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 588fcaf..9ad290f 100644
--- a/app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java
@@ -35,6 +35,8 @@
     long beginTime;
     long endTime;
 
+    RechargeListModel rechargeListModel;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -48,11 +50,12 @@
 
     private void setData() {
 
-        RechargeListModel rechargeListModel = new RechargeListModel(this);
-        rechargeListModel.getRechargeList().observe(this, myList -> {
+        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);
@@ -109,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