From 9cffe03d76840520bfbfeaf85933fcb2ed8385b8 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 05 三月 2025 10:19:46 +0800
Subject: [PATCH] feat(generallibrary): 新增主界面和相关功能模块 - 新增 MainActivity 作为主界面,包含三个底部导航栏选项卡- 新增 BSCardFragment、RechargeFragment 和 MyFragment 作为三个选项卡对应的页面 - 新增 NewCardActivity 用于新建卡片 - 新增 AreaCard 类用于处理区域表号卡数据 - 新增 BaseCard 类作为卡片数据的基础类 - 新增 TabAdapter 用于管理选项卡页面 - 更新 AndroidManifest.xml 设置主活动为 MainActivity - 更新 build.gradle 添加 generallibrary 依赖

---
 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java
index a359ef0..1df455d 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java
@@ -7,6 +7,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 
+import com.dayu.baselibrary.net.subscribers.SubscriberListener;
 import com.dayu.baselibrary.utils.MornyUtil;
 import com.dayu.baselibrary.utils.TipUtil;
 import com.dayu.baselibrary.view.ConfirmDialog;
@@ -22,7 +23,6 @@
 import com.dayu.qiheonlinelibrary.dbBean.AdminDataBean;
 import com.dayu.qiheonlinelibrary.net.ApiManager;
 import com.dayu.qiheonlinelibrary.net.BaseResponse;
-import com.dayu.qiheonlinelibrary.net.subscribers.SubscriberListener;
 import com.dayu.qiheonlinelibrary.tools.NfcReadHelper;
 import com.dayu.qiheonlinelibrary.utils.CardCommon;
 import com.dayu.qiheonlinelibrary.view.ProgressDialog;
@@ -37,7 +37,7 @@
  * Date: 2023-11-10 19:52
  * Description: 璇诲崱鐣岄潰
  */
-public class ReadCardAcitivy extends BaseNfcActivity {
+public class ReadCardAcitivy extends QHOlineBaseNfcActivity {
 
     volatile UserCard userCard;
     ActivityRedCardQhlBinding redCardBinding;
@@ -57,14 +57,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())) {
             readAllData(intent);
         }
-        super.onNewIntent(intent);
     }
 
     /**
@@ -97,7 +97,7 @@
 
                 if (!data.isEmpty()) {
                     if (!TextUtils.isEmpty(cardNumber)) {
-                        userCard = UserCard.getBean(data);
+                        userCard = new UserCard().getBean(data);
                         getUserInfoAndCardInfo(cardNumber,userCard.getMyUserCode());
                     } else {
 

--
Gitblit v1.8.0