From 15d9aae9a65c3385aaea29cb6d9810e4a8e8bd27 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 07 五月 2024 11:04:45 +0800
Subject: [PATCH] 1.修复开卡列表显示异常bug 2.实现读卡界面相关功能 3.所有Activity去掉齐河后缀

---
 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
similarity index 87%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
index 312b576..2184a4f 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
@@ -34,7 +34,7 @@
  * Date: 2023-11-10 19:52
  * Description: 涓汉涓績
  */
-public class MyActivityQHAlone extends BaseActivityQHAlone {
+public class MyActivity extends BaseActivity {
 
 
     private CustomDatePicker beginDatePicker;
@@ -60,13 +60,13 @@
         myBinding.cardReplacement.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(MyActivityQHAlone.this, ReplacementActivityQHAlone.class));
+                startActivity(new Intent(MyActivity.this, ReplacementActivity.class));
             }
         });
         myBinding.myAdmin.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                PassWordDialog passWordDialog = new PassWordDialog(MyActivityQHAlone.this, new Intent(MyActivityQHAlone.this, AdminSetupActivityQHAlone.class));
+                PassWordDialog passWordDialog = new PassWordDialog(MyActivity.this, new Intent(MyActivity.this, AdminSetupActivity.class));
                 passWordDialog.show();
 //                startActivity(new Intent(MyActivity.this, AdminSetupActivity.class));
             }
@@ -74,19 +74,19 @@
         myBinding.myPsw.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(MyActivityQHAlone.this, PassWordActivityQHAlone.class));
+                startActivity(new Intent(MyActivity.this, PassWordActivity.class));
             }
         });
         myBinding.myRechargeListLl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(MyActivityQHAlone.this, RechargeListActivityQHAlone.class));
+                startActivity(new Intent(MyActivity.this, RechargeListActivity.class));
             }
         });
         myBinding.myNewCardListLl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(MyActivityQHAlone.this, NewCardListActivityQHAlone.class));
+                startActivity(new Intent(MyActivity.this, NewCardListActivity.class));
             }
         });
         myBinding.myNewCardOut.setOnClickListener(new View.OnClickListener() {
@@ -113,13 +113,13 @@
         public boolean handleMessage(@NonNull Message msg) {
             switch (msg.what) {
                 case 1:
-                    TipUtil.show(MyActivityQHAlone.this, "瀵煎嚭鎴愬姛!");
+                    TipUtil.show(MyActivity.this, "瀵煎嚭鎴愬姛!");
                     break;
                 case 3:
-                    TipUtil.show(MyActivityQHAlone.this, "璁板綍涓虹┖!");
+                    TipUtil.show(MyActivity.this, "璁板綍涓虹┖!");
                     break;
                 default:
-                    TipUtil.show(MyActivityQHAlone.this, "瀵煎嚭澶辫触!");
+                    TipUtil.show(MyActivity.this, "瀵煎嚭澶辫触!");
                     break;
             }
             stopAnim();
@@ -159,7 +159,7 @@
                         String[] title;
                         String fileName;
                         if (listData == null || listData.size() == 0) {
-                            TipUtil.show(MyActivityQHAlone.this, "璁板綍涓虹┖");
+                            TipUtil.show(MyActivity.this, "璁板綍涓虹┖");
                             return;
                         }
                         if (isRechargeList) {
@@ -170,7 +170,7 @@
                             fileName = file.toString() + "/" + ExcelUtil.outUserPathName;
                         }
                         ExcelUtil.initExcel(fileName, title);
-                        ExcelUtil.writeObjListToExcel(listData, fileName, MyActivityQHAlone.this);
+                        ExcelUtil.writeObjListToExcel(listData, fileName, MyActivity.this);
                         handler.sendEmptyMessage(1);
                     } catch (Exception e) {
                         handler.sendEmptyMessage(2);
@@ -205,11 +205,11 @@
         try {
             adminData = baseDao.adminDao().findFirst();
             if (adminData != null) {
-                myBinding.myAdminName.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
+                myBinding.myAdminName.setText(adminData.getAddressCode());
                 myBinding.myVillageNum.setText(adminData.getSerial());
             } else {
-                myBinding.myAdminName.setText("璇风偣鍑诲湴鍧�淇℃伅璁剧疆");
-                myBinding.myVillageNum.setText("璇风偣鍑诲湴鍧�淇℃伅璁剧疆");
+                myBinding.myAdminName.setText("璇风偣鍑诲尯鍩熷彿璁剧疆");
+                myBinding.myVillageNum.setText("璇风偣鍑诲尯鍩熷彿璁剧疆");
             }
             StringBuilder msgData = new StringBuilder();
 
@@ -259,7 +259,7 @@
             public void onTimeSelected(long timestamp) {
                 endTime = timestamp;
                 if ((endTime < beginTime) && endTime != beginTime) {
-                    TipUtil.show(MyActivityQHAlone.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
+                    TipUtil.show(MyActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
                 } else {
                     try {
                         endTime = endTime + (1000 * 60 * 60 * 24) - 1;

--
Gitblit v1.8.0