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(); } } qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManageSetUpActivity.java
File was deleted 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, "未读取到新卡卡号，请重新贴卡"); } 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) { } } } 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" />
@@ -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>
