修复管理卡为null的bug，修复写卡失败的后提示成功的bug

zuoxiao

2024-07-14 c0538000f28bc68f11bfe118cb5dd7dfaed09911

 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivity.java

@@ -13,11 +13,10 @@
import com.dayu.qihealonelibrary.card.ManageCard;
import com.dayu.qihealonelibrary.card.RegisteredCard;
import com.dayu.qihealonelibrary.card.TestCard;
import com.dayu.qihealonelibrary.databinding.ActivityIdentyfyingBinding;
import com.dayu.qihealonelibrary.databinding.ActivityIdentyfyingQhaBinding;
import com.dayu.qihealonelibrary.dbBean.CardData;
import com.dayu.qihealonelibrary.dbBean.IdentityBean;

import com.dayu.qihealonelibrary.utils.MyCommon;
import com.dayu.qihealonelibrary.utils.CardCommon;

import java.util.Arrays;

@@ -28,9 +27,9 @@
 * Time: 10:21
 * 备注：卡标识设置
 */
public class IdentifyingActivity extends QHAloneBaseActivity {
public class IdentifyingActivity extends BaseActivity {

    ActivityIdentyfyingBinding binding;
    ActivityIdentyfyingQhaBinding binding;


    String[] nianfen = {"管理卡", "清零卡", "重新注册设备卡", "删除全部用户卡", "测试卡", "设备信息卡", "水泵功率卡"};
@@ -44,7 +43,7 @@
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        binding = ActivityIdentyfyingBinding.inflate(LayoutInflater.from(this));
        binding = ActivityIdentyfyingQhaBinding.inflate(LayoutInflater.from(this));
        setContentView(binding.getRoot());
        binding.chooseCardType.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -90,8 +89,8 @@

        switch (data) {
            case "管理卡":
                cardType = MyCommon.MANAGE_CRAD;
                cardData = baseDao.cardDataDao().findFirst(MyCommon.MANAGE_CRAD);
                cardType = CardCommon.MANAGE_CRAD;
                cardData = baseDao.cardDataDao().findFirst(CardCommon.MANAGE_CRAD);
                if (cardData != null) {
                    setData(cardData);
                } else {
@@ -99,8 +98,8 @@
                }
                break;
            case "清零卡":
                cardType = MyCommon.CLEAN_CARD_TYPE;
                cardData = baseDao.cardDataDao().findFirst(MyCommon.CLEAN_CARD_TYPE);
                cardType = CardCommon.CLEAN_CARD_TYPE;
                cardData = baseDao.cardDataDao().findFirst(CardCommon.CLEAN_CARD_TYPE);
                if (cardData != null) {
                    setData(cardData);
                } else {
@@ -108,8 +107,8 @@
                }
                break;
            case "重新注册设备卡":
                cardType = MyCommon.REGISTERED_CARD_TYPE;
                cardData = baseDao.cardDataDao().findFirst(MyCommon.REGISTERED_CARD_TYPE);
                cardType = CardCommon.REGISTERED_CARD_TYPE;
                cardData = baseDao.cardDataDao().findFirst(CardCommon.REGISTERED_CARD_TYPE);
                if (cardData != null) {
                    setData(cardData);
                } else {
@@ -117,8 +116,8 @@
                }
                break;
            case "删除全部用户卡":
                cardType = MyCommon.CLEAN_ALL_USER_CARD_TYPE;
                cardData = baseDao.cardDataDao().findFirst(MyCommon.CLEAN_ALL_USER_CARD_TYPE);
                cardType = CardCommon.CLEAN_ALL_USER_CARD_TYPE;
                cardData = baseDao.cardDataDao().findFirst(CardCommon.CLEAN_ALL_USER_CARD_TYPE);
                if (cardData != null) {
                    setData(cardData);
                } else {
@@ -126,8 +125,8 @@
                }
                break;
            case "测试卡":
                cardType = MyCommon.TEST_CARD_TYPE;
                cardData = baseDao.cardDataDao().findFirst(MyCommon.TEST_CARD_TYPE);
                cardType = CardCommon.TEST_CARD_TYPE;
                cardData = baseDao.cardDataDao().findFirst(CardCommon.TEST_CARD_TYPE);
                if (cardData != null) {
                    setData(cardData);
                } else {
@@ -135,8 +134,8 @@
                }
                break;
            case "设备信息卡":
                cardType = MyCommon.CONFIGURATION_CARD_TYPE;
                cardData = baseDao.cardDataDao().findFirst(MyCommon.CONFIGURATION_CARD_TYPE);
                cardType = CardCommon.CONFIGURATION_CARD_TYPE;
                cardData = baseDao.cardDataDao().findFirst(CardCommon.CONFIGURATION_CARD_TYPE);
                if (cardData != null) {
                    setData(cardData);
                } else {
@@ -144,8 +143,8 @@
                }
                break;
            case "水泵功率卡":
                cardType = MyCommon.CONFIGURATION_POWER_CARD_TYPE;
                cardData = baseDao.cardDataDao().findFirst(MyCommon.CONFIGURATION_POWER_CARD_TYPE);
                cardType = CardCommon.CONFIGURATION_POWER_CARD_TYPE;
                cardData = baseDao.cardDataDao().findFirst(CardCommon.CONFIGURATION_POWER_CARD_TYPE);
                if (cardData != null) {
                    setData(cardData);
                } else {