From 6a5879320dfac43155d024814a0a4d794a612696 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 21 八月 2024 13:52:14 +0800
Subject: [PATCH] 齐河联网版程序除补卡相关逻辑

---
 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivity.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivity.java
index 73a2a7d..ba6c3fa 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerWriteActivity.java
@@ -8,6 +8,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 
+import com.dayu.baselibrary.tools.HexUtil;
 import com.dayu.baselibrary.utils.BaseCommon;
 import com.dayu.baselibrary.utils.TipUtil;
 import com.dayu.baselibrary.view.ConfirmDialog;
@@ -62,8 +63,13 @@
                     startActivity(intent);
                     ManagerWriteActivity.this.finish();
                 } else {
-                    TipUtil.show(this, "璇峰湪鎺у埗鍣ㄧ鍒峰崱鍚庡湪棣栭〉鐐瑰嚮娉垫湭鍏冲啓鍗″悗缁х画琛ュ崱锛�", () -> {
+                    TipUtil.show(this, "璇峰湪鎺у埗鍣ㄧ鍒峰崱鍚庡湪棣栭〉鐐瑰嚮琛ュ崱鍐嶇偣鍑绘车鏈叧鍐欏崱鍚庣户缁ˉ鍗★紒", () -> {
                         ManagerWriteActivity.this.finish();
+                        if (UserSearchActivity.userSearchActivity != null) {
+                            UserSearchActivity.userSearchActivity.finish();
+                            UserSearchActivity.userSearchActivity = null;
+                        }
+
                     });
                 }
 
@@ -95,18 +101,21 @@
         }
         ManageCard manageCard = new ManageCard();
         manageCard.setArerNumber(Integer.valueOf(QHOnLineApplication.getInstance().arerNumber));
+        oldCardNumber = HexUtil.spaceHex(oldCardNumber);
+        oldCardNumber = HexUtil.HighLowHex(oldCardNumber);
         manageCard.setUserCard(oldCardNumber);
         manageCard.setCardWriteState((byte) 0);
         if (NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toByte(baseDao), 1, 0)) {
             isCreatManagerCard = true;
             number = 2;
             binding.number2.setVisibility(View.VISIBLE);
+            TipUtil.show(this, "绠$悊鍗″埗鍗℃垚鍔燂紝璇峰湪鎺у埗鍣ㄧ鍒峰崱");
+            ProgressDialog.dismiss();
         } else {
             isCreatManagerCard = false;
         }
 
-        TipUtil.show(this, "绠$悊鍗″埗鍗℃垚鍔燂紝璇峰湪鎺у埗鍣ㄧ鍒峰崱");
-        ProgressDialog.dismiss();
+
 
     }
 

--
Gitblit v1.8.0