From 50f6dd3b617f769e7fc6094c2dd0752747541489 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 23 十一月 2023 18:04:05 +0800
Subject: [PATCH] 修复导出充值记录bug 优化充值记录加载逻辑和速度 优化导出记录逻辑
---
app/src/main/java/com/dayu/recharge/activity/MyActivity.java | 137 +++++++++++++++++++++++++++++----------------
1 files changed, 87 insertions(+), 50 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/activity/MyActivity.java b/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
index 18d07ee..69f46bc 100644
--- a/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
@@ -6,17 +6,21 @@
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
+
+import androidx.annotation.NonNull;
import com.dayu.recharge.MyApplication;
import com.dayu.recharge.databinding.ActivityMyBinding;
import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.recharge.net.SocketNet;
+import com.dayu.recharge.utils.DeviceNumberUtils;
import com.dayu.recharge.utils.ExcelUtil;
-import com.dayu.recharge.utils.ToastUtil;
-import com.dayu.recharge.utils.WSHelper;
+import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.view.PassWordDialog;
import com.dayu.recharge.view.datepicker.CustomDatePicker;
import com.dayu.recharge.view.datepicker.DateFormatUtils;
@@ -55,12 +59,18 @@
}
private void initView() {
+ myBinding.cardReplacement.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(new Intent(MyActivity.this, ReplacementActivity.class));
+ }
+ });
myBinding.myAdmin.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-// PassWordDialog passWordDialog = new PassWordDialog(MyActivity.this, new Intent(MyActivity.this, AdminSetupActivity.class));
-// passWordDialog.show();
- startActivity(new Intent(MyActivity.this, AdminSetupActivity.class));
+ PassWordDialog passWordDialog = new PassWordDialog(MyActivity.this, new Intent(MyActivity.this, AdminSetupActivity.class));
+ passWordDialog.show();
+// startActivity(new Intent(MyActivity.this, AdminSetupActivity.class));
}
});
myBinding.myPsw.setOnClickListener(new View.OnClickListener() {
@@ -105,49 +115,80 @@
myBinding.sysIp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(MyActivity.this, SysIpActivity.class);
- startActivity(intent);
+ PassWordDialog passWordDialog = new PassWordDialog(MyActivity.this, new Intent(MyActivity.this, SysIpActivity.class));
+ passWordDialog.show();
+
}
});
}
+
+ Handler handler = new Handler(new Handler.Callback() {
+ @Override
+ public boolean handleMessage(@NonNull Message msg) {
+ switch (msg.what) {
+ case 1:
+ TipUtil.show(MyActivity.this, "瀵煎嚭鎴愬姛!");
+ break;
+ default:
+ TipUtil.show(MyActivity.this, "瀵煎嚭澶辫触!");
+ break;
+ }
+ stopAnim();
+ return false;
+ }
+ });
/**
* 瀵煎嚭鎴怑xcel
*/
private void outExcl() {
startAnim();
- File file = new File(ExcelUtil.outPath);
- //鏂囦欢澶规槸鍚﹀凡缁忓瓨鍦�
- if (!file.exists()) {
- file.mkdirs();
- }
- List listData = new ArrayList();
- try {
-// if (isRechargeList) {
-// listData = SqLite_DB_Utile.getInit(MyActivity.this).selector(RechargeBean.class).where("date", ">=", beginTime).and("date", "<=", endTime).findAll();
-// } else {
-// listData = SqLite_DB_Utile.getInit(MyActivity.this).selector(UserCardBean.class).where("date", ">=", beginTime).and("date", "<=", endTime).findAll();
-// }
- } catch (Exception e) {
- e.printStackTrace();
- }
- String[] title;
- String fileName;
- if (listData == null || listData.size() == 0) {
- ToastUtil.show(MyActivity.this, "璁板綍涓虹┖");
- return;
- }
- if (isRechargeList) {
- title = new String[]{"鏉戝彿", "鐢ㄦ埛鍚�", "鎴峰彿", "鍏呭�兼棩鏈�", "鍏呭�奸噾棰濓紙鍏冿級", "鍓╀綑閲戦锛堝厓锛�"};
- fileName = file.toString() + "/" + ExcelUtil.outRechargePathName;
- } else {
- title = new String[]{"鏉戝彿", "鐢ㄦ埛鍚�", "鎴峰彿", "娉ㄥ唽鏃ユ湡", "鐢佃瘽", "姘存潈鍐呮按閲�", "浜╂暟", "鐘舵��"};
- fileName = file.toString() + "/" + ExcelUtil.outUserPathName;
- }
- ExcelUtil.initExcel(fileName, title);
- ExcelUtil.writeObjListToExcel(listData, fileName, MyActivity.this);
- stopAnim();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ {
+ try {
+ File file = new File(ExcelUtil.outPath);
+ //鏂囦欢澶规槸鍚﹀凡缁忓瓨鍦�
+ if (!file.exists()) {
+ file.mkdirs();
+ }
+ List listData = new ArrayList();
+ try {
+ if (isRechargeList) {
+ listData = asynchBaseDao.rechargeDao().ansyFindByTime(beginTime, endTime);
+ } else {
+ listData = baseDao.userCardDao().findByTime(beginTime, endTime);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ String[] title;
+ String fileName;
+ if (listData == null || listData.size() == 0) {
+ TipUtil.show(MyActivity.this, "璁板綍涓虹┖");
+ return;
+ }
+ if (isRechargeList) {
+ title = new String[]{"璁惧搴忓垪鍙�", "鐢ㄦ埛鍚�", "韬唤璇佸彿", "鍏呭�兼棩鏈�", "鍏呭�奸噾棰濓紙鍏冿級", "鍓╀綑閲戦锛堝厓锛�"};
+ fileName = file.toString() + "/" + ExcelUtil.outRechargePathName;
+ } else {
+ title = new String[]{"璁惧搴忓垪鍙�", "鐢ㄦ埛鍚�", "韬唤璇佸彿", "娉ㄥ唽鏃ユ湡", "鐢佃瘽"};
+ fileName = file.toString() + "/" + ExcelUtil.outUserPathName;
+ }
+ ExcelUtil.initExcel(fileName, title);
+ ExcelUtil.writeObjListToExcel(listData, fileName, MyActivity.this);
+ handler.sendEmptyMessage(1);
+ } catch (Exception e) {
+ handler.sendEmptyMessage(2);
+ e.printStackTrace();
+ }
+ }
+ }
+ }).start();
+
+
}
void getVersion(Activity context) {
@@ -172,23 +213,19 @@
try {
adminData = baseDao.adminDao().findFirst();
if (adminData != null) {
- myBinding.myAdminName.setText(adminData.getName());
+ myBinding.myAdminName.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
myBinding.myVillageNum.setText(adminData.getSerial());
} else {
- myBinding.myAdminName.setText("璇风偣鍑荤鐞嗗憳璁剧疆");
- myBinding.myVillageNum.setText("璇风偣鍑荤鐞嗗憳璁剧疆");
+ myBinding.myAdminName.setText("璇风偣鍑诲湴鍧�淇℃伅璁剧疆");
+ myBinding.myVillageNum.setText("璇风偣鍑诲湴鍧�淇℃伅璁剧疆");
}
StringBuilder msgData = new StringBuilder();
- if (MyApplication.myApplication.isConncet) {
- msgData.append("宸茶繛鎺ユ暟鎹腑蹇�");
- } else {
- msgData.append("鏈繛鎺ユ暟鎹腑蹇�");
- }
- String initCode = WSHelper.getInstance(this).get("initCode", "");
+
+ String initCode = DeviceNumberUtils.getDeviceNumber();
if (TextUtils.isEmpty(initCode)) {
- msgData.append(",璁惧鏈敞鍐�");
+ msgData.append("璁惧鏈敞鍐�");
} else {
- msgData.append(",璁惧宸叉敞鍐�,璁惧娉ㄥ唽鍙凤細" + initCode);
+ msgData.append("璁惧娉ㄥ唽鍙凤細" + initCode);
}
myBinding.myTestConnect.setText(msgData);
} catch (Exception e) {
@@ -230,7 +267,7 @@
public void onTimeSelected(long timestamp) {
endTime = timestamp;
if ((endTime < beginTime) && endTime != beginTime) {
- ToastUtil.show(MyActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
+ TipUtil.show(MyActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
} else {
try {
endTime = endTime + (1000 * 60 * 60 * 24) - 1;
--
Gitblit v1.8.0