1.修改架构将河南版本提取成library 2.修复密码修改的bug 3.添加登录页选择模块功能

zuoxiao

2024-04-29 ae6fff187b368385f8142a98da6067897201d544

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

@@ -8,7 +8,7 @@
import com.dayu.baselibrary.view.ChooseView;
import com.dayu.henanlibrary.databinding.ActivityIdentyfyingBinding;
import com.dayu.henanlibrary.dbBean.CardData;
import com.dayu.henanlibrary.utils.MyCommon;
import com.dayu.henanlibrary.utils.CardCommon;

import java.util.Arrays;

@@ -73,66 +73,66 @@

        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 {
                    binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
                    binding.electricOldNumber.setText(CardCommon.getDefaultCardData(cardType));
                }
                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 {
                    binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
                    binding.electricOldNumber.setText(CardCommon.getDefaultCardData(cardType));
                }
                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 {
                    binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
                    binding.electricOldNumber.setText(CardCommon.getDefaultCardData(cardType));
                }
                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 {
                    binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
                    binding.electricOldNumber.setText(CardCommon.getDefaultCardData(cardType));
                }
                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 {
                    binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
                    binding.electricOldNumber.setText(CardCommon.getDefaultCardData(cardType));
                }
                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 {
                    binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
                    binding.electricOldNumber.setText(CardCommon.getDefaultCardData(cardType));
                }
                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 {
                    binding.electricOldNumber.setText(MyCommon.getDefaultCardData(cardType));
                    binding.electricOldNumber.setText(CardCommon.getDefaultCardData(cardType));
                }
                break;
        }