From 732e4481b8437719468cddfb4971ee54a4b36625 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 02 四月 2024 09:48:38 +0800
Subject: [PATCH] 修复设备序列号没有设置地址时一直变化的bug
---
app/src/main/java/com/dayu/recharge/activity/MyActivity.java | 215 +++++++++++++++++++++++++----------------------------
1 files changed, 101 insertions(+), 114 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 a5e7f17..9e604b5 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,17 @@
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
+import android.os.Handler;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
-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,98 +55,95 @@
}
private void initView() {
- 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();
- }
+ myBinding.cardReplacement.setOnClickListener(v -> startActivity(new Intent(MyActivity.this, ReplacementActivity.class)));
+ myBinding.myAdmin.setOnClickListener(v -> {
+ 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() {
- @Override
- public void onClick(View v) {
- startActivity(new Intent(MyActivity.this, PassWordActivity.class));
- }
+ myBinding.myPsw.setOnClickListener(v -> startActivity(new Intent(MyActivity.this, PassWordActivity.class)));
+ myBinding.myRechargeListLl.setOnClickListener(v -> startActivity(new Intent(MyActivity.this, RechargeListActivity.class)));
+ myBinding.myNewCardListLl.setOnClickListener(v -> startActivity(new Intent(MyActivity.this, NewCardListActivity.class)));
+ myBinding.myNewCardOut.setOnClickListener(v -> {
+ isRechargeList = false;
+ beginDatePicker.show(System.currentTimeMillis());
});
- myBinding.myRechargeListLl.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- startActivity(new Intent(MyActivity.this, RechargeListActivity.class));
- }
+ myBinding.myRechargeOut.setOnClickListener(v -> {
+ isRechargeList = true;
+ beginDatePicker.show(System.currentTimeMillis());
});
- myBinding.myNewCardListLl.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- startActivity(new Intent(MyActivity.this, NewCardListActivity.class));
- }
- });
- myBinding.myNewCardOut.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- isRechargeList = false;
- beginDatePicker.show(System.currentTimeMillis());
- }
- });
- myBinding.myRechargeOut.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- isRechargeList = true;
- beginDatePicker.show(System.currentTimeMillis());
- }
- });
- myBinding.myTestConnect.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- SocketNet.getInstance().isConnect(MyActivity.this);
+ myBinding.myTestConnect.setOnClickListener(v -> SocketNet.getInstance().isConnect(MyActivity.this));
- }
- });
- myBinding.sysIp.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(MyActivity.this, SysIpActivity.class);
- startActivity(intent);
- }
- });
}
+
+ Handler handler = new Handler(msg -> {
+ switch (msg.what) {
+ case 1:
+ TipUtil.show(MyActivity.this, "瀵煎嚭鎴愬姛!");
+ break;
+ case 3:
+ 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(() -> {
+ {
+ 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 = asynchBaseDao.userCardDao().findByTime(beginTime, endTime);
+ }
+ if (listData == null || listData.size() == 0) {
+ handler.sendEmptyMessage(2);
+ return;
+ }
+ } 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) {
@@ -170,24 +167,20 @@
AdminDataBean adminData;
try {
adminData = baseDao.adminDao().findFirst();
- if (adminData != null) {
- myBinding.myAdminName.setText(adminData.getName());
+ if (adminData.isHasAddressCode()) {
+ 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("璁惧娉ㄥ唽鍙凤細").append(initCode);
}
myBinding.myTestConnect.setText(msgData);
} catch (Exception e) {
@@ -208,12 +201,9 @@
final long endTimestamp = System.currentTimeMillis();
// 閫氳繃鏃堕棿鎴冲垵濮嬪寲鏃ユ湡锛屾绉掔骇鍒�
- beginDatePicker = new CustomDatePicker(this, "閫夋嫨寮�濮嬫椂闂�", new CustomDatePicker.Callback() {
- @Override
- public void onTimeSelected(long timestamp) {
- beginTime = timestamp;
- endDatePicker.show(timestamp);
- }
+ beginDatePicker = new CustomDatePicker(this, "閫夋嫨寮�濮嬫椂闂�", timestamp -> {
+ beginTime = timestamp;
+ endDatePicker.show(timestamp);
}, beginTimestamp, endTimestamp);
// 涓嶅厑璁哥偣鍑诲睆骞曟垨鐗╃悊杩斿洖閿叧闂�
beginDatePicker.setCancelable(false);
@@ -224,19 +214,16 @@
// 涓嶅厑璁告粴鍔ㄥ姩鐢�
beginDatePicker.setCanShowAnim(false);
- endDatePicker = new CustomDatePicker(this, "閫夋嫨缁撴潫鏃堕棿", new CustomDatePicker.Callback() {
- @Override
- public void onTimeSelected(long timestamp) {
- endTime = timestamp;
- if ((endTime < beginTime) && endTime != beginTime) {
- ToastUtil.show(MyActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
- } else {
- try {
- endTime = endTime + (1000 * 60 * 60 * 24) - 1;
- outExcl();
- } catch (Exception e) {
- e.printStackTrace();
- }
+ endDatePicker = new CustomDatePicker(this, "閫夋嫨缁撴潫鏃堕棿", timestamp -> {
+ endTime = timestamp;
+ if ((endTime < beginTime) && endTime != beginTime) {
+ TipUtil.show(MyActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
+ } else {
+ try {
+ endTime = endTime + (1000 * 60 * 60 * 24) - 1;
+ outExcl();
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
}, beginTimestamp, endTimestamp);
--
Gitblit v1.8.0