From 2b11b80884fbdbc05bd8f8a76515616306a03a0a Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 12 八月 2024 09:56:36 +0800
Subject: [PATCH] 齐河联网版程序除补卡相关逻辑
---
/dev/null | 17 -----
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java | 30 +++++++--
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java | 45 ++++++++++----
qiheonlinelibrary/src/main/res/layout/activity_home_qhl.xml | 1
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java | 2
qiheonlinelibrary/src/main/res/layout/activity_manager_read_qhl.xml | 40 ++++++++++++-
6 files changed, 93 insertions(+), 42 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java
index 93e20e2..bbe4343 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/CardSearchActivity.java
@@ -48,6 +48,7 @@
List<CardInfoListResult.Records> records = new ArrayList<>();
int type;
ConfirmDialog confirmDialog;
+ CardInfoListResult.Records mRecord;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -75,6 +76,7 @@
adapter = new CardAdapter(this, records, new CardAdapter.OnItemClickListener() {
@Override
public void onItemClick(int position) {
+ mRecord = records.get(position);
String title;
if (type == BaseCommon.LOSS_CARD) {
title = "鎸傚け鍗＄墖";
@@ -86,14 +88,21 @@
String data = "鍗″彿锛�" + records.get(position).getIccardNum();
confirmDialog = new ConfirmDialog(CardSearchActivity.this, title, data, v -> {
- String iccardInfoId = records.get(position).getIccardInfoId();
+ String iccardInfoId = mRecord.getIccardInfoId();
if (type == BaseCommon.LOSS_CARD) {
lossCard(iccardInfoId);
} else if (type == BaseCommon.REPORT_LOSS_CARD) {
reportLossCard(iccardInfoId);
- } else if (type == BaseCommon.REPLACE_HAS_CARD) {
-
- } else if (type == BaseCommon.REPLACE_NO_CARD) {
+ } else if (type == BaseCommon.REPLACE_HAS_CARD) {//鏈叧娉佃ˉ鍗�
+ //琛ュ崱鍓嶉渶瑕佸厛鎸傚け
+ if (mRecord.getIccardStatus() == 0) {
+ lossCard(iccardInfoId);
+ } else if (mRecord.getIccardStatus() == 2) {
+ startManagerActivity(iccardInfoId, mRecord.getIccardNum());
+ } else {
+ TipUtil.show("褰撳墠鍗＄姸鎬佷笉鑳藉啀琛ュ崱");
+ }
+ } else if (type == BaseCommon.REPLACE_NO_CARD) {//宸插叧娉佃ˉ鍗�
//琛ュ崱鍓嶉渶瑕佸厛鎸傚け
if (records.get(position).getIccardStatus() == 0) {
lossCard(iccardInfoId);
@@ -102,14 +111,10 @@
} else {
TipUtil.show("褰撳墠鍗＄姸鎬佷笉鑳藉啀琛ュ崱");
}
-
-
}
confirmDialog.dismiss();
});
confirmDialog.show();
-
-
}
});
LinearLayoutManager layoutManager = new LinearLayoutManager(this);
@@ -213,4 +218,13 @@
startActivity(intent);
CardSearchActivity.this.finish();
}
+
+ private void startManagerActivity(String iccardInfoId, String oldCardNumber) {
+ Intent intent = new Intent(CardSearchActivity.this, ManagerReadActivity.class);
+ intent.putExtra("iccardInfoId", iccardInfoId);
+ intent.putExtra("replaceType", type);
+ intent.putExtra("oldCardNumber", oldCardNumber);
+ startActivity(intent);
+ CardSearchActivity.this.finish();
+ }
}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManageSetUpActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManageSetUpActivity.java
deleted file mode 100644
index 5e01d41..0000000
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManageSetUpActivity.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dayu.qiheonlinelibrary.activity;
-
-import android.os.Bundle;
-
-/**
- * Copyright (C), 2023,
- * Author: zuo
- * Date: 2023-11-08 16:52
- * Description:绠＄悊鍗¤缃晫闈�
- */
-public class ManageSetUpActivity extends BaseActivity {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- }
-}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java
index 30eae44..9cbb9ab 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java
@@ -7,7 +7,9 @@
import android.view.LayoutInflater;
import com.dayu.baselibrary.utils.TipUtil;
+import com.dayu.qiheonlinelibrary.card.ManageCard;
import com.dayu.qiheonlinelibrary.databinding.ActivityManagerReadQhlBinding;
+import com.dayu.qiheonlinelibrary.tools.NFCWriteHelper;
import com.dayu.qiheonlinelibrary.tools.NfcReadHelper;
import com.dayu.qiheonlinelibrary.view.ProgressDialog;
@@ -16,19 +18,37 @@
* author: zuo
* Date: 2024-05-09
* Time: 11:05
- * 澶囨敞锛�
+ * 澶囨敞锛氬埗浣滅鐞嗗崱
*/
public class ManagerReadActivity extends BaseNfcActivity {
ActivityManagerReadQhlBinding binding;
Intent intent;
+ String oldCardNumber;
+ boolean isCreatManagerCard;
+ String iccardInfoId;
+
+ int type;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = ActivityManagerReadQhlBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
-
+ oldCardNumber = this.getIntent().getStringExtra("oldCardNumber");
+ iccardInfoId = this.getIntent().getStringExtra("iccardInfoId");
+ type = this.getIntent().getIntExtra("replaceType", 0);
+ binding.managerNext.setOnClickListener(v -> {
+ if (isCreatManagerCard) {
+ Intent intent = new Intent(ManagerReadActivity.this, NFCWreatActivity.class);
+ intent.putExtra("iccardInfoId", iccardInfoId);
+ intent.putExtra("replaceType", type);
+ startActivity(intent);
+ } else {
+ TipUtil.show("璇峰厛鍒朵綔绠＄悊鍗�");
+ }
+ });
}
@Override
@@ -45,17 +65,16 @@
private void getCardNumber() {
String cardNumber = NfcReadHelper.getInstence(intent, this).getCardNumber();
if (!TextUtils.isEmpty(cardNumber)) {
- TipUtil.show(this, "璇诲崱鎴愬姛锛屾帴涓嬫潵浼氳烦杞埌鐢ㄦ埛鍒楄〃閫夋嫨琛ュ崱鐨勭敤鎴枫��", new TipUtil.TipListener() {
- @Override
- public void onCancle() {
- Intent intent = new Intent(ManagerReadActivity.this, ManagerListActivity.class);
- intent.putExtra("cardNumber", cardNumber);
- startActivity(intent);
- ManagerReadActivity.this.finish();
- }
- });
-
-
+ ManageCard manageCard = new ManageCard();
+ manageCard.setUserCard(oldCardNumber);
+ manageCard.setType((byte) 0);
+ if (NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toByte(baseDao), 1, 0)) {
+ isCreatManagerCard = true;
+ } else {
+ isCreatManagerCard = false;
+ }
+ ProgressDialog.dismiss();
+ TipUtil.show(this,"绠＄悊鍗″埗鍗℃垚鍔燂紝璇峰湪鎺у埗鍣ㄧ鍒峰崱");
} else {
TipUtil.show(this, "鏈鍙栧埌鏂板崱鍗″彿锛岃閲嶆柊璐村崱");
}
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java
index 33905c7..c86b591 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NFCWreatActivity.java
@@ -673,6 +673,8 @@
cardNumber = NfcReadHelper.getInstence(intent, this).getCardNumber();
if (replaceType == BaseCommon.REPLACE_NO_CARD) {
replaceCardPost("", "");
+ } else if (replaceType == BaseCommon.REPLACE_HAS_CARD) {
+
}
}
}
\ No newline at end of file
diff --git a/qiheonlinelibrary/src/main/res/layout/activity_home_qhl.xml b/qiheonlinelibrary/src/main/res/layout/activity_home_qhl.xml
index 9151b59..e922610 100644
--- a/qiheonlinelibrary/src/main/res/layout/activity_home_qhl.xml
+++ b/qiheonlinelibrary/src/main/res/layout/activity_home_qhl.xml
@@ -107,6 +107,7 @@
android:layout_weight="1"
android:gravity="center"
android:text="鍙傛暟璁剧疆"
+ android:visibility="invisible"
android:textColor="@color/text_selecter_color"
android:textSize="@dimen/home_text_size" />
diff --git a/qiheonlinelibrary/src/main/res/layout/activity_manager_read_qhl.xml b/qiheonlinelibrary/src/main/res/layout/activity_manager_read_qhl.xml
index 513ae23..8f0be95 100644
--- a/qiheonlinelibrary/src/main/res/layout/activity_manager_read_qhl.xml
+++ b/qiheonlinelibrary/src/main/res/layout/activity_manager_read_qhl.xml
@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_title_height"
android:background="@color/title_bar_bg"
- app:centerText="璇诲彇鍗＄墖"
+ app:centerText="鍒朵綔绠＄悊鍗�"
app:leftImage="@mipmap/icon_back" />
<ScrollView
@@ -167,12 +167,34 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/titleBar"
+ android:layout_marginLeft="20dp"
android:layout_marginTop="40dp"
- android:gravity="center"
- android:text="璇峰皢鐢ㄦ埛鏂板崱璐村湪璁惧涓婅繘琛岃鍗�"
+ android:layout_marginRight="20dp"
+ android:text="绗竴姝ワ細鍒峰崱鍒朵綔绠＄悊鍗�"
android:textColor="@color/red"
- android:textSize="@dimen/big_text_size" />
+ android:textSize="19sp" />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/titleBar"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="10dp"
+ android:layout_marginRight="20dp"
+ android:text="绗簩姝ワ細鍦ㄦ帶鍒跺櫒绔埛鍗�"
+ android:textColor="@color/red"
+ android:textSize="19sp" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/titleBar"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="10dp"
+ android:layout_marginRight="20dp"
+ android:text="绗笁姝ワ細鐐瑰嚮涓嬩竴姝ユ寜閽浆鎹负鐢ㄦ埛鍗�"
+ android:textColor="@color/red"
+ android:textSize="19sp" />
<ImageView
android:layout_width="match_parent"
@@ -193,4 +215,14 @@
app:indicatorColor="@color/title_bg"
app:indicatorName="BallClipRotatePulseIndicator" />
+ <TextView
+ android:id="@+id/manager_next"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:layout_alignParentBottom="true"
+ android:background="@color/title_bg"
+ android:gravity="center"
+ android:text="涓嬩竴姝�"
+ android:textColor="#000000"
+ android:textSize="@dimen/new_card_size" />
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.8.0