1.修复两个工程因layout名字一样导致的bug

zuoxiao

2024-05-06 e79ced190337222c7475409363c8071c976c7de9

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

File was renamed from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
@@ -9,7 +9,7 @@
import android.widget.EditText;

import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.qihealonelibrary.databinding.ActivityRechargeBinding;
import com.dayu.qihealonelibrary.databinding.ActivityRechargeQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
import com.dayu.qihealonelibrary.tools.NfcReadHelper;
import com.dayu.qihealonelibrary.utils.DeviceNumberUtils;
@@ -23,13 +23,13 @@
 * Date: 2023-11-5 09:52
 * Description: 充值界面
 */
public class RechargeActivity extends BaseNfcActivity {
public class RechargeActivityQHAlone extends BaseNfcActivityQHAlone {

    Intent intent;

    boolean userFlag;
    ActivityRechargeBinding binding;
    public static RechargeActivity rechargeActivity;
    ActivityRechargeQhaBinding binding;
    public static RechargeActivityQHAlone rechargeActivity;

    AdminDataBean adminData;
    String userName;
@@ -38,7 +38,7 @@
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        try {
            binding = ActivityRechargeBinding.inflate(LayoutInflater.from(this));
            binding = ActivityRechargeQhaBinding.inflate(LayoutInflater.from(this));
            setContentView(binding.getRoot());
            setPricePoint(binding.rechargeWater);
            rechargeActivity = this;
@@ -58,7 +58,7 @@
                ProgressDialog.show(this);
//                selectBalance(userCard.getInitPeasantCode());
            } else {
                TipUtil.show(RechargeActivity.this, "卡片读取失败");
                TipUtil.show(RechargeActivityQHAlone.this, "卡片读取失败");
            }

//            readAllData(intent);
@@ -81,16 +81,16 @@
            if (!TextUtils.isEmpty(morny)) {
                String initCode = DeviceNumberUtils.getDeviceNumber();
                if (TextUtils.isEmpty(initCode)) {
                    TipUtil.show(RechargeActivity.this, "设备注册号为空，请先设置IP和管理员地址");
                    TipUtil.show(RechargeActivityQHAlone.this, "设备注册号为空，请先设置IP和管理员地址");
                    return;
                }
                Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
                Intent intent = new Intent(RechargeActivityQHAlone.this, NFCWreatActivityQHAlone.class);
                intent.putExtra("morny", morny);
                intent.putExtra("userName", userName);
                intent.putExtra("userCard", userCard);
                startActivity(intent);
            } else {
                TipUtil.show(RechargeActivity.this, "请输入充值金额（元）");
                TipUtil.show(RechargeActivityQHAlone.this, "请输入充值金额（元）");
            }
        });
    }