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/NewCardActivity.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java b/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
index 007a915..0d5db30 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
@@ -2,7 +2,6 @@
import android.Manifest;
import android.app.Dialog;
-import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Bundle;
import android.text.InputFilter;
@@ -12,6 +11,7 @@
import android.view.View;
import com.dayu.recharge.utils.DeviceNumberUtils;
+import com.dayu.recharge.view.ProgressDialog;
import com.msd.ocr.idcard.LibraryInitOCR;
import com.dayu.recharge.MyApplication;
import com.dayu.recharge.card.UserCard;
@@ -100,7 +100,6 @@
TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭韩浠借瘉鍙�");
return;
} else {
- dialog = ProgressDialog.show(NewCardActivity.this, "", "姝ｅ湪閫氫俊璇风◢鍚�", true, true);
userCardBean = new UserCardBean();
userCardBean.setUserName(userName);
userCardBean.setDate(date);
@@ -194,7 +193,7 @@
* 寮�鍗℃姤鏂�
*/
private void initCard() {
-
+ ProgressDialog.show(this);
String initCode = DeviceNumberUtils.getDeviceNumber();
if (TextUtils.isEmpty(initCode)) {
TipUtil.show(this, "璁惧娉ㄥ唽鍙蜂负绌猴紝璇峰厛璁剧疆IP鍜岀鐞嗗憳鍦板潃");
@@ -224,7 +223,7 @@
@Override
public void onSocketResponse(SocketData readData) {
- dialog.dismiss();
+ ProgressDialog.dismiss();
if (CRC8.isCRC8(readData.getOriginDataBytes())) {
String state = BcdUtil.bcdToStr(readData.getBodyBytes()[26]); //BCD鐮�00鎴愬姛01韬唤璇佸凡娉ㄥ唽02鍏朵粬鍘熷洜澶辫触
@@ -272,7 +271,7 @@
@Override
public void onSocketError(int code, String msg) {
- dialog.dismiss();
+ ProgressDialog.dismiss();
TipUtil.show(NewCardActivity.this, msg);
}
});
@@ -321,6 +320,10 @@
return (c >= 0x4e00 && c <= 0x9fa5);
}
}
-
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ newCardActivity=null;
+ }
}
--
Gitblit v1.8.0