添加补打逻辑 联调修复bug

zuoxiao

2024-08-16 a44c47bc7f37245612635866adaddf5c98d41747

 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ManagerReadActivity.java

@@ -5,12 +5,14 @@
import android.os.Bundle;
import android.view.LayoutInflater;

import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.qiheonlinelibrary.QHOnLineApplication;
import com.dayu.qiheonlinelibrary.bean.CardInfoResult;
import com.dayu.qiheonlinelibrary.card.ManagerToUserCard;
import com.dayu.qiheonlinelibrary.databinding.ActivityManagerReadQhlBinding;
import com.dayu.qiheonlinelibrary.dbBean.UserCardBean;
import com.dayu.qiheonlinelibrary.net.ApiManager;
import com.dayu.qiheonlinelibrary.net.BaseResponse;
import com.dayu.qiheonlinelibrary.net.subscribers.SubscriberListener;
@@ -26,7 +28,7 @@
 * author: zuo
 * Date: 2024-08-12
 * Time: 20:10
 * 备注：
 * 备注： 读取管理卡，从控制器读卡后在此界面读卡
 */
public class ManagerReadActivity extends BaseNfcActivity {

@@ -39,6 +41,8 @@

    CardInfoResult cardInfoResult;
    ManagerToUserCard managerToUserCard;

    UserCardBean userCardBean = new UserCardBean();

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -56,8 +60,8 @@
                intent.putExtra("replaceType", BaseCommon.REPLACE_HAS_CARD);
                startActivity(intent);
                ManagerReadActivity.this.finish();
            }else {
                TipUtil.show(ManagerReadActivity.this,"请刷管理卡");
            } else {
                TipUtil.show(ManagerReadActivity.this, "请刷管理卡");
            }
        });
    }
@@ -79,7 +83,10 @@
                managerToUserCard = NfcReadHelper.getInstence(intent, this).getManagerToUserCardData();
                if (managerToUserCard != null) {
                    if (QHOnLineApplication.getInstance().arerNumber.equalsIgnoreCase(String.valueOf(managerToUserCard.getArerNumber()))) {
                        getUserInfoAndCardInfo(managerToUserCard.getOldCardNumber());
                        String oldCardNumber = managerToUserCard.getOldCardNumber();
                        oldCardNumber = HexUtil.spaceHex(oldCardNumber);
                        oldCardNumber = HexUtil.HighLowHex(oldCardNumber);
                        getUserInfoAndCardInfo(oldCardNumber);
                    } else {
                        TipUtil.show(this, "不是本区域卡！");
                    }
@@ -105,20 +112,31 @@
        Map<String, Object> data = new HashMap<>();
        //ic卡信息id
        data.put("iccardNum", iccardCode);
        ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/peasant/getIccardInfoVoByCardCode", CardInfoResult.class, data, new SubscriberListener<BaseResponse<CardInfoResult>>() {
        ApiManager.getInstance().requestPostLoading(this, "iccard/peasant/getIccardInfoVoByCardCode", CardInfoResult.class, data, new SubscriberListener<BaseResponse<CardInfoResult>>() {
            @Override
            public void onNext(BaseResponse<CardInfoResult> t) {
                String state = "";
                if (t.isSuccess()) {
                    cardInfoResult = t.getData();
                    isReadSuccess = true;
                    TipUtil.show(ManagerReadActivity.this, "读卡成功，下一步将写卡！", () -> {
                        Intent intent = new Intent(ManagerReadActivity.this, NFCWreatActivity.class);
                        intent.putExtra("iccardInfoId", cardInfoResult.getIccardInfoId());
                        intent.putExtra("replaceType", BaseCommon.REPLACE_HAS_CARD);
                        startActivity(intent);
                        ManagerReadActivity.this.finish();
                    });
                    if (t.getData() != null) {
                        cardInfoResult = t.getData();
                        userCardBean.setUserName(cardInfoResult.getPeasantName());
                        userCardBean.setUserID(cardInfoResult.getPeasantIdNumber());
                        userCardBean.setPhone(cardInfoResult.getPeasantPhone());
                        userCardBean.setPersonId(cardInfoResult.getPeasantId());
                        userCardBean.setAddressCode(cardInfoResult.getAdcd());
                        userCardBean.setAddressName(cardInfoResult.getAdcdName());
                        isReadSuccess = true;
                        TipUtil.show(ManagerReadActivity.this, "读卡成功，下一步将写卡！", () -> {
                            Intent intent = new Intent(ManagerReadActivity.this, NFCWreatActivity.class);
                            intent.putExtra("iccardInfoId", cardInfoResult.getIccardInfoId());
                            intent.putExtra("replaceType", BaseCommon.REPLACE_HAS_CARD);
                            intent.putExtra("userCardBean", userCardBean);
                            startActivity(intent);
                            ManagerReadActivity.this.finish();
                        });
                    } else {
                        TipUtil.show(ManagerReadActivity.this, "未查询到该卡信息，请检查。");
                    }
                }
            }
        });