From feb7add1979c830e0d940286242a7c489f2f8f96 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期五, 27 九月 2024 09:23:34 +0800 Subject: [PATCH] 优化NFC模块架构,将一些方法抽调到父类中。 --- qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivityQHOline.java | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivityQHOline.java similarity index 81% rename from qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivity.java rename to qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivityQHOline.java index ba6c3fa..8895779 100644 --- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivity.java +++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivityQHOline.java @@ -3,7 +3,6 @@ import android.content.Intent; import android.nfc.NfcAdapter; import android.os.Bundle; -import android.text.TextUtils; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; @@ -14,12 +13,9 @@ import com.dayu.baselibrary.view.ConfirmDialog; import com.dayu.qiheonlinelibrary.QHOnLineApplication; import com.dayu.qiheonlinelibrary.card.ManageCard; -import com.dayu.qiheonlinelibrary.card.ManagerToUserCard; -import com.dayu.qiheonlinelibrary.databinding.ActivityManagerReadQhlBinding; import com.dayu.qiheonlinelibrary.databinding.ActivityManagerWriteQhlBinding; import com.dayu.qiheonlinelibrary.tools.NFCWriteHelper; import com.dayu.qiheonlinelibrary.tools.NfcReadHelper; -import com.dayu.qiheonlinelibrary.utils.CardCommon; import com.dayu.qiheonlinelibrary.view.ProgressDialog; @@ -29,7 +25,7 @@ * Time: 11:05 * 澶囨敞锛氬埗浣滅鐞嗗崱 */ -public class ManagerWriteActivity extends BaseNfcActivity { +public class ManagerWriteActivityQHOline extends QHOlineBaseNfcActivity { ActivityManagerWriteQhlBinding binding; Intent intent; @@ -57,17 +53,17 @@ //宸插畬鎴愮浜屾 if (number == 2) { if (type == BaseCommon.REPLACE_NO_CARD) { - Intent intent = new Intent(ManagerWriteActivity.this, NFCWreatActivity.class); + Intent intent = new Intent(ManagerWriteActivityQHOline.this, NFCWreatActivityQHOline.class); intent.putExtra("iccardInfoId", iccardInfoId); intent.putExtra("replaceType", type); startActivity(intent); - ManagerWriteActivity.this.finish(); + ManagerWriteActivityQHOline.this.finish(); } else { TipUtil.show(this, "璇峰湪鎺у埗鍣ㄧ鍒峰崱鍚庡湪棣栭〉鐐瑰嚮琛ュ崱鍐嶇偣鍑绘车鏈叧鍐欏崱鍚庣户缁ˉ鍗★紒", () -> { - ManagerWriteActivity.this.finish(); - if (UserSearchActivity.userSearchActivity != null) { - UserSearchActivity.userSearchActivity.finish(); - UserSearchActivity.userSearchActivity = null; + ManagerWriteActivityQHOline.this.finish(); + if (UserSearchActivityQHOline.userSearchActivity != null) { + UserSearchActivityQHOline.userSearchActivity.finish(); + UserSearchActivityQHOline.userSearchActivity = null; } }); @@ -79,14 +75,14 @@ }); } + @Override - public void onNewIntent(Intent intent) { + public void onNfcBack(Intent intent) { this.intent = intent; ProgressDialog.show(this); if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(intent.getAction())) { getCardNumber(); } - super.onNewIntent(intent); } @@ -136,9 +132,9 @@ } private void back() { - confirmDialog = new ConfirmDialog(ManagerWriteActivity.this, "姝e湪琛ュ崱锛岀‘瀹氶��鍑哄悧锛�", v -> { + confirmDialog = new ConfirmDialog(ManagerWriteActivityQHOline.this, "姝e湪琛ュ崱锛岀‘瀹氶��鍑哄悧锛�", v -> { confirmDialog.dismiss(); - ManagerWriteActivity.this.finish(); + ManagerWriteActivityQHOline.this.finish(); }); confirmDialog.show(); } -- Gitblit v1.8.0