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去掉齐河后缀 --- henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java index b409ef6..6a1df4c 100644 --- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java +++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java @@ -12,6 +12,7 @@ import com.dayu.baselibrary.tools.BcdUtil; import com.dayu.baselibrary.utils.AidlUtil; +import com.dayu.baselibrary.utils.BaseCommon; import com.dayu.baselibrary.utils.CRC8; import com.dayu.baselibrary.utils.DateUtil; import com.dayu.baselibrary.utils.MornyUtil; @@ -253,11 +254,11 @@ ) { binding.textView.setText("璇ュ崱宸茬粡鍐欏叆鐢ㄦ埛淇℃伅锛岃鏇存崲鍗$墖"); binding.textView.setTextColor(getResources().getColor(com.dayu.baselibrary.R.color.red)); - } else if (cardType.equals("-1")) { + } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR1)) { TipUtil.show(NFCWreatActivity.this, "璇峰嬁绉诲姩鍗$墖锛岃鍗″け璐ヨ閲嶈瘯锛侊紒"); - } else if (cardType.equals("-2")) { - TipUtil.show(NFCWreatActivity.this, "璇诲崱澶辫触,璇锋鏌ュ崱鏄惁鏄敤鎴峰崱"); - } else { + } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR2)) { + TipUtil.show(NFCWreatActivity.this, "锛屽崱鐗囨湭鑳借瘑鍒紝璇锋鏌ュ崱鐗囨槸鍚︽槸鏈叕鍙稿崱鐗�"); + } else { Log.i("NFCWreatActivity", "olduserCard!=null saveData"); saveData(); } -- Gitblit v1.8.0