1.修改包名

zuoxiao

2024-03-06 1cbb505922e010cace51020773a2dc1529713322

1.修改包名

 app/build.gradle

@@ -9,11 +9,11 @@
            keyPassword 'dycz@2023'
        }
    }
    namespace 'com.dayu.recharge'
    namespace 'com.dayu.rechargeqh'
    compileSdk 33

    defaultConfig {
        applicationId "com.dayu.recharge"
        applicationId "com.dayu.rechargeqh"
        minSdk 23
        targetSdk 26
        versionCode 14
@@ -76,7 +76,7 @@
    //地址选择
    implementation project(':pickerviewlibrary')
    implementation project(':easysocket')
    implementation 'com.tencent.bugly:crashreport:latest.release'
    implementation 'com.tencent.bugly:crashreport:4.1.9.3'
//    处理图片
//    implementation (name: 'ocr-library', ext: 'aar')
    //权限申请

 app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.dayu.recharge">
    package="com.dayu.rechargeqh">

    <uses-permission android:name="android.permission.NFC" />
    <!--用于访问网络，网络定位需要上网-->
@@ -34,7 +34,7 @@
    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"></uses-permission>

    <application
        android:name=".MyApplication"
        android:name="com.dayu.rechargeqh.MyApplication"
        android:allowBackup="true"
        android:icon="@mipmap/logo"
        android:label="@string/app_name"
@@ -42,7 +42,7 @@
        android:theme="@style/AppTheme">

        <activity
            android:name=".activity.LoginActivity"
            android:name="com.dayu.rechargeqh.activity.LoginActivity"
            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
@@ -50,18 +50,18 @@
            </intent-filter>
        </activity>
        <activity
            android:name=".activity.AdminSetupActivity"
            android:name="com.dayu.rechargeqh.activity.AdminSetupActivity"
            android:exported="true">

        </activity>

        <activity
            android:name=".activity.HomeActivity"
            android:name="com.dayu.rechargeqh.activity.HomeActivity"
            android:exported="true">

        </activity>
        <activity
            android:name=".activity.NewCardActivity"
            android:name="com.dayu.rechargeqh.activity.NewCardActivity"
            android:exported="true"
            android:launchMode="singleTop"
            android:screenOrientation="portrait">
@@ -71,15 +71,15 @@
            </intent-filter>
        </activity>
        <activity
            android:name=".activity.SysActivity"
            android:name="com.dayu.rechargeqh.activity.SysActivity"
            android:exported="true">

        </activity>

        <activity android:name=".activity.PassWordActivity" />
        <activity android:name=".activity.MyActivity" />
        <activity android:name="com.dayu.rechargeqh.activity.PassWordActivity" />
        <activity android:name="com.dayu.rechargeqh.activity.MyActivity" />
        <activity
            android:name=".activity.RechargeActivity"
            android:name="com.dayu.rechargeqh.activity.RechargeActivity"
            android:launchMode="singleTop">
            <intent-filter>
                <action android:name="android.nfc.action.TAG_DISCOVERED" />
@@ -88,7 +88,7 @@
        </activity>

        <activity
            android:name=".activity.ReadCardAcitivy"
            android:name="com.dayu.rechargeqh.activity.ReadCardAcitivy"
            android:exported="true"
            android:launchMode="singleTop">
            <intent-filter>
@@ -98,7 +98,7 @@
            </intent-filter>
        </activity>
        <activity
            android:name=".activity.NFCWreatActivity"
            android:name="com.dayu.rechargeqh.activity.NFCWreatActivity"
            android:exported="true"
            android:launchMode="singleTop">
            <intent-filter>
@@ -106,17 +106,17 @@
                <data android:mimeType="text/plain" />
            </intent-filter>
        </activity>
        <activity android:name=".activity.RechargeListActivity" />
        <activity android:name=".activity.NewCardListActivity" />
        <activity android:name=".activity.SysIpActivity" />
        <activity android:name=".activity.ParameterActivity" />
        <activity android:name=".activity.PowerActivity" />
        <activity android:name=".activity.DomainActivity" />
        <activity android:name=".activity.ElectricPriceActivity" />
        <activity android:name=".activity.IdentifyingActivity" />
        <activity android:name=".activity.ReplacementActivity" />
        <activity android:name=".activity.RechargeDetail" />
        <activity android:name=".activity.PasswordCardActivity" />
        <activity android:name="com.dayu.rechargeqh.activity.RechargeListActivity" />
        <activity android:name="com.dayu.rechargeqh.activity.NewCardListActivity" />
        <activity android:name="com.dayu.rechargeqh.activity.SysIpActivity" />
        <activity android:name="com.dayu.rechargeqh.activity.ParameterActivity" />
        <activity android:name="com.dayu.rechargeqh.activity.PowerActivity" />
        <activity android:name="com.dayu.rechargeqh.activity.DomainActivity" />
        <activity android:name="com.dayu.rechargeqh.activity.ElectricPriceActivity" />
        <activity android:name="com.dayu.rechargeqh.activity.IdentifyingActivity" />
        <activity android:name="com.dayu.rechargeqh.activity.ReplacementActivity" />
        <activity android:name="com.dayu.rechargeqh.activity.RechargeDetail" />
        <activity android:name="com.dayu.rechargeqh.activity.PasswordCardActivity" />


        <meta-data

 app/src/main/aidl/com/dayu/recharge/bean/TransBean.aidl

File was deleted

 app/src/main/aidl/com/dayu/rechargeqh/bean/TransBean.aidl

New file
@@ -0,0 +1,3 @@
package com.dayu.rechargeqh.bean;

parcelable TransBean;

 app/src/main/aidl/woyou/aidlservice/jiuiv5/IWoyouService.aidl

@@ -7,7 +7,7 @@

import woyou.aidlservice.jiuiv5.ICallback;
import android.graphics.Bitmap;
import com.dayu.recharge.bean.TransBean;
import com.dayu.rechargeqh.bean.TransBean;

interface IWoyouService
{

 app/src/main/cpp/native-lib.cpp

@@ -41,7 +41,7 @@

extern "C"
JNIEXPORT jstring
Java_com_dayu_recharge_tools_BaseNFCHelper_getSafeKey(JNIEnv *env, jobject instance,jobject contextObject) {
Java_com_dayu_rechargeqh_tools_BaseNFCHelper_getSafeKey(JNIEnv *env, jobject instance,jobject contextObject) {
    jmethodID getPackageManagerId = (env)->GetMethodID(contextClass, "getPackageManager","()Landroid/content/pm/PackageManager;");
    jmethodID getPackageNameId = (env)->GetMethodID(contextClass, "getPackageName","()Ljava/lang/String;");
    jmethodID signToStringId = (env)->GetMethodID(signatureClass, "toCharsString","()Ljava/lang/String;");

 app/src/main/java/com/dayu/recharge/activity/ElectricPriceActivity.java

File was deleted

 app/src/main/java/com/dayu/recharge/card/BaseCard.java

File was deleted

 app/src/main/java/com/dayu/recharge/card/BlackCard.java

File was deleted

 app/src/main/java/com/dayu/recharge/card/CleanCard.java

File was deleted

 app/src/main/java/com/dayu/recharge/card/CleanUserCard.java

File was deleted

 app/src/main/java/com/dayu/recharge/card/TestCard.java

File was deleted

 app/src/main/java/com/dayu/recharge/net/CallNetBack.java

File was deleted

 app/src/main/java/com/dayu/recharge/socketBean/BalanceSelecteBackBean.java

File was deleted

 app/src/main/java/com/dayu/recharge/socketBean/ConfirmMachineBackBean.java

File was deleted

 app/src/main/java/com/dayu/recharge/socketBean/InitCardBackBean.java

File was deleted

 app/src/main/java/com/dayu/recharge/socketBean/InitMachineBackBean.java

File was deleted

 app/src/main/java/com/dayu/recharge/socketBean/RechargeBackBean.java

File was deleted

 app/src/main/java/com/dayu/recharge/tools/CustomIsoDepReader.java

File was deleted

 app/src/main/java/com/dayu/recharge/utils/StrUtil.java

File was deleted

 app/src/main/java/com/dayu/rechargeqh/MyApplication.java

File was renamed from app/src/main/java/com/dayu/recharge/MyApplication.java
@@ -1,4 +1,4 @@
package com.dayu.recharge;
package com.dayu.rechargeqh;

import android.app.Application;
import android.os.Handler;
@@ -6,22 +6,21 @@
import android.text.TextUtils;
import android.util.Log;

import com.dayu.recharge.dao.BaseDaoSingleton;
import com.dayu.recharge.dbBean.IpBean;
import com.dayu.recharge.net.ScoketMessageProtocol;
import com.dayu.recharge.net.SocketCallBack;
import com.dayu.recharge.net.SocketData;
import com.dayu.recharge.net.SocketNet;
import com.dayu.recharge.socketBean.ConfirmMachineRequestBean;
import com.dayu.recharge.socketBean.InitMachineBackBean;
import com.dayu.recharge.socketBean.InitMachineRequestBean;
import com.dayu.recharge.tools.BcdUtil;
import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.AidlUtil;
import com.dayu.recharge.utils.CRC8;
import com.dayu.recharge.utils.DeviceNumberUtils;
import com.dayu.recharge.utils.SocketUtil;
import com.dayu.recharge.utils.ToastUtil;
import com.dayu.rechargeqh.dao.BaseDaoSingleton;
import com.dayu.rechargeqh.dbBean.IpBean;
import com.dayu.rechargeqh.net.ScoketMessageProtocol;
import com.dayu.rechargeqh.net.SocketCallBack;
import com.dayu.rechargeqh.net.SocketData;
import com.dayu.rechargeqh.net.SocketNet;
import com.dayu.rechargeqh.socketBean.ConfirmMachineRequestBean;
import com.dayu.rechargeqh.socketBean.InitMachineRequestBean;
import com.dayu.rechargeqh.tools.BcdUtil;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.AidlUtil;
import com.dayu.rechargeqh.utils.CRC8;
import com.dayu.rechargeqh.utils.DeviceNumberUtils;
import com.dayu.rechargeqh.utils.SocketUtil;
import com.dayu.rechargeqh.utils.ToastUtil;
import com.easysocket.EasySocket;
import com.easysocket.config.EasySocketOptions;
import com.easysocket.entity.SocketAddress;
@@ -74,7 +73,11 @@
    public void initEasySocket(boolean isCreate, SocketNet.CreateBack createBack) {
        try {
            this.createBack = createBack;
            ipBean = BaseDaoSingleton.getInstance(MyApplication.myApplication).ipDao().findFirst();
            try {
                ipBean = BaseDaoSingleton.getInstance(MyApplication.myApplication).ipDao().findFirst();
            } catch (Exception e) {
                e.printStackTrace();
            }
            if (ipBean == null) {
                ipBean = new IpBean();
                ipBean.setIp("dayuyanjiuyuan.top");
@@ -163,7 +166,6 @@

                        if (CRC8.isCRC8(readData.getOriginDataBytes())) {
                            //校验CRC成功
                            InitMachineBackBean initMachineBackBean = new InitMachineBackBean();
                            String initCode = HexUtil.bytesToHex(Arrays.copyOfRange(readData.getBodyBytes(), 2, 18));
                            //确认收到注册号报文
                            ConfirmMachineRequestBean confirmMachineRequestBean = new ConfirmMachineRequestBean();

 app/src/main/java/com/dayu/rechargeqh/activity/AdminSetupActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.content.Context;
import android.os.Build;
@@ -8,11 +8,11 @@
import android.view.View;
import android.view.inputmethod.InputMethodManager;

import com.dayu.recharge.MyApplication;
import com.dayu.recharge.databinding.ActivityAdminSetupBinding;
import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.recharge.dbBean.IpBean;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.rechargeqh.MyApplication;
import com.dayu.rechargeqh.databinding.ActivityAdminSetupBinding;
import com.dayu.rechargeqh.dbBean.AdminDataBean;
import com.dayu.rechargeqh.dbBean.IpBean;
import com.dayu.rechargeqh.utils.TipUtil;
import com.example.pickerviewlibrary.picker.TeaPickerView;
import com.example.pickerviewlibrary.picker.entity.PickerData;
import com.example.pickerviewlibrary.picker.listener.OnPickerClickListener;
@@ -30,6 +30,7 @@
public class AdminSetupActivity extends BaseActivity {

    ActivityAdminSetupBinding adminBinding;

    public static AdminSetupActivity adminSetupActivity;
    AdminDataBean adminData = new AdminDataBean();
    TeaPickerView pickerView;

 app/src/main/java/com/dayu/rechargeqh/activity/BaseActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/BaseActivity.java
@@ -1,7 +1,5 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.app.Activity;
import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.Signature;
@@ -11,11 +9,10 @@

import androidx.appcompat.app.AppCompatActivity;

import com.dayu.recharge.MyApplication;
import com.dayu.recharge.R;
import com.dayu.recharge.dao.AppDatabase;
import com.dayu.recharge.dao.BaseDaoSingleton;
import com.dayu.recharge.view.TitleBar;
import com.dayu.rechargeqh.R;
import com.dayu.rechargeqh.dao.AppDatabase;
import com.dayu.rechargeqh.dao.BaseDaoSingleton;
import com.dayu.rechargeqh.view.TitleBar;

/**
 * Created by zuoxiao on 2018/12/20.

 app/src/main/java/com/dayu/rechargeqh/activity/BaseNfcActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

/**
 * Created by zuo on 2018/12/2.
@@ -12,9 +12,9 @@
import android.nfc.Tag;
import android.os.Handler;

import com.dayu.recharge.card.UserCard;
import com.dayu.recharge.tools.LoyaltyCardReader;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.rechargeqh.card.UserCard;
import com.dayu.rechargeqh.tools.LoyaltyCardReader;
import com.dayu.rechargeqh.utils.TipUtil;

/**
 * Author:Created by Ricky on 2017/8/25.
@@ -27,20 +27,6 @@
 */
public class BaseNfcActivity extends BaseActivity implements LoyaltyCardReader.AccountCallback {

    /**
     * 该卡已写入用户信息
     */
    public final static int HAS_USER = 1;
    /**
     * 该卡未写入用户信息
     */
    public final static int NO_USER = 2;
    /**
     * 充值
     */
    public final static int RECHARGE = 3;

    public final static int ERROR = -1;

    protected NfcAdapter mNfcAdapter;
    private PendingIntent mPendingIntent;

 app/src/main/java/com/dayu/rechargeqh/activity/DomainActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/DomainActivity.java
@@ -1,13 +1,13 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;

import com.dayu.recharge.databinding.ActivityDomainBinding;
import com.dayu.recharge.dbBean.DomainBean;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.rechargeqh.databinding.ActivityDomainBinding;
import com.dayu.rechargeqh.dbBean.DomainBean;
import com.dayu.rechargeqh.utils.TipUtil;

/**
 * Created by Android Studio.

 app/src/main/java/com/dayu/rechargeqh/activity/ElectricPriceActivity.java

New file
@@ -0,0 +1,94 @@
package com.dayu.rechargeqh.activity;

import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;

import com.dayu.rechargeqh.databinding.ActivityElectricPriceBinding;
import com.dayu.rechargeqh.dbBean.ElectricPriceBean;
import com.dayu.rechargeqh.utils.TipUtil;

/**
 * Copyright (C), 2023,
 * Author: zuo
 * Date: 2023-11-10 10:18
 * Description: 电量单价设置
 */
public class ElectricPriceActivity extends BaseActivity {

    ActivityElectricPriceBinding electricPriceBinding;
    ElectricPriceBean electricPriceBean;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        electricPriceBinding = ActivityElectricPriceBinding.inflate(LayoutInflater.from(this));
        setContentView(electricPriceBinding.getRoot());
        initData();


        initView();



    }

    private void initView() {

        //保留三位小数
        electricPriceBinding.electricNewNum.addTextChangedListener(new TextWatcher() {
            @Override
            public void beforeTextChanged(CharSequence s, int start, int count, int after) {

            }

            @Override
            public void onTextChanged(CharSequence s, int start, int before, int count) {

            }

            @Override
            public void afterTextChanged(Editable s) {
                // 删除额外的小数位
                String text = s.toString();
                if (text.contains(".")) {
                    int decimalIndex = text.indexOf(".");
                    int decimalCount = text.length() - decimalIndex - 1;
                    if (decimalCount > 3) {
                        s.delete(decimalIndex + 4, s.length());
                    }
                }
            }
        });

        electricPriceBinding.electricOk.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                if (!TextUtils.isEmpty(electricPriceBinding.electricNewNum.getText())) {
                    electricPriceBean.setPrice(Float.parseFloat(electricPriceBinding.electricNewNum.getText().toString()));
                    baseDao.electricPriceDao().insert(electricPriceBean);
                    TipUtil.show("保存成功");
                    initData();
                } else {
                    TipUtil.show("请输入正确金额");
                }
            }
        });
    }

    private void initData() {
        ElectricPriceBean priceBean = baseDao.electricPriceDao().findFirst();
        if (priceBean != null) {
            electricPriceBean = priceBean;
            electricPriceBinding.electricOldNumber.setText(priceBean.getPrice() + "元");
        } else {
            electricPriceBean = new ElectricPriceBean();
            electricPriceBinding.electricOldNumber.setText("1.000元");
        }
    }


}

 app/src/main/java/com/dayu/rechargeqh/activity/HomeActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/HomeActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.content.Intent;
import android.os.Bundle;
@@ -7,11 +7,11 @@
import android.view.View;
import android.widget.Toast;

import com.dayu.recharge.MyApplication;
import com.dayu.recharge.R;
import com.dayu.recharge.databinding.ActivityHomeBinding;
import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.rechargeqh.MyApplication;
import com.dayu.rechargeqh.R;
import com.dayu.rechargeqh.databinding.ActivityHomeBinding;
import com.dayu.rechargeqh.dbBean.AdminDataBean;
import com.dayu.rechargeqh.utils.TipUtil;


/**

 app/src/main/java/com/dayu/rechargeqh/activity/IdentifyingActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/IdentifyingActivity.java
@@ -1,22 +1,22 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;

import com.dayu.recharge.card.CleanCard;
import com.dayu.recharge.card.ConfigurationPowerCard;
import com.dayu.recharge.card.ConfigureDeviceRegistrationCrad;
import com.dayu.recharge.card.ManageCard;
import com.dayu.recharge.card.RegisteredCard;
import com.dayu.recharge.card.TestCard;
import com.dayu.recharge.databinding.ActivityIdentyfyingBinding;
import com.dayu.recharge.dbBean.CardData;
import com.dayu.recharge.dbBean.IdentityBean;
import com.dayu.recharge.utils.MyCommon;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.view.ChooseView;
import com.dayu.rechargeqh.card.CleanCard;
import com.dayu.rechargeqh.card.ConfigurationPowerCard;
import com.dayu.rechargeqh.card.ConfigureDeviceRegistrationCrad;
import com.dayu.rechargeqh.card.ManageCard;
import com.dayu.rechargeqh.card.RegisteredCard;
import com.dayu.rechargeqh.card.TestCard;
import com.dayu.rechargeqh.databinding.ActivityIdentyfyingBinding;
import com.dayu.rechargeqh.dbBean.CardData;
import com.dayu.rechargeqh.dbBean.IdentityBean;
import com.dayu.rechargeqh.utils.MyCommon;
import com.dayu.rechargeqh.utils.TipUtil;
import com.dayu.rechargeqh.view.ChooseView;

import java.util.Arrays;


 app/src/main/java/com/dayu/rechargeqh/activity/LoginActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
@@ -1,6 +1,5 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.Manifest;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
@@ -9,13 +8,12 @@
import android.widget.Toast;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;

import com.dayu.recharge.MyApplication;
import com.dayu.recharge.dao.BaseDaoSingleton;
import com.dayu.recharge.databinding.ActivityLoginBinding;
import com.dayu.recharge.dbBean.PassWordBean;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.rechargeqh.MyApplication;
import com.dayu.rechargeqh.dao.BaseDaoSingleton;
import com.dayu.rechargeqh.databinding.ActivityLoginBinding;
import com.dayu.rechargeqh.dbBean.PassWordBean;
import com.dayu.rechargeqh.utils.TipUtil;
import com.hjq.permissions.OnPermissionCallback;
import com.hjq.permissions.Permission;
import com.hjq.permissions.XXPermissions;

 app/src/main/java/com/dayu/rechargeqh/activity/ManageSetUpActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/ManageSetUpActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.os.Bundle;


 app/src/main/java/com/dayu/rechargeqh/activity/MyActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/MyActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.Manifest;
import android.app.Activity;
@@ -14,16 +14,15 @@

import androidx.annotation.NonNull;

import com.dayu.recharge.MyApplication;
import com.dayu.recharge.databinding.ActivityMyBinding;
import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.recharge.net.SocketNet;
import com.dayu.recharge.utils.DeviceNumberUtils;
import com.dayu.recharge.utils.ExcelUtil;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.view.PassWordDialog;
import com.dayu.recharge.view.datepicker.CustomDatePicker;
import com.dayu.recharge.view.datepicker.DateFormatUtils;
import com.dayu.rechargeqh.databinding.ActivityMyBinding;
import com.dayu.rechargeqh.dbBean.AdminDataBean;
import com.dayu.rechargeqh.net.SocketNet;
import com.dayu.rechargeqh.utils.DeviceNumberUtils;
import com.dayu.rechargeqh.utils.ExcelUtil;
import com.dayu.rechargeqh.utils.TipUtil;
import com.dayu.rechargeqh.view.PassWordDialog;
import com.dayu.rechargeqh.view.datepicker.CustomDatePicker;
import com.dayu.rechargeqh.view.datepicker.DateFormatUtils;

import java.io.File;
import java.util.ArrayList;

 app/src/main/java/com/dayu/rechargeqh/activity/NFCWreatActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.content.Intent;
import android.os.Bundle;
@@ -7,43 +7,40 @@
import android.view.LayoutInflater;
import android.widget.Toast;

import com.dayu.recharge.MyApplication;
import com.dayu.recharge.R;
import com.dayu.recharge.card.CleanCard;
import com.dayu.recharge.card.CleanUserCard;
import com.dayu.recharge.card.ConfigurationPowerCard;
import com.dayu.recharge.card.ConfigureDeviceRegistrationCrad;
import com.dayu.recharge.card.DomainCard;
import com.dayu.recharge.card.ManageCard;
import com.dayu.recharge.card.RegisteredCard;
import com.dayu.recharge.card.TestCard;
import com.dayu.recharge.card.UserCard;
import com.dayu.recharge.databinding.ActivityWriteTextBinding;
import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.recharge.dbBean.ElectricPriceBean;
import com.dayu.recharge.dbBean.RechargeBean;
import com.dayu.recharge.dbBean.UserCardBean;
import com.dayu.recharge.net.SocketCallBack;
import com.dayu.recharge.net.SocketData;
import com.dayu.recharge.net.SocketNet;
import com.dayu.recharge.socketBean.BalanceSelecteRequestBean;
import com.dayu.recharge.socketBean.RechargeRequestBean;
import com.dayu.recharge.tools.BcdUtil;
import com.dayu.recharge.tools.NFCWriteHelper;
import com.dayu.recharge.tools.NfcReadHelper;
import com.dayu.recharge.tools.WriteCardUtils;
import com.dayu.recharge.utils.AidlUtil;
import com.dayu.recharge.utils.CRC8;
import com.dayu.recharge.utils.DateUtil;
import com.dayu.recharge.utils.DeviceNumberUtils;
import com.dayu.recharge.utils.MornyUtil;
import com.dayu.recharge.utils.MyCommon;
import com.dayu.recharge.utils.SocketUtil;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.rechargeqh.MyApplication;
import com.dayu.rechargeqh.R;
import com.dayu.rechargeqh.card.CleanCard;
import com.dayu.rechargeqh.card.CleanUserCard;
import com.dayu.rechargeqh.card.ConfigurationPowerCard;
import com.dayu.rechargeqh.card.ConfigureDeviceRegistrationCrad;
import com.dayu.rechargeqh.card.DomainCard;
import com.dayu.rechargeqh.card.ManageCard;
import com.dayu.rechargeqh.card.RegisteredCard;
import com.dayu.rechargeqh.card.TestCard;
import com.dayu.rechargeqh.card.UserCard;
import com.dayu.rechargeqh.databinding.ActivityWriteTextBinding;
import com.dayu.rechargeqh.dbBean.AdminDataBean;
import com.dayu.rechargeqh.dbBean.RechargeBean;
import com.dayu.rechargeqh.dbBean.UserCardBean;
import com.dayu.rechargeqh.net.SocketCallBack;
import com.dayu.rechargeqh.net.SocketData;
import com.dayu.rechargeqh.net.SocketNet;
import com.dayu.rechargeqh.socketBean.BalanceSelecteRequestBean;
import com.dayu.rechargeqh.socketBean.RechargeRequestBean;
import com.dayu.rechargeqh.tools.BcdUtil;
import com.dayu.rechargeqh.tools.NFCWriteHelper;
import com.dayu.rechargeqh.tools.NfcReadHelper;
import com.dayu.rechargeqh.tools.WriteCardUtils;
import com.dayu.rechargeqh.utils.AidlUtil;
import com.dayu.rechargeqh.utils.CRC8;
import com.dayu.rechargeqh.utils.DateUtil;
import com.dayu.rechargeqh.utils.DeviceNumberUtils;
import com.dayu.rechargeqh.utils.MyCommon;
import com.dayu.rechargeqh.utils.SocketUtil;
import com.dayu.rechargeqh.utils.TipUtil;
import com.tencent.bugly.crashreport.CrashReport;

import java.util.Arrays;
import java.util.Calendar;

/**
 * Copyright (C), 2023,
@@ -451,7 +448,7 @@
    }

    private void setmanageCard(Intent intent, final ManageCard manageCard) {
        manageCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toZeroByte(), 1, 0);
        manageCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toZeroByte(baseDao), 1, 0);
    }

    /**
@@ -461,7 +458,7 @@
     * @param clearOrInitCard
     */
    private void setClean(Intent intent, final CleanCard clearOrInitCard) {
        cleanFlag = NFCWriteHelper.getInstence(intent, this).writeData(clearOrInitCard.toByte(), 1, 0);
        cleanFlag = NFCWriteHelper.getInstence(intent, this).writeData(clearOrInitCard.toByte(baseDao), 1, 0);
    }


@@ -472,7 +469,7 @@
     * @param registeredCard
     */
    private void setRegisteredCard(Intent intent, RegisteredCard registeredCard) {
        registeredFlag = NFCWriteHelper.getInstence(intent, this).writeData(registeredCard.toByte(), 1, 0);
        registeredFlag = NFCWriteHelper.getInstence(intent, this).writeData(registeredCard.toByte(baseDao), 1, 0);
    }

    /**
@@ -482,7 +479,7 @@
     * @param cleanUserCard
     */
    private void setCleanUserCard(Intent intent, CleanUserCard cleanUserCard) {
        cleanUserCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(cleanUserCard.toByte(), 1, 0);
        cleanUserCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(cleanUserCard.toByte(baseDao), 1, 0);
    }

    /**
@@ -509,17 +506,17 @@
    }

    private void setTestCard(Intent intent, TestCard testCard) {
        testCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(testCard.toByte(), 1, 0);
        testCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(testCard.toByte(baseDao), 1, 0);
    }


    private void setConfigDeviceRegiest(Intent intent, ConfigureDeviceRegistrationCrad configureDeviceRegistrationCrad) {
        configDeviceRegiestFlag = NFCWriteHelper.getInstence(intent, this).writeData(configureDeviceRegistrationCrad.toByte(), 1, 0);
        configDeviceRegiestFlag = NFCWriteHelper.getInstence(intent, this).writeData(configureDeviceRegistrationCrad.toByte(baseDao), 1, 0);
    }

    private void setConfigurationPower(Intent intent, ConfigurationPowerCard configurationPowerCard) {
        try {
            configPowerFlag = NFCWriteHelper.getInstence(intent, this).writeData(configurationPowerCard.toByte(), 1, 0);
            configPowerFlag = NFCWriteHelper.getInstence(intent, this).writeData(configurationPowerCard.toByte(baseDao), 1, 0);
        } catch (Exception e) {
            configPowerFlag = false;
            throw new RuntimeException(e);

 app/src/main/java/com/dayu/rechargeqh/activity/NewCardActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.app.Dialog;
import android.content.Intent;
@@ -11,25 +11,24 @@

import androidx.annotation.NonNull;

import com.dayu.recharge.MyApplication;
import com.dayu.recharge.card.UserCard;
import com.dayu.recharge.databinding.ActivityNewCardBinding;
import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.recharge.dbBean.ElectricPriceBean;
import com.dayu.recharge.dbBean.IpBean;
import com.dayu.recharge.dbBean.UserCardBean;
import com.dayu.recharge.net.SocketCallBack;
import com.dayu.recharge.net.SocketData;
import com.dayu.recharge.net.SocketNet;
import com.dayu.recharge.socketBean.InitCardRequestBean;
import com.dayu.recharge.tools.BcdUtil;
import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.tools.Utils;
import com.dayu.recharge.utils.CRC8;
import com.dayu.recharge.utils.DeviceNumberUtils;
import com.dayu.recharge.utils.SocketUtil;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.view.ProgressDialog;
import com.dayu.rechargeqh.MyApplication;
import com.dayu.rechargeqh.card.UserCard;
import com.dayu.rechargeqh.databinding.ActivityNewCardBinding;
import com.dayu.rechargeqh.dbBean.AdminDataBean;
import com.dayu.rechargeqh.dbBean.IpBean;
import com.dayu.rechargeqh.dbBean.UserCardBean;
import com.dayu.rechargeqh.net.SocketCallBack;
import com.dayu.rechargeqh.net.SocketData;
import com.dayu.rechargeqh.net.SocketNet;
import com.dayu.rechargeqh.socketBean.InitCardRequestBean;
import com.dayu.rechargeqh.tools.BcdUtil;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.tools.Utils;
import com.dayu.rechargeqh.utils.CRC8;
import com.dayu.rechargeqh.utils.DeviceNumberUtils;
import com.dayu.rechargeqh.utils.SocketUtil;
import com.dayu.rechargeqh.utils.TipUtil;
import com.dayu.rechargeqh.view.ProgressDialog;
import com.hjq.permissions.OnPermissionCallback;
import com.hjq.permissions.Permission;
import com.hjq.permissions.XXPermissions;

 app/src/main/java/com/dayu/rechargeqh/activity/NewCardListActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/NewCardListActivity.java
@@ -1,34 +1,28 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import static com.dayu.recharge.view.TitleBar.ClickType_RIGHT_TEXT;
import static com.dayu.rechargeqh.view.TitleBar.ClickType_RIGHT_TEXT;

import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.view.LayoutInflater;
import android.view.View;

import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;

import com.dayu.recharge.adapter.NewCardAdapter;
import com.dayu.recharge.databinding.ActivityNewcardListBinding;
import com.dayu.recharge.dbBean.UserCardBean;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.view.datepicker.CustomDatePicker;
import com.dayu.recharge.view.datepicker.DateFormatUtils;
import com.dayu.rechargeqh.adapter.NewCardAdapter;
import com.dayu.rechargeqh.databinding.ActivityNewcardListBinding;
import com.dayu.rechargeqh.dbBean.UserCardBean;
import com.dayu.rechargeqh.utils.TipUtil;
import com.dayu.rechargeqh.view.datepicker.CustomDatePicker;
import com.dayu.rechargeqh.view.datepicker.DateFormatUtils;
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.header.ClassicsHeader;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;
import com.scwang.smart.refresh.layout.listener.OnRefreshListener;

import java.util.ArrayList;
import java.util.List;

import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.Scheduler;
import io.reactivex.rxjava3.schedulers.Schedulers;

/**

 app/src/main/java/com/dayu/rechargeqh/activity/ParameterActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java
@@ -1,11 +1,11 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;

import com.dayu.recharge.databinding.ActivityParameterBinding;
import com.dayu.rechargeqh.databinding.ActivityParameterBinding;

/**
 * Copyright (C), 2023,

 app/src/main/java/com/dayu/rechargeqh/activity/PassWordActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java
@@ -1,14 +1,14 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;

import com.dayu.recharge.databinding.ActivityPswBinding;
import com.dayu.recharge.dbBean.PassWordBean;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.utils.WSMD5;
import com.dayu.rechargeqh.databinding.ActivityPswBinding;
import com.dayu.rechargeqh.dbBean.PassWordBean;
import com.dayu.rechargeqh.utils.TipUtil;
import com.dayu.rechargeqh.utils.WSMD5;

/**
 * Copyright (C), 2023,

 app/src/main/java/com/dayu/rechargeqh/activity/PasswordCardActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/PasswordCardActivity.java
@@ -1,14 +1,13 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;

import com.dayu.recharge.databinding.ActivityPasswordCardBinding;
import com.dayu.recharge.dbBean.PassWordCardBean;
import com.dayu.recharge.dbBean.PowerBean;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.rechargeqh.databinding.ActivityPasswordCardBinding;
import com.dayu.rechargeqh.dbBean.PassWordCardBean;
import com.dayu.rechargeqh.utils.TipUtil;

/**
 * author: zuo
@@ -26,6 +25,8 @@
        super.onCreate(savedInstanceState);
        binding = ActivityPasswordCardBinding.inflate(LayoutInflater.from(this));
        setContentView(binding.getRoot());
        initView();
        initData();
    }



 app/src/main/java/com/dayu/rechargeqh/activity/PowerActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/PowerActivity.java
@@ -1,13 +1,13 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;

import com.dayu.recharge.databinding.ActivityPowerBinding;
import com.dayu.recharge.dbBean.PowerBean;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.rechargeqh.databinding.ActivityPowerBinding;
import com.dayu.rechargeqh.dbBean.PowerBean;
import com.dayu.rechargeqh.utils.TipUtil;

/**
 * Copyright (C), 2023,

 app/src/main/java/com/dayu/rechargeqh/activity/ReadCardAcitivy.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.content.Intent;
import android.nfc.NfcAdapter;
@@ -7,25 +7,28 @@
import android.view.LayoutInflater;
import android.view.View;

import com.dayu.recharge.card.ConfigurationPowerCard;
import com.dayu.recharge.card.DomainCard;
import com.dayu.recharge.card.UserCard;
import com.dayu.recharge.databinding.ActivityRedCardBinding;
import com.dayu.recharge.net.SocketCallBack;
import com.dayu.recharge.net.SocketData;
import com.dayu.recharge.net.SocketNet;
import com.dayu.recharge.socketBean.BalanceSelecteRequestBean;
import com.dayu.recharge.tools.BcdUtil;
import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.tools.NfcReadHelper;
import com.dayu.recharge.tools.WriteCardUtils;
import com.dayu.recharge.utils.CRC8;
import com.dayu.recharge.utils.DeviceNumberUtils;
import com.dayu.recharge.utils.MornyUtil;
import com.dayu.recharge.utils.MyCommon;
import com.dayu.recharge.utils.SocketUtil;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.view.ProgressDialog;
import com.dayu.rechargeqh.card.BlackCard;
import com.dayu.rechargeqh.card.ConfigurationPowerCard;
import com.dayu.rechargeqh.card.DomainCard;
import com.dayu.rechargeqh.card.ElectricPriceCard;
import com.dayu.rechargeqh.card.RegionCard;
import com.dayu.rechargeqh.card.UserCard;
import com.dayu.rechargeqh.databinding.ActivityRedCardBinding;
import com.dayu.rechargeqh.net.SocketCallBack;
import com.dayu.rechargeqh.net.SocketData;
import com.dayu.rechargeqh.net.SocketNet;
import com.dayu.rechargeqh.socketBean.BalanceSelecteRequestBean;
import com.dayu.rechargeqh.tools.BcdUtil;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.tools.NfcReadHelper;
import com.dayu.rechargeqh.tools.WriteCardUtils;
import com.dayu.rechargeqh.utils.CRC8;
import com.dayu.rechargeqh.utils.DeviceNumberUtils;
import com.dayu.rechargeqh.utils.MornyUtil;
import com.dayu.rechargeqh.utils.MyCommon;
import com.dayu.rechargeqh.utils.SocketUtil;
import com.dayu.rechargeqh.utils.TipUtil;
import com.dayu.rechargeqh.view.ProgressDialog;

import java.util.Arrays;
import java.util.Calendar;
@@ -39,22 +42,9 @@
 */
public class ReadCardAcitivy extends BaseNfcActivity {

    private static final int USER_CRAD = 1;
    private static final int MANAGE_CRAD = 2;
    private static final int CLEAN_CARD = 3;
    private static final int REGISTERED_CARD = 4;
    private static final int CLEAN_ALL_USER = 5;
    private static final int DOMAIN_CARD = 6;
    private static final int TEST_CARD = 7;

    private static final int CONFIGURATION_CARD = 8;

    private static final int CONFIGURATION_POWER_CARD = 9;
    private static final int PASS_WORD_CRAD = 10;


    volatile UserCard userCard;
    ActivityRedCardBinding redCardBinding;


    Intent intent;

@@ -119,7 +109,6 @@
                                case MyCommon.USER_CARD_TYPE_2:
                                case MyCommon.USER_CARD_TYPE_3:
                                    userCard = UserCard.getBean(data);
//                                    selectBalance(userCard.getInitPeasantCode());
                                    break;
                                case MyCommon.MANAGE_CRAD:
                                    viweGone(false);
@@ -146,6 +135,7 @@
                                    viweGone(false);
                                    redCardBinding.readCardTypeTV.setText("当前为设置域名卡");
                                    DomainCard domainCard = DomainCard.toBean(data);
                                    assert domainCard != null;
                                    redCardBinding.readCardDataTV.setText("序号：" + domainCard.getDomainNumber() + "\n" + "域名：" + domainCard.getDomainName() + "\n" + "端口号：" + domainCard.getPort());
                                    stopAnim();
                                    break;
@@ -166,6 +156,29 @@
                                    redCardBinding.readCardDataTV.setText(powerCard.getPower());
                                    stopAnim();
                                    break;
                                case MyCommon.BLACK:
                                    viweGone(false);
                                    redCardBinding.readCardTypeTV.setText("当前为黑卡");
                                    BlackCard blackCard = BlackCard.getBean(data);
                                    redCardBinding.readCardDataTV.setText("当前黑卡用户号为：" + blackCard.getBlackCard());
                                    break;
                                case MyCommon.REGION:
                                    viweGone(false);
                                    redCardBinding.readCardTypeTV.setText("当前为区域表号卡");
                                    RegionCard regionCard = RegionCard.getBean(data);
                                    StringBuilder stringBuilder = new StringBuilder();
                                    stringBuilder.append("区域地址：").append(regionCard.getRegion()).append("\n");
                                    stringBuilder.append("控制器编号：").append(regionCard.getControllerCodel()).append("\n");
                                    redCardBinding.readCardDataTV.setText(stringBuilder.toString());
                                    break;
                                case MyCommon.ELECTRIC_PRICE:
                                    viweGone(false);
                                    redCardBinding.readCardTypeTV.setText("当前为电量单价卡");
                                    ElectricPriceCard electricPriceCard = ElectricPriceCard.getBean(data);
                                    StringBuilder electricPriceBuilder = new StringBuilder();
                                    electricPriceBuilder.append("电量单价：").append(electricPriceCard.getElectricPrice()).append("\n");
                                    redCardBinding.readCardDataTV.setText(electricPriceBuilder.toString());
                                    break;
                                default:
                                    TipUtil.show(ReadCardAcitivy.this, "卡片无法识别");
                                    stopAnim();

 app/src/main/java/com/dayu/rechargeqh/activity/RechargeActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.content.Intent;
import android.os.Bundle;
@@ -9,21 +9,21 @@
import android.view.View;
import android.widget.EditText;

import com.dayu.recharge.databinding.ActivityRechargeBinding;
import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.recharge.net.SocketCallBack;
import com.dayu.recharge.net.SocketData;
import com.dayu.recharge.net.SocketNet;
import com.dayu.recharge.socketBean.BalanceSelecteRequestBean;
import com.dayu.recharge.tools.BcdUtil;
import com.dayu.recharge.tools.NfcReadHelper;
import com.dayu.recharge.tools.WriteCardUtils;
import com.dayu.recharge.utils.CRC8;
import com.dayu.recharge.utils.DeviceNumberUtils;
import com.dayu.recharge.utils.MornyUtil;
import com.dayu.recharge.utils.SocketUtil;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.view.ProgressDialog;
import com.dayu.rechargeqh.databinding.ActivityRechargeBinding;
import com.dayu.rechargeqh.dbBean.AdminDataBean;
import com.dayu.rechargeqh.net.SocketCallBack;
import com.dayu.rechargeqh.net.SocketData;
import com.dayu.rechargeqh.net.SocketNet;
import com.dayu.rechargeqh.socketBean.BalanceSelecteRequestBean;
import com.dayu.rechargeqh.tools.BcdUtil;
import com.dayu.rechargeqh.tools.NfcReadHelper;
import com.dayu.rechargeqh.tools.WriteCardUtils;
import com.dayu.rechargeqh.utils.CRC8;
import com.dayu.rechargeqh.utils.DeviceNumberUtils;
import com.dayu.rechargeqh.utils.MornyUtil;
import com.dayu.rechargeqh.utils.SocketUtil;
import com.dayu.rechargeqh.utils.TipUtil;
import com.dayu.rechargeqh.view.ProgressDialog;
import com.tencent.bugly.crashreport.CrashReport;

import java.util.Arrays;

 app/src/main/java/com/dayu/rechargeqh/activity/RechargeDetail.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/RechargeDetail.java
@@ -1,14 +1,13 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;

import com.dayu.recharge.card.UserCard;
import com.dayu.recharge.databinding.ActivityRechargeDetailBinding;
import com.dayu.recharge.utils.MornyUtil;
import com.dayu.rechargeqh.card.UserCard;
import com.dayu.rechargeqh.databinding.ActivityRechargeDetailBinding;
import com.dayu.rechargeqh.utils.MornyUtil;

import java.util.Calendar;


 app/src/main/java/com/dayu/rechargeqh/activity/RechargeListActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java
@@ -1,6 +1,6 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import static com.dayu.recharge.view.TitleBar.ClickType_RIGHT_TEXT;
import static com.dayu.rechargeqh.view.TitleBar.ClickType_RIGHT_TEXT;

import android.os.Bundle;
import android.view.LayoutInflater;
@@ -8,16 +8,13 @@

import androidx.recyclerview.widget.LinearLayoutManager;

import com.dayu.recharge.adapter.NewCardAdapter;
import com.dayu.recharge.adapter.RechargeAdapter;
import com.dayu.recharge.databinding.ActivityRechargeListBinding;
import com.dayu.recharge.dbBean.RechargeBean;
import com.dayu.recharge.dbBean.UserCardBean;
import com.dayu.recharge.model.RechargeListModel;
import com.dayu.recharge.utils.ArithUtil;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.view.datepicker.CustomDatePicker;
import com.dayu.recharge.view.datepicker.DateFormatUtils;
import com.dayu.rechargeqh.adapter.RechargeAdapter;
import com.dayu.rechargeqh.databinding.ActivityRechargeListBinding;
import com.dayu.rechargeqh.dbBean.RechargeBean;
import com.dayu.rechargeqh.utils.ArithUtil;
import com.dayu.rechargeqh.utils.TipUtil;
import com.dayu.rechargeqh.view.datepicker.CustomDatePicker;
import com.dayu.rechargeqh.view.datepicker.DateFormatUtils;
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;

 app/src/main/java/com/dayu/rechargeqh/activity/ReplacementActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/ReplacementActivity.java
@@ -1,21 +1,19 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import static com.dayu.recharge.view.TitleBar.ClickType_RIGHT_TEXT;
import static com.dayu.rechargeqh.view.TitleBar.ClickType_RIGHT_TEXT;

import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.AdapterView;

import androidx.recyclerview.widget.LinearLayoutManager;

import com.dayu.recharge.adapter.NewCardAdapter;
import com.dayu.recharge.adapter.ReplacementAdapter;
import com.dayu.recharge.databinding.ActivityReplacementBinding;
import com.dayu.recharge.dbBean.UserCardBean;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.view.EdtDialog;
import com.dayu.rechargeqh.adapter.ReplacementAdapter;
import com.dayu.rechargeqh.databinding.ActivityReplacementBinding;
import com.dayu.rechargeqh.dbBean.UserCardBean;
import com.dayu.rechargeqh.utils.TipUtil;
import com.dayu.rechargeqh.view.EdtDialog;
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;

 app/src/main/java/com/dayu/rechargeqh/activity/SysActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/SysActivity.java
@@ -1,24 +1,24 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;

import com.dayu.recharge.card.CleanCard;
import com.dayu.recharge.card.CleanUserCard;
import com.dayu.recharge.card.ConfigurationPowerCard;
import com.dayu.recharge.card.ConfigureDeviceRegistrationCrad;
import com.dayu.recharge.card.DomainCard;
import com.dayu.recharge.card.ManageCard;
import com.dayu.recharge.card.PassWordCard;
import com.dayu.recharge.card.RegisteredCard;
import com.dayu.recharge.card.TestCard;
import com.dayu.recharge.databinding.ActivityAdminBinding;
import com.dayu.recharge.dbBean.DomainBean;
import com.dayu.recharge.dbBean.PassWordCardBean;
import com.dayu.recharge.dbBean.PowerBean;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.rechargeqh.card.CleanCard;
import com.dayu.rechargeqh.card.CleanUserCard;
import com.dayu.rechargeqh.card.ConfigurationPowerCard;
import com.dayu.rechargeqh.card.ConfigureDeviceRegistrationCrad;
import com.dayu.rechargeqh.card.DomainCard;
import com.dayu.rechargeqh.card.ManageCard;
import com.dayu.rechargeqh.card.PassWordCard;
import com.dayu.rechargeqh.card.RegisteredCard;
import com.dayu.rechargeqh.card.TestCard;
import com.dayu.rechargeqh.databinding.ActivityAdminBinding;
import com.dayu.rechargeqh.dbBean.DomainBean;
import com.dayu.rechargeqh.dbBean.PassWordCardBean;
import com.dayu.rechargeqh.dbBean.PowerBean;
import com.dayu.rechargeqh.utils.TipUtil;

/**
 * Copyright (C), 2023,

 app/src/main/java/com/dayu/rechargeqh/activity/SysIpActivity.java

File was renamed from app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.activity;
package com.dayu.rechargeqh.activity;

import android.os.Bundle;
import android.text.TextUtils;
@@ -6,14 +6,12 @@
import android.view.View;
import android.widget.Toast;

import com.dayu.recharge.MyApplication;
import com.dayu.recharge.databinding.ActivityIpBinding;
import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.recharge.dbBean.IpBean;
import com.dayu.recharge.utils.DeviceNumberUtils;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.utils.ToastUtil;
import com.dayu.recharge.utils.WSHelper;
import com.dayu.rechargeqh.MyApplication;
import com.dayu.rechargeqh.databinding.ActivityIpBinding;
import com.dayu.rechargeqh.dbBean.AdminDataBean;
import com.dayu.rechargeqh.dbBean.IpBean;
import com.dayu.rechargeqh.utils.TipUtil;
import com.dayu.rechargeqh.utils.ToastUtil;

/**
 * Copyright (C), 2022,

 app/src/main/java/com/dayu/rechargeqh/adapter/BaseRecyclerAdapter.java

File was renamed from app/src/main/java/com/dayu/recharge/adapter/BaseRecyclerAdapter.java
@@ -1,11 +1,11 @@
package com.dayu.recharge.adapter;
package com.dayu.rechargeqh.adapter;

import android.view.ViewGroup;

import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;

import com.dayu.recharge.databinding.ItemNoMoreBinding;
import com.dayu.rechargeqh.databinding.ItemNoMoreBinding;

/**
 * Copyright (C), 2023,

 app/src/main/java/com/dayu/rechargeqh/adapter/NewCardAdapter.java

File was renamed from app/src/main/java/com/dayu/recharge/adapter/NewCardAdapter.java
@@ -1,22 +1,18 @@
package com.dayu.recharge.adapter;
package com.dayu.rechargeqh.adapter;

import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
import androidx.recyclerview.widget.RecyclerView;

import com.dayu.recharge.R;
import com.dayu.recharge.databinding.ItemNewCardBinding;
import com.dayu.recharge.databinding.ItemNoMoreBinding;
import com.dayu.recharge.dbBean.UserCardBean;
import com.dayu.recharge.utils.DateUtil;
import com.dayu.rechargeqh.R;
import com.dayu.rechargeqh.databinding.ItemNewCardBinding;
import com.dayu.rechargeqh.databinding.ItemNoMoreBinding;
import com.dayu.rechargeqh.dbBean.UserCardBean;
import com.dayu.rechargeqh.utils.DateUtil;

import java.util.List;


 app/src/main/java/com/dayu/rechargeqh/adapter/RechargeAdapter.java

File was renamed from app/src/main/java/com/dayu/recharge/adapter/RechargeAdapter.java
@@ -1,25 +1,18 @@
package com.dayu.recharge.adapter;
package com.dayu.rechargeqh.adapter;

import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.databinding.DataBindingUtil;
import androidx.recyclerview.widget.RecyclerView;

import com.dayu.recharge.R;
import com.dayu.recharge.databinding.ItemRechargeBinding;
import com.dayu.recharge.databinding.ItemNoMoreBinding;
import com.dayu.recharge.databinding.ItemRechargeBinding;
import com.dayu.recharge.dbBean.RechargeBean;
import com.dayu.recharge.dbBean.UserCardBean;
import com.dayu.recharge.utils.DateUtil;
import com.dayu.rechargeqh.R;
import com.dayu.rechargeqh.databinding.ItemNoMoreBinding;
import com.dayu.rechargeqh.databinding.ItemRechargeBinding;
import com.dayu.rechargeqh.dbBean.RechargeBean;
import com.dayu.rechargeqh.utils.DateUtil;

import java.util.List;


 app/src/main/java/com/dayu/rechargeqh/adapter/ReplacementAdapter.java

File was renamed from app/src/main/java/com/dayu/recharge/adapter/ReplacementAdapter.java
@@ -1,6 +1,5 @@
package com.dayu.recharge.adapter;
package com.dayu.rechargeqh.adapter;

import android.app.Activity;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.ViewGroup;
@@ -9,13 +8,13 @@
import androidx.databinding.DataBindingUtil;
import androidx.recyclerview.widget.RecyclerView;

import com.dayu.recharge.R;
import com.dayu.recharge.activity.ReplacementActivity;
import com.dayu.recharge.databinding.ItemNewCardBinding;
import com.dayu.recharge.databinding.ItemNoMoreBinding;
import com.dayu.recharge.databinding.ItemReplacementBinding;
import com.dayu.recharge.dbBean.UserCardBean;
import com.dayu.recharge.utils.DateUtil;
import com.dayu.rechargeqh.R;
import com.dayu.rechargeqh.activity.ReplacementActivity;
import com.dayu.rechargeqh.databinding.ItemNewCardBinding;
import com.dayu.rechargeqh.databinding.ItemNoMoreBinding;
import com.dayu.rechargeqh.databinding.ItemReplacementBinding;
import com.dayu.rechargeqh.dbBean.UserCardBean;
import com.dayu.rechargeqh.utils.DateUtil;

import java.util.List;


 app/src/main/java/com/dayu/rechargeqh/bean/TableItem.java

File was renamed from app/src/main/java/com/dayu/recharge/bean/TableItem.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.bean;
package com.dayu.rechargeqh.bean;

/**
 * Created by Administrator on 2017/5/24.

 app/src/main/java/com/dayu/rechargeqh/bean/TransBean.java

File was renamed from app/src/main/java/com/dayu/recharge/bean/TransBean.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.bean;
package com.dayu.rechargeqh.bean;

import android.os.Parcel;
import android.os.Parcelable;

 app/src/main/java/com/dayu/rechargeqh/card/BaseCard.java

New file
@@ -0,0 +1,55 @@
package com.dayu.rechargeqh.card;

import com.dayu.rechargeqh.dao.AppDatabase;
import com.dayu.rechargeqh.dbBean.CardData;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.MyCommon;
import com.tencent.bugly.crashreport.CrashReport;

import java.io.Serializable;

/**
 * Copyright (C), 2023,
 * Author: zuo
 * Date: 2023-11-07 20:52
 * Description:所有卡结构的父类
 */
public class BaseCard implements Serializable {
    public String cardData;//标识码

    public void setCardData(AppDatabase baseDao, String cardType) {
        try {
            CardData cardDataBean = baseDao.cardDataDao().findFirst(cardType);
            if (cardDataBean != null) {
                cardData = cardDataBean.getCardIdentifying();
            } else {
                cardData=MyCommon.getDefaultCardData(cardType);
            }
        } catch (Exception e) {
            CrashReport.postCatchedException(e);
        }
    }


    /**
     * 前15个字节算术累加和 不含进位
     *
     * @param data 源数据
     * @return 16进制
     */
    public byte getByteSum(byte[] data) {
        if (data != null) {
            int sum = 0;
            for (byte b : data) {
                sum += b & 0xFF; // & 0xFF 可以将字节扩展为正整数，避免符号位的影响
            }
            String hex = HexUtil.get10to16CompleteHex(sum);
            hex = HexUtil.spaceHex(hex);
            String[] hexArr = hex.split(" ");
            return HexUtil.hexToByte(hexArr[hexArr.length - 1]);
        }
        return 0;
    }


}

 app/src/main/java/com/dayu/rechargeqh/card/BlackCard.java

New file
@@ -0,0 +1,68 @@
package com.dayu.rechargeqh.card;

import com.dayu.rechargeqh.dao.AppDatabase;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.MyCommon;

import java.io.Serializable;
import java.util.List;

/**
 * author: zuo
 * Date: 2024-02-29
 * Time: 17:17
 * 备注：配置黑卡  当用户丢失卡时，需要在对应的控制器把此用户配置为黑户，防止非法用水
 */
public class BlackCard extends BaseCard implements Serializable {

    public String cardType = MyCommon.BLACK;

    public String blackCard;//黑户卡号

    public String getBlackCard() {
        return blackCard;
    }

    public void setBlackCard(String blackCard) {
        this.blackCard = blackCard;
    }

    public byte[] toByte(AppDatabase appDatabase) {
        setCardData(appDatabase, cardType);
        BlackCard.Zero zero = new BlackCard.Zero();
        return zero.toByte();
    }


    public static BlackCard getBean(List<byte[]> data) {
        BlackCard blackCard = new BlackCard();
        if (data != null) {
            byte[] zero = data.get(0);
            byte[] cardDataByte = new byte[4];
            System.arraycopy(zero, 1, cardDataByte, 0, cardDataByte.length);
            blackCard.cardData = HexUtil.bytesToHex(cardDataByte);

            byte[] blackCardByte = new byte[4];
            System.arraycopy(zero, 5, blackCardByte, 0, blackCardByte.length);
            blackCard.blackCard = HexUtil.bytesToHex(blackCardByte);
        }

        return blackCard;
    }

    public class Zero {
        public byte[] toByte() {
            byte[] data = new byte[16];
            data[0] = HexUtil.hexToByte(cardType);
            byte[] cardDatas = HexUtil.hexToByteArray(cardData);
            System.arraycopy(cardDatas, 0, data, 1, cardDatas.length);
            byte[] blackCardByte = HexUtil.hexToByteArray(blackCard);
            System.arraycopy(blackCardByte, 0, data, 5, blackCardByte.length);
            data[15] = getByteSum(data);
            return data;
        }

    }


}

 app/src/main/java/com/dayu/rechargeqh/card/CleanCard.java

New file
@@ -0,0 +1,40 @@
package com.dayu.rechargeqh.card;

import com.dayu.rechargeqh.dao.AppDatabase;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.MyCommon;

import java.io.Serializable;

/**
 * Copyright (C), 2023,
 * Author: zuo
 * Date: 2023-11-08 10:57
 * Description:清零卡
 */
public class CleanCard extends BaseCard implements Serializable {
    public String cardType = MyCommon.CLEAN_CARD_TYPE;//卡类型

    public String getCardData() {
        return cardData;
    }


    public byte[] toByte(AppDatabase appDatabase) {
        setCardData(appDatabase, cardType);
        Zero zero = new Zero();
        return zero.toByte();
    }

    public class Zero {
        public byte[] toByte() {
            byte[] data = new byte[16];
            data[0] = HexUtil.hexToByte(cardType);
            byte[] cardDatas = HexUtil.hexToByteArray(cardData);
            System.arraycopy(cardDatas, 0, data, 1, cardDatas.length);
            data[15] = getByteSum(data);
            return data;
        }

    }
}

 app/src/main/java/com/dayu/rechargeqh/card/CleanUserCard.java

New file
@@ -0,0 +1,35 @@
package com.dayu.rechargeqh.card;

import com.dayu.rechargeqh.dao.AppDatabase;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.MyCommon;

import java.io.Serializable;

/**
 * Copyright (C), 2023,
 * Author: zuo
 * Date: 2023-11-08 11:39
 * Description:删除全部用户卡
 */
public class CleanUserCard extends BaseCard implements Serializable {
    public String cardType = MyCommon.CLEAN_ALL_USER_CARD_TYPE;//卡类型

    public byte[] toByte(AppDatabase appDatabase) {
        setCardData(appDatabase, cardType);
        Zero zero = new Zero();
        return zero.toByte();
    }

    public class Zero {
        public byte[] toByte() {
            byte[] data = new byte[16];
            data[0] = HexUtil.hexToByte(cardType);
            byte[] cardDatas = HexUtil.hexToByteArray(cardData);
            System.arraycopy(cardDatas, 0, data, 1, cardDatas.length);
            data[15] = getByteSum(data);
            return data;
        }

    }
}

 app/src/main/java/com/dayu/rechargeqh/card/ConfigurationPowerCard.java

File was renamed from app/src/main/java/com/dayu/recharge/card/ConfigurationPowerCard.java
@@ -1,7 +1,8 @@
package com.dayu.recharge.card;
package com.dayu.rechargeqh.card;

import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.MyCommon;
import com.dayu.rechargeqh.dao.AppDatabase;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.MyCommon;
import com.tencent.bugly.crashreport.CrashReport;

import java.io.Serializable;
@@ -15,11 +16,10 @@
 * 为方便现场更换设备时重新注册的问题，配置设备信息卡，首先刷卡，把原设备的注册号和ID号读到卡内，
 * 同时卡状态则00修改为FF，再新设备上刷此卡时，注册号和ID号自动写到控制器内，可以直接刷卡使用
 */
public class ConfigurationPowerCard implements Serializable {
public class ConfigurationPowerCard extends BaseCard implements Serializable {


    public String cardType = MyCommon.CONFIGURATION_POWER_CARD_TYPE;//卡类型
    public String cardData = "A0B1C289";//标识码

    public String getCardData() {
        return cardData;
@@ -49,19 +49,18 @@
        }
    }

    public byte[] toByte() {
    public byte[] toByte(AppDatabase appDatabase) {
        setCardData(appDatabase,cardType);
        Zero zero = new Zero();
        return zero.toByte();
    }

    public class Zero extends BaseCard {
    public class Zero  {
        public byte[] toByte() {
            byte[] data = new byte[16];
            data[0] = HexUtil.hexToByte(cardType);
            byte[] cardDatas = HexUtil.hexToByteArray(cardData);
            for (int i = 0; i < 4; i++) {
                data[i + 1] = cardDatas[i];
            }
                System.arraycopy(cardDatas, 0, data, 1, cardDatas.length);
            if (power != null) {
                float floatPower = Float.parseFloat(power);
                int intPower = (int) Math.ceil(floatPower); // 将浮点数向上取整并转换为整数

 app/src/main/java/com/dayu/rechargeqh/card/ConfigureDeviceRegistrationCrad.java

File was renamed from app/src/main/java/com/dayu/recharge/card/ConfigureDeviceRegistrationCrad.java
@@ -1,7 +1,8 @@
package com.dayu.recharge.card;
package com.dayu.rechargeqh.card;

import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.MyCommon;
import com.dayu.rechargeqh.dao.AppDatabase;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.MyCommon;

import java.io.Serializable;

@@ -14,7 +15,7 @@
 * <p>
 * 为方便现场更换设备时重新注册的问题，配置设备信息卡，首先刷卡，把原设备的注册号和ID号读到卡内，同时卡状态则00修改为FF，再新设备上刷此卡时，注册号和ID号自动写到控制器内，可以直接刷卡使用
 */
public class ConfigureDeviceRegistrationCrad implements Serializable {
public class ConfigureDeviceRegistrationCrad extends BaseCard implements Serializable {
    public String cardType = MyCommon.CONFIGURATION_CARD_TYPE;//卡类型
    public String cardData = "A0B1C289";//标识码

@@ -22,20 +23,18 @@
        return cardData;
    }

    public byte[] toByte() {
    public byte[] toByte(AppDatabase appDatabase) {
        setCardData(appDatabase, cardType);
        Zero zero = new Zero();
        return zero.toByte();
    }

    public class Zero extends BaseCard {
    public class Zero  {
        public byte[] toByte() {
            byte[] data = new byte[16];
            data[0] = HexUtil.hexToByte(cardType);
            byte[] cardDatas = HexUtil.hexToByteArray(cardData);
            for (int i = 0; i < 4; i++) {
                data[i + 1] = cardDatas[i];
            }

                System.arraycopy(cardDatas, 0, data, 1, cardDatas.length);
            data[15] = getByteSum(data);
            return data;
        }

 app/src/main/java/com/dayu/rechargeqh/card/DomainCard.java

File was renamed from app/src/main/java/com/dayu/recharge/card/DomainCard.java
@@ -1,15 +1,13 @@
package com.dayu.recharge.card;
package com.dayu.rechargeqh.card;

import com.dayu.recharge.tools.BcdUtil;
import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.MornyUtil;
import com.dayu.recharge.utils.MyCommon;
import com.dayu.rechargeqh.tools.BcdUtil;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.MyCommon;
import com.tencent.bugly.crashreport.CrashReport;

import java.io.Serializable;
import java.net.IDN;
import java.nio.charset.StandardCharsets;
import java.util.Calendar;
import java.util.List;

/**

 app/src/main/java/com/dayu/rechargeqh/card/ElectricPriceCard.java

File was renamed from app/src/main/java/com/dayu/recharge/card/ElectricPriceCard.java
@@ -1,7 +1,8 @@
package com.dayu.recharge.card;
package com.dayu.rechargeqh.card;

import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.MyCommon;
import com.dayu.rechargeqh.dao.AppDatabase;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.MyCommon;

import java.io.Serializable;
import java.util.List;
@@ -12,19 +13,20 @@
 * Time: 16:59
 * 备注：电量单价卡
 */
public class ElectricPriceCard implements Serializable {
public class ElectricPriceCard extends BaseCard implements Serializable {
    public String cardType = MyCommon.ELECTRIC_PRICE;

    public String cardData = "A0B1C289";//1-4下标固定值

    public Float electricPrice;// 电量单价(低)单位是元，3位小数点

    public Float getElectricPrice() {
        return electricPrice;
    }

    public void setElectricPrice(Float electricPrice) {
        this.electricPrice = electricPrice;
    }




    public byte[] toByte() {
    public byte[] toByte(AppDatabase appDatabase) {
        setCardData(appDatabase, cardType);
        ElectricPriceCard.Zero zero = new ElectricPriceCard.Zero();
        return zero.toByte();
    }
@@ -53,7 +55,7 @@
    /**
     * 第1扇区0块 存储的数据
     */
    public class Zero extends BaseCard {
    public class Zero  {
        public byte[] toByte() {
            byte[] data = new byte[16];
            data[0] = HexUtil.hexToByte(cardType);

 app/src/main/java/com/dayu/rechargeqh/card/ManageCard.java

File was renamed from app/src/main/java/com/dayu/recharge/card/ManageCard.java
@@ -1,7 +1,8 @@
package com.dayu.recharge.card;
package com.dayu.rechargeqh.card;

import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.MyCommon;
import com.dayu.rechargeqh.dao.AppDatabase;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.MyCommon;

import java.io.Serializable;

@@ -11,9 +12,9 @@
 * Date: 2023-11-08 10:19
 * Description: 管理卡  第1扇区 0块
 */
public class ManageCard implements Serializable {
public class ManageCard extends BaseCard implements Serializable {
    public String cardType = MyCommon.MANAGE_CRAD;//卡类型
    public String cardData = "A0B1C289";//标识码
//    public String cardData = "A0B1C289";//标识码


    /**
@@ -32,22 +33,21 @@
        return cardData;
    }

    public byte[] toZeroByte() {
    public byte[] toZeroByte(AppDatabase appDatabase) {
        setCardData(appDatabase, cardType);
        Zero zero = new Zero();
        return zero.toByte();
    }

    public class Zero extends BaseCard {
    public class Zero {
        public byte[] toByte() {
            byte[] data = new byte[16];
            data[0] = HexUtil.hexToByte(cardType);

            byte[] cardDataByte = HexUtil.hexToByteArray(cardData);
            if (cardDataByte != null) {
                System.arraycopy(cardDataByte, 0, data, 1, cardDataByte.length);
            }
            System.arraycopy(cardDataByte, 0, data, 1, cardDataByte.length);

            if (userCard!=null){
            if (userCard != null) {
                System.arraycopy(userCard, 0, data, 5, userCard.length);
            }


 app/src/main/java/com/dayu/rechargeqh/card/PassWordCard.java

File was renamed from app/src/main/java/com/dayu/recharge/card/PassWordCard.java
@@ -1,7 +1,8 @@
package com.dayu.recharge.card;
package com.dayu.rechargeqh.card;

import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.MyCommon;
import com.dayu.rechargeqh.dao.AppDatabase;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.MyCommon;

import java.io.Serializable;
import java.util.List;
@@ -12,9 +13,9 @@
 * Date: 2024-3-04 11:22
 * Description:密码卡
 */
public class PassWordCard implements Serializable {
public class PassWordCard extends BaseCard implements Serializable {
    public String cardType = MyCommon.PASS_WORD_CRAD_TYPE;//卡类型
    public String cardData = "A0B1C289";//标识码

    public String passWord;//六位的密码

    public String getPassWord() {
@@ -25,24 +26,23 @@
        this.passWord = passWord;
    }

    public static PassWordCard getBean(List<byte[]> data){
    public static PassWordCard getBean(List<byte[]> data) {

        if (data!=null){
            PassWordCard passWordCard=new PassWordCard();
        if (data != null) {
            PassWordCard passWordCard = new PassWordCard();

            byte[] zero=data.get(0);
            byte[] passWordByte=new byte[6];
            byte[] zero = data.get(0);
            byte[] passWordByte = new byte[6];
            System.arraycopy(zero, 5, passWordByte, 0, passWordByte.length);
            passWordCard.passWord = HexUtil.bytesToHex(passWordByte);
            return passWordCard;
        }
        return null;


    }


    public byte[] toByte() {
    public byte[] toByte(AppDatabase appDatabase) {
        setCardData(appDatabase, cardType);
        Zero zero = new Zero();
        return zero.toByte();
    }

 app/src/main/java/com/dayu/rechargeqh/card/RegionCard.java

File was renamed from app/src/main/java/com/dayu/recharge/card/RegionCard.java
@@ -1,7 +1,7 @@
package com.dayu.recharge.card;
package com.dayu.rechargeqh.card;

import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.MyCommon;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.MyCommon;

import java.io.Serializable;
import java.util.List;
@@ -12,7 +12,7 @@
 * Time: 16:29
 * 备注：区域表号卡
 */
public class RegionCard implements Serializable {
public class RegionCard extends BaseCard implements Serializable {

    public String cardType = MyCommon.REGION;//卡命令

@@ -21,6 +21,13 @@
    public short controllerCodel;// 控制器编号(低前高后) 本区域内控制器编号


    public short getRegion() {
        return region;
    }

    public short getControllerCodel() {
        return controllerCodel;
    }

    public byte[] toByte() {
        RegionCard.Zero zero = new RegionCard.Zero();
@@ -51,7 +58,7 @@
    /**
     * 第1扇区0块 存储的数据
     */
    public class Zero extends BaseCard {
    public class Zero  {
        public byte[] toByte() {
            byte[] data = new byte[16];
            data[0] = HexUtil.hexToByte(cardType);

 app/src/main/java/com/dayu/rechargeqh/card/RegisteredCard.java

File was renamed from app/src/main/java/com/dayu/recharge/card/RegisteredCard.java
@@ -1,7 +1,8 @@
package com.dayu.recharge.card;
package com.dayu.rechargeqh.card;

import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.MyCommon;
import com.dayu.rechargeqh.dao.AppDatabase;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.MyCommon;

import java.io.Serializable;

@@ -11,27 +12,25 @@
 * Date: 2023-11-08 11:36
 * Description:重新注册设备卡：用于写用户注册号
 */
public class RegisteredCard implements Serializable {
public class RegisteredCard extends BaseCard implements Serializable {
    public String cardType = MyCommon.REGISTERED_CARD_TYPE;//卡类型
    public String cardData = "A0B1C289";//标识码

    public String getCardData() {
        return cardData;
    }

    public byte[] toByte() {
    public byte[] toByte(AppDatabase appDatabase) {
        setCardData(appDatabase, cardType);
        Zero zero = new Zero();
        return zero.toByte();
    }

    public class Zero extends BaseCard {
    public class Zero {
        public byte[] toByte() {
            byte[] data = new byte[16];
            data[0] = HexUtil.hexToByte(cardType);
            byte[] cardDatas = HexUtil.hexToByteArray(cardData);
            for (int i = 0; i < 4; i++) {
                data[i + 1] = cardDatas[i];
            }
            System.arraycopy(cardDatas, 0, data, 1, cardDatas.length);
            data[15] = getByteSum(data);
            return data;
        }

 app/src/main/java/com/dayu/rechargeqh/card/TestCard.java

New file
@@ -0,0 +1,40 @@
package com.dayu.rechargeqh.card;

import com.dayu.rechargeqh.dao.AppDatabase;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.MyCommon;

import java.io.Serializable;

/**
 * Copyright (C), 2023,
 * Author: zuo
 * Date: 2023-11-08 13:23
 * Description: 测试卡
 */
public class TestCard extends BaseCard implements Serializable {
    public String cardType = MyCommon.TEST_CARD_TYPE;//卡类型

    public String getCardData() {
        return cardData;
    }

    public byte[] toByte(AppDatabase appDatabase) {
        setCardData(appDatabase, cardType);
        Zero zero = new Zero();
        return zero.toByte();
    }

    public class Zero {
        public byte[] toByte() {
            byte[] data = new byte[16];
            data[0] = HexUtil.hexToByte(cardType);
            byte[] cardDatas = HexUtil.hexToByteArray(cardData);
            System.arraycopy(cardDatas, 0, data, 1, cardDatas.length);
            data[15] = getByteSum(data);
            return data;
        }

    }
}


 app/src/main/java/com/dayu/rechargeqh/card/UserCard.java

File was renamed from app/src/main/java/com/dayu/recharge/card/UserCard.java
@@ -1,14 +1,11 @@
package com.dayu.recharge.card;
package com.dayu.rechargeqh.card;

import com.dayu.recharge.tools.BcdUtil;
import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.MornyUtil;
import com.dayu.recharge.utils.MyCommon;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.MyCommon;
import com.tencent.bugly.crashreport.CrashReport;

import java.io.Serializable;
import java.util.Calendar;
import java.util.Date;
import java.util.List;

/**

 app/src/main/java/com/dayu/rechargeqh/dao/AdminDataDao.java

File was renamed from app/src/main/java/com/dayu/recharge/dao/AdminDataDao.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dao;
package com.dayu.rechargeqh.dao;

import androidx.room.Dao;
import androidx.room.Delete;
@@ -7,7 +7,7 @@
import androidx.room.Query;
import androidx.room.Update;

import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.rechargeqh.dbBean.AdminDataBean;

/**
 * Copyright (C), 2023,

 app/src/main/java/com/dayu/rechargeqh/dao/AppDatabase.java

File was renamed from app/src/main/java/com/dayu/recharge/dao/AppDatabase.java
@@ -1,20 +1,20 @@
package com.dayu.recharge.dao;
package com.dayu.rechargeqh.dao;

import androidx.room.Database;
import androidx.room.RoomDatabase;

import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.recharge.dbBean.CardData;
import com.dayu.recharge.dbBean.DeviceNumber;
import com.dayu.recharge.dbBean.DomainBean;
import com.dayu.recharge.dbBean.ElectricPriceBean;
import com.dayu.recharge.dbBean.IdentityBean;
import com.dayu.recharge.dbBean.IpBean;
import com.dayu.recharge.dbBean.PassWordBean;
import com.dayu.recharge.dbBean.PassWordCardBean;
import com.dayu.recharge.dbBean.PowerBean;
import com.dayu.recharge.dbBean.RechargeBean;
import com.dayu.recharge.dbBean.UserCardBean;
import com.dayu.rechargeqh.dbBean.AdminDataBean;
import com.dayu.rechargeqh.dbBean.CardData;
import com.dayu.rechargeqh.dbBean.DeviceNumber;
import com.dayu.rechargeqh.dbBean.DomainBean;
import com.dayu.rechargeqh.dbBean.ElectricPriceBean;
import com.dayu.rechargeqh.dbBean.IdentityBean;
import com.dayu.rechargeqh.dbBean.IpBean;
import com.dayu.rechargeqh.dbBean.PassWordBean;
import com.dayu.rechargeqh.dbBean.PassWordCardBean;
import com.dayu.rechargeqh.dbBean.PowerBean;
import com.dayu.rechargeqh.dbBean.RechargeBean;
import com.dayu.rechargeqh.dbBean.UserCardBean;

/**
 * Copyright (C), 2023,

 app/src/main/java/com/dayu/rechargeqh/dao/BaseDaoSingleton.java

File was renamed from app/src/main/java/com/dayu/recharge/dao/BaseDaoSingleton.java
@@ -1,12 +1,9 @@
package com.dayu.recharge.dao;
package com.dayu.rechargeqh.dao;

import android.content.Context;
import android.os.Environment;
import android.os.FileUtils;

import androidx.room.Room;

import com.dayu.recharge.utils.MyFileUtil;

import java.io.File;

@@ -19,7 +16,7 @@
public class BaseDaoSingleton {
    public static AppDatabase baseDao;
    public static AppDatabase AsynchBaseDao;
    public static String SqlitePath = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + ".dayu" + File.separator + "data" + File.separator;
    public static String SqlitePath = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + ".dayu" + File.separator + "data_qh" + File.separator;

    //MyFileUtil.SqlitePath +
    public static AppDatabase getInstance(Context context) {

 app/src/main/java/com/dayu/rechargeqh/dao/CardDataDao.java

File was renamed from app/src/main/java/com/dayu/recharge/dao/CardDataDao.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dao;
package com.dayu.rechargeqh.dao;

import androidx.room.Dao;
import androidx.room.Insert;
@@ -6,7 +6,7 @@
import androidx.room.Query;
import androidx.room.Update;

import com.dayu.recharge.dbBean.CardData;
import com.dayu.rechargeqh.dbBean.CardData;

/**
 * Created by Android Studio.

 app/src/main/java/com/dayu/rechargeqh/dao/DeviceNumberDao.java

File was renamed from app/src/main/java/com/dayu/recharge/dao/DeviceNumberDao.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dao;
package com.dayu.rechargeqh.dao;

import androidx.room.Dao;
import androidx.room.Delete;
@@ -7,7 +7,7 @@
import androidx.room.Query;
import androidx.room.Update;

import com.dayu.recharge.dbBean.DeviceNumber;
import com.dayu.rechargeqh.dbBean.DeviceNumber;

/**
 * Copyright (C), 2023,

 app/src/main/java/com/dayu/rechargeqh/dao/DomainPortDao.java

File was renamed from app/src/main/java/com/dayu/recharge/dao/DomainPortDao.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dao;
package com.dayu.rechargeqh.dao;

import androidx.room.Dao;
import androidx.room.Delete;
@@ -7,8 +7,7 @@
import androidx.room.Query;
import androidx.room.Update;

import com.dayu.recharge.dbBean.DomainBean;
import com.dayu.recharge.dbBean.DomainBean;
import com.dayu.rechargeqh.dbBean.DomainBean;

/**
 * Copyright (C), 2023,

 app/src/main/java/com/dayu/rechargeqh/dao/ElectricPriceDao.java

File was renamed from app/src/main/java/com/dayu/recharge/dao/ElectricPriceDao.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dao;
package com.dayu.rechargeqh.dao;

import androidx.room.Dao;
import androidx.room.Delete;
@@ -7,7 +7,7 @@
import androidx.room.Query;
import androidx.room.Update;

import com.dayu.recharge.dbBean.ElectricPriceBean;
import com.dayu.rechargeqh.dbBean.ElectricPriceBean;

/**
 * Copyright (C), 2023,

 app/src/main/java/com/dayu/rechargeqh/dao/IdentityDao.java

File was renamed from app/src/main/java/com/dayu/recharge/dao/IdentityDao.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dao;
package com.dayu.rechargeqh.dao;

import androidx.room.Dao;
import androidx.room.Delete;
@@ -7,7 +7,7 @@
import androidx.room.Query;
import androidx.room.Update;

import com.dayu.recharge.dbBean.IdentityBean;
import com.dayu.rechargeqh.dbBean.IdentityBean;

/**
 * Created by Android Studio.

 app/src/main/java/com/dayu/rechargeqh/dao/IpDao.java

File was renamed from app/src/main/java/com/dayu/recharge/dao/IpDao.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dao;
package com.dayu.rechargeqh.dao;

import androidx.room.Dao;
import androidx.room.Delete;
@@ -7,8 +7,7 @@
import androidx.room.Query;
import androidx.room.Update;

import com.dayu.recharge.dbBean.IpBean;
import com.dayu.recharge.dbBean.IpBean;
import com.dayu.rechargeqh.dbBean.IpBean;

/**
 * Copyright (C), 2023,

 app/src/main/java/com/dayu/rechargeqh/dao/LoginPsDao.java

File was renamed from app/src/main/java/com/dayu/recharge/dao/LoginPsDao.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dao;
package com.dayu.rechargeqh.dao;

import androidx.room.Dao;
import androidx.room.Delete;
@@ -7,7 +7,7 @@
import androidx.room.Query;
import androidx.room.Update;

import com.dayu.recharge.dbBean.PassWordBean;
import com.dayu.rechargeqh.dbBean.PassWordBean;

/**
 * Copyright (C), 2023,

 app/src/main/java/com/dayu/rechargeqh/dao/PassWordCardDao.java

File was renamed from app/src/main/java/com/dayu/recharge/dao/PassWordCardDao.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dao;
package com.dayu.rechargeqh.dao;

import androidx.room.Dao;
import androidx.room.Delete;
@@ -7,7 +7,7 @@
import androidx.room.Query;
import androidx.room.Update;

import com.dayu.recharge.dbBean.PassWordCardBean;
import com.dayu.rechargeqh.dbBean.PassWordCardBean;

/**
 * Copyright (C), 2023,

 app/src/main/java/com/dayu/rechargeqh/dao/PowerDao.java

File was renamed from app/src/main/java/com/dayu/recharge/dao/PowerDao.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dao;
package com.dayu.rechargeqh.dao;

import androidx.room.Dao;
import androidx.room.Delete;
@@ -7,7 +7,7 @@
import androidx.room.Query;
import androidx.room.Update;

import com.dayu.recharge.dbBean.PowerBean;
import com.dayu.rechargeqh.dbBean.PowerBean;

/**
 * Copyright (C), 2023,

 app/src/main/java/com/dayu/rechargeqh/dao/RechargeDao.java

File was renamed from app/src/main/java/com/dayu/recharge/dao/RechargeDao.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dao;
package com.dayu.rechargeqh.dao;

import androidx.lifecycle.LiveData;
import androidx.room.Dao;
@@ -8,9 +8,7 @@
import androidx.room.Query;
import androidx.room.Update;

import com.dayu.recharge.dbBean.RechargeBean;
import com.dayu.recharge.dbBean.RechargeBean;
import com.dayu.recharge.dbBean.UserCardBean;
import com.dayu.rechargeqh.dbBean.RechargeBean;

import java.util.List;


 app/src/main/java/com/dayu/rechargeqh/dao/UserCardDao.java

File was renamed from app/src/main/java/com/dayu/recharge/dao/UserCardDao.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dao;
package com.dayu.rechargeqh.dao;

import androidx.room.Dao;
import androidx.room.Delete;
@@ -7,7 +7,7 @@
import androidx.room.Query;
import androidx.room.Update;

import com.dayu.recharge.dbBean.UserCardBean;
import com.dayu.rechargeqh.dbBean.UserCardBean;

import java.util.List;


 app/src/main/java/com/dayu/rechargeqh/dbBean/AdminDataBean.java

File was renamed from app/src/main/java/com/dayu/recharge/dbBean/AdminDataBean.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dbBean;
package com.dayu.rechargeqh.dbBean;

import androidx.room.Entity;
import androidx.room.PrimaryKey;

 app/src/main/java/com/dayu/rechargeqh/dbBean/CardData.java

File was renamed from app/src/main/java/com/dayu/recharge/dbBean/CardData.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dbBean;
package com.dayu.rechargeqh.dbBean;

import androidx.room.Entity;
import androidx.room.PrimaryKey;

 app/src/main/java/com/dayu/rechargeqh/dbBean/DeviceNumber.java

File was renamed from app/src/main/java/com/dayu/recharge/dbBean/DeviceNumber.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dbBean;
package com.dayu.rechargeqh.dbBean;

import androidx.room.Entity;
import androidx.room.PrimaryKey;

 app/src/main/java/com/dayu/rechargeqh/dbBean/DomainBean.java

File was renamed from app/src/main/java/com/dayu/recharge/dbBean/DomainBean.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dbBean;
package com.dayu.rechargeqh.dbBean;

import androidx.room.Entity;
import androidx.room.PrimaryKey;

 app/src/main/java/com/dayu/rechargeqh/dbBean/ElectricPriceBean.java

File was renamed from app/src/main/java/com/dayu/recharge/dbBean/ElectricPriceBean.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dbBean;
package com.dayu.rechargeqh.dbBean;

import androidx.room.Entity;
import androidx.room.PrimaryKey;

 app/src/main/java/com/dayu/rechargeqh/dbBean/IdentityBean.java

File was renamed from app/src/main/java/com/dayu/recharge/dbBean/IdentityBean.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dbBean;
package com.dayu.rechargeqh.dbBean;

import androidx.room.Entity;
import androidx.room.PrimaryKey;

 app/src/main/java/com/dayu/rechargeqh/dbBean/IpBean.java

File was renamed from app/src/main/java/com/dayu/recharge/dbBean/IpBean.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dbBean;
package com.dayu.rechargeqh.dbBean;

import androidx.room.Entity;
import androidx.room.PrimaryKey;

 app/src/main/java/com/dayu/rechargeqh/dbBean/PassWordBean.java

File was renamed from app/src/main/java/com/dayu/recharge/dbBean/PassWordBean.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dbBean;
package com.dayu.rechargeqh.dbBean;

import androidx.room.Entity;
import androidx.room.PrimaryKey;

 app/src/main/java/com/dayu/rechargeqh/dbBean/PassWordCardBean.java

File was renamed from app/src/main/java/com/dayu/recharge/dbBean/PassWordCardBean.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dbBean;
package com.dayu.rechargeqh.dbBean;

import androidx.room.Entity;
import androidx.room.PrimaryKey;

 app/src/main/java/com/dayu/rechargeqh/dbBean/PowerBean.java

File was renamed from app/src/main/java/com/dayu/recharge/dbBean/PowerBean.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dbBean;
package com.dayu.rechargeqh.dbBean;

import androidx.room.Entity;
import androidx.room.PrimaryKey;

 app/src/main/java/com/dayu/rechargeqh/dbBean/RechargeBean.java

File was renamed from app/src/main/java/com/dayu/recharge/dbBean/RechargeBean.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dbBean;
package com.dayu.rechargeqh.dbBean;

import androidx.room.Entity;
import androidx.room.PrimaryKey;

 app/src/main/java/com/dayu/rechargeqh/dbBean/UserCardBean.java

File was renamed from app/src/main/java/com/dayu/recharge/dbBean/UserCardBean.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.dbBean;
package com.dayu.rechargeqh.dbBean;

import androidx.room.Entity;
import androidx.room.PrimaryKey;

 app/src/main/java/com/dayu/rechargeqh/model/RechargeListModel.java

File was renamed from app/src/main/java/com/dayu/recharge/model/RechargeListModel.java
@@ -1,11 +1,10 @@
package com.dayu.recharge.model;
package com.dayu.rechargeqh.model;

import androidx.lifecycle.LiveData;
import androidx.lifecycle.ViewModel;

import com.dayu.recharge.activity.BaseActivity;
import com.dayu.recharge.dao.RechargeDao;
import com.dayu.recharge.dbBean.RechargeBean;
import com.dayu.rechargeqh.activity.BaseActivity;
import com.dayu.rechargeqh.dao.RechargeDao;
import com.dayu.rechargeqh.dbBean.RechargeBean;

import java.util.List;


 app/src/main/java/com/dayu/rechargeqh/model/UserListMode.java

File was renamed from app/src/main/java/com/dayu/recharge/model/UserListMode.java
@@ -1,8 +1,8 @@
package com.dayu.recharge.model;
package com.dayu.rechargeqh.model;

import android.app.Activity;

import com.dayu.recharge.dbBean.UserCardBean;
import com.dayu.rechargeqh.dbBean.UserCardBean;

import java.util.List;


 app/src/main/java/com/dayu/rechargeqh/net/IMessage.java

File was renamed from app/src/main/java/com/dayu/recharge/net/IMessage.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.net;
package com.dayu.rechargeqh.net;

/**
 * Copyright (C), 2022,

 app/src/main/java/com/dayu/rechargeqh/net/ScoketMessageProtocol.java

File was renamed from app/src/main/java/com/dayu/recharge/net/ScoketMessageProtocol.java
@@ -1,8 +1,8 @@
package com.dayu.recharge.net;
package com.dayu.rechargeqh.net;

import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.LogUtil;
import com.dayu.recharge.utils.SocketUtil;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.LogUtil;
import com.dayu.rechargeqh.utils.SocketUtil;
import com.easysocket.interfaces.config.IMessageProtocol;

import java.nio.ByteOrder;

 app/src/main/java/com/dayu/rechargeqh/net/SocketCallBack.java

File was renamed from app/src/main/java/com/dayu/recharge/net/SocketCallBack.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.net;
package com.dayu.rechargeqh.net;

/**
 * Copyright (C), 2022,

 app/src/main/java/com/dayu/rechargeqh/net/SocketData.java

File was renamed from app/src/main/java/com/dayu/recharge/net/SocketData.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.net;
package com.dayu.rechargeqh.net;

import com.easysocket.EasySocket;
import com.easysocket.utils.Utils;

 app/src/main/java/com/dayu/rechargeqh/net/SocketNet.java

File was renamed from app/src/main/java/com/dayu/recharge/net/SocketNet.java
@@ -1,23 +1,20 @@
package com.dayu.recharge.net;
package com.dayu.rechargeqh.net;

import android.content.Context;
import android.os.Handler;
import android.text.TextUtils;
import android.util.Log;

import com.dayu.recharge.activity.HomeActivity;
import com.dayu.recharge.dao.BaseDaoSingleton;
import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.recharge.dbBean.DeviceNumber;
import com.dayu.recharge.dbBean.IpBean;
import com.dayu.rechargeqh.activity.HomeActivity;
import com.dayu.rechargeqh.dao.BaseDaoSingleton;
import com.dayu.rechargeqh.dbBean.AdminDataBean;
import com.easysocket.EasySocket;
import com.easysocket.connection.action.SocketStatus;
import com.easysocket.entity.OriginReadData;
import com.easysocket.entity.SocketAddress;
import com.easysocket.interfaces.conn.ISocketActionListener;
import com.easysocket.interfaces.conn.SocketActionListener;
import com.dayu.recharge.MyApplication;
import com.dayu.rechargeqh.MyApplication;
import com.easysocket.utils.HexUtil;
import com.tencent.bugly.crashreport.CrashReport;


/**
@@ -104,18 +101,23 @@
        public void onSocketConnSuccess(SocketAddress socketAddress) {
            Log.i("SocketActionListener1111", "连接成功");
            MyApplication.myApplication.isConncet = true;
            AdminDataBean adminData = BaseDaoSingleton.getInstance(MyApplication.myApplication).adminDao().findFirst();
            Log.i("SocketActionListener1111", "isDoInitMachine==" + MyApplication.myApplication.isDoInitMachine + "");
            if (!MyApplication.myApplication.isDoInitMachine) {
                Log.i("SocketActionListener1111", "isDoInitMachine");
                if (MyApplication.myApplication.ipBean != null && adminData != null) {
                    if (!TextUtils.isEmpty(adminData.getAddressCode())) {
                        Log.i("SocketActionListener1111", "initMachineRequestBean");
                        MyApplication.myApplication.initMachineRequestBean(MyApplication.myApplication.ipBean.getIp(), MyApplication.myApplication.ipBean.getPort(), adminData.getAddressCode());
            try {
                AdminDataBean adminData = BaseDaoSingleton.getInstance(MyApplication.myApplication).adminDao().findFirst();
                Log.i("SocketActionListener1111", "isDoInitMachine==" + MyApplication.myApplication.isDoInitMachine + "");
                if (!MyApplication.myApplication.isDoInitMachine) {
                    Log.i("SocketActionListener1111", "isDoInitMachine");
                    if (MyApplication.myApplication.ipBean != null && adminData != null) {
                        if (!TextUtils.isEmpty(adminData.getAddressCode())) {
                            Log.i("SocketActionListener1111", "initMachineRequestBean");
                            MyApplication.myApplication.initMachineRequestBean(MyApplication.myApplication.ipBean.getIp(), MyApplication.myApplication.ipBean.getPort(), adminData.getAddressCode());

                        }
                    }
                }

                }
            } catch (Exception e) {
               e.printStackTrace();
                CrashReport.postCatchedException(e);
            }
            rushState();
        }

 app/src/main/java/com/dayu/rechargeqh/net/WSJsonParser.java

File was renamed from app/src/main/java/com/dayu/recharge/net/WSJsonParser.java
@@ -1,7 +1,7 @@
/**
 * Company: ImanSoft( http://www.imansoft.cn/ )
 */
package com.dayu.recharge.net;
package com.dayu.rechargeqh.net;

import android.text.TextUtils;


 app/src/main/java/com/dayu/rechargeqh/socketBean/BalanceSelecteRequestBean.java

File was renamed from app/src/main/java/com/dayu/recharge/socketBean/BalanceSelecteRequestBean.java
@@ -1,7 +1,7 @@
package com.dayu.recharge.socketBean;
package com.dayu.rechargeqh.socketBean;

import com.dayu.recharge.tools.ArraysUtil;
import com.dayu.recharge.utils.CRC8;
import com.dayu.rechargeqh.tools.ArraysUtil;
import com.dayu.rechargeqh.utils.CRC8;

/**
 * Copyright (C), 2022,

 app/src/main/java/com/dayu/rechargeqh/socketBean/BaseSocketBean.java

File was renamed from app/src/main/java/com/dayu/recharge/socketBean/BaseSocketBean.java
@@ -1,8 +1,8 @@
package com.dayu.recharge.socketBean;
package com.dayu.rechargeqh.socketBean;

import com.dayu.recharge.net.IMessage;
import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.CRC8;
import com.dayu.rechargeqh.net.IMessage;
import com.dayu.rechargeqh.tools.HexUtil;
import com.dayu.rechargeqh.utils.CRC8;

import java.util.Arrays;


 app/src/main/java/com/dayu/rechargeqh/socketBean/ConfirmMachineRequestBean.java

File was renamed from app/src/main/java/com/dayu/recharge/socketBean/ConfirmMachineRequestBean.java
@@ -1,8 +1,8 @@
package com.dayu.recharge.socketBean;
package com.dayu.rechargeqh.socketBean;

import com.dayu.recharge.tools.ArraysUtil;
import com.dayu.recharge.tools.BcdUtil;
import com.dayu.recharge.utils.CRC8;
import com.dayu.rechargeqh.tools.ArraysUtil;
import com.dayu.rechargeqh.tools.BcdUtil;
import com.dayu.rechargeqh.utils.CRC8;

/**
 * Copyright (C), 2022,

 app/src/main/java/com/dayu/rechargeqh/socketBean/InitCardRequestBean.java

File was renamed from app/src/main/java/com/dayu/recharge/socketBean/InitCardRequestBean.java
@@ -1,8 +1,8 @@
package com.dayu.recharge.socketBean;
package com.dayu.rechargeqh.socketBean;

import com.dayu.recharge.tools.ArraysUtil;
import com.dayu.recharge.tools.BcdUtil;
import com.dayu.recharge.utils.CRC8;
import com.dayu.rechargeqh.tools.ArraysUtil;
import com.dayu.rechargeqh.tools.BcdUtil;
import com.dayu.rechargeqh.utils.CRC8;

/**
 * Copyright (C), 2022,

 app/src/main/java/com/dayu/rechargeqh/socketBean/InitMachineRequestBean.java

File was renamed from app/src/main/java/com/dayu/recharge/socketBean/InitMachineRequestBean.java
@@ -1,11 +1,8 @@
package com.dayu.recharge.socketBean;
package com.dayu.rechargeqh.socketBean;

import com.dayu.recharge.tools.ArraysUtil;
import com.dayu.recharge.tools.BcdUtil;
import com.dayu.recharge.utils.CRC8;

import java.util.ArrayList;
import java.util.Arrays;
import com.dayu.rechargeqh.tools.ArraysUtil;
import com.dayu.rechargeqh.tools.BcdUtil;
import com.dayu.rechargeqh.utils.CRC8;

/**
 * Copyright (C), 2022,

 app/src/main/java/com/dayu/rechargeqh/socketBean/RechargeRequestBean.java

File was renamed from app/src/main/java/com/dayu/recharge/socketBean/RechargeRequestBean.java
@@ -1,10 +1,10 @@
package com.dayu.recharge.socketBean;
package com.dayu.rechargeqh.socketBean;

import com.dayu.recharge.tools.ArraysUtil;
import com.dayu.recharge.tools.BcdUtil;
import com.dayu.recharge.utils.CRC8;
import com.dayu.recharge.utils.MornyUtil;
import com.dayu.recharge.utils.SocketUtil;
import com.dayu.rechargeqh.tools.ArraysUtil;
import com.dayu.rechargeqh.tools.BcdUtil;
import com.dayu.rechargeqh.utils.CRC8;
import com.dayu.rechargeqh.utils.MornyUtil;
import com.dayu.rechargeqh.utils.SocketUtil;

/**
 * Copyright (C), 2022,

 app/src/main/java/com/dayu/rechargeqh/tools/ArraysUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/tools/ArraysUtil.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.tools;
package com.dayu.rechargeqh.tools;

/**
 * Copyright (C), 2022,

 app/src/main/java/com/dayu/rechargeqh/tools/BaseNFCHelper.java

File was renamed from app/src/main/java/com/dayu/recharge/tools/BaseNFCHelper.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.tools;
package com.dayu.rechargeqh.tools;

import android.app.Activity;
import android.util.Base64;

 app/src/main/java/com/dayu/rechargeqh/tools/BcdUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/tools/BcdUtil.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.tools;
package com.dayu.rechargeqh.tools;

/**
 * Copyright (C), 2022,

 app/src/main/java/com/dayu/rechargeqh/tools/HexUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/tools/HexUtil.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.tools;
package com.dayu.rechargeqh.tools;

import java.math.BigInteger;
import java.nio.ByteBuffer;

 app/src/main/java/com/dayu/rechargeqh/tools/LoyaltyCardReader.java

File was renamed from app/src/main/java/com/dayu/recharge/tools/LoyaltyCardReader.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.dayu.recharge.tools;
package com.dayu.rechargeqh.tools;

import android.annotation.TargetApi;
import android.nfc.NfcAdapter;

 app/src/main/java/com/dayu/rechargeqh/tools/NFCWriteHelper.java

File was renamed from app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.tools;
package com.dayu.rechargeqh.tools;

import android.app.Activity;
import android.content.Intent;

 app/src/main/java/com/dayu/rechargeqh/tools/NfcReadHelper.java

File was renamed from app/src/main/java/com/dayu/recharge/tools/NfcReadHelper.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.tools;
package com.dayu.rechargeqh.tools;

import android.app.Activity;
import android.content.Intent;
@@ -7,8 +7,8 @@
import android.nfc.tech.MifareClassic;
import android.util.Log;

import com.dayu.recharge.card.UserCard;
import com.dayu.recharge.utils.MyCommon;
import com.dayu.rechargeqh.card.UserCard;
import com.dayu.rechargeqh.utils.MyCommon;

import java.io.IOException;
import java.util.ArrayList;

 app/src/main/java/com/dayu/rechargeqh/tools/Utils.java

File was renamed from app/src/main/java/com/dayu/recharge/tools/Utils.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.tools;
package com.dayu.rechargeqh.tools;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

 app/src/main/java/com/dayu/rechargeqh/tools/WriteCardUtils.java

File was renamed from app/src/main/java/com/dayu/recharge/tools/WriteCardUtils.java
@@ -1,9 +1,9 @@
package com.dayu.recharge.tools;
package com.dayu.rechargeqh.tools;

import android.app.Activity;
import android.content.Intent;

import com.dayu.recharge.card.UserCard;
import com.dayu.rechargeqh.card.UserCard;

/**
 * Created by Android Studio.

 app/src/main/java/com/dayu/rechargeqh/utils/AidlUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/AidlUtil.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import android.content.ComponentName;
import android.content.Context;
@@ -13,8 +13,8 @@
import android.widget.Toast;


import com.dayu.recharge.R;
import com.dayu.recharge.bean.TableItem;
import com.dayu.rechargeqh.R;
import com.dayu.rechargeqh.bean.TableItem;

import java.util.ArrayList;
import java.util.LinkedList;

 app/src/main/java/com/dayu/rechargeqh/utils/ArithUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/ArithUtil.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import java.math.BigDecimal;
import java.text.DecimalFormat;

 app/src/main/java/com/dayu/rechargeqh/utils/BytesUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/BytesUtil.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import android.annotation.SuppressLint;
import android.graphics.Bitmap;

 app/src/main/java/com/dayu/rechargeqh/utils/CRC8.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/CRC8.java
@@ -1,6 +1,6 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import com.dayu.recharge.tools.HexUtil;
import com.dayu.rechargeqh.tools.HexUtil;

import java.util.Arrays;


 app/src/main/java/com/dayu/rechargeqh/utils/DateUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/DateUtil.java
@@ -1,6 +1,5 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;


 app/src/main/java/com/dayu/rechargeqh/utils/DeviceNumberUtils.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/DeviceNumberUtils.java
@@ -1,8 +1,8 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import com.dayu.recharge.MyApplication;
import com.dayu.recharge.dao.BaseDaoSingleton;
import com.dayu.recharge.dbBean.DeviceNumber;
import com.dayu.rechargeqh.MyApplication;
import com.dayu.rechargeqh.dao.BaseDaoSingleton;
import com.dayu.rechargeqh.dbBean.DeviceNumber;

/**
 * Created by Android Studio.

 app/src/main/java/com/dayu/rechargeqh/utils/ESCUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/ESCUtil.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import android.graphics.Bitmap;


 app/src/main/java/com/dayu/rechargeqh/utils/ExcelUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/ExcelUtil.java
@@ -1,10 +1,10 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import android.content.Context;
import android.widget.Toast;

import com.dayu.recharge.dbBean.RechargeBean;
import com.dayu.recharge.dbBean.UserCardBean;
import com.dayu.rechargeqh.dbBean.RechargeBean;
import com.dayu.rechargeqh.dbBean.UserCardBean;

import java.io.File;
import java.io.FileInputStream;

 app/src/main/java/com/dayu/rechargeqh/utils/LogUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/LogUtil.java
@@ -1,7 +1,5 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;
import android.util.Log;

import com.easysocket.EasySocket;


public class LogUtil {

 app/src/main/java/com/dayu/rechargeqh/utils/MornyUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/MornyUtil.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import java.math.BigDecimal;


 app/src/main/java/com/dayu/rechargeqh/utils/MyCommon.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/MyCommon.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

/**
 * Copyright (C), 2023,
@@ -97,5 +97,31 @@
     */
    public static final String CONFIGURATION_POWER_CARD_TYPE = "BD";

    /**
     * 获取默认的卡标识
     *
     * @param cardType 卡片类型
     * @return 卡内容
     */
    public static String getDefaultCardData(String cardType) {
        String cardData = "";
        switch (cardType) {
            case CLEAN_CARD_TYPE:
                cardData = "3668F7A30119";
                break;
            case MANAGE_CRAD:
            case REGISTERED_CARD_TYPE:
            case CLEAN_ALL_USER_CARD_TYPE:
            case TEST_CARD_TYPE:
            case CONFIGURATION_CARD_TYPE:
            case CONFIGURATION_POWER_CARD_TYPE:
            case PASS_WORD_CRAD_TYPE:
            case BLACK:
            case ELECTRIC_PRICE:
                cardData = "A0B1C289";
                break;
        }
        return cardData;
    }

}

 app/src/main/java/com/dayu/rechargeqh/utils/MyFileUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/MyFileUtil.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import android.content.Context;
import android.os.Environment;

 app/src/main/java/com/dayu/rechargeqh/utils/PrinterCallback.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/PrinterCallback.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

/**
 * Created by Administrator on 2017/6/12.

 app/src/main/java/com/dayu/rechargeqh/utils/SocketUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/SocketUtil.java
@@ -1,12 +1,12 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import android.content.Context;
import android.os.Handler;
import android.os.Message;

import com.dayu.recharge.dao.BaseDaoSingleton;
import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.recharge.tools.HexUtil;
import com.dayu.rechargeqh.dao.BaseDaoSingleton;
import com.dayu.rechargeqh.dbBean.AdminDataBean;
import com.dayu.rechargeqh.tools.HexUtil;

import java.io.UnsupportedEncodingException;
import java.math.BigInteger;

 app/src/main/java/com/dayu/rechargeqh/utils/TipUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/TipUtil.java
@@ -1,13 +1,12 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import android.app.Activity;
import android.content.Context;
import android.os.Build;
import android.widget.Toast;

import com.dayu.recharge.MyApplication;
import com.dayu.recharge.activity.HomeActivity;
import com.dayu.recharge.view.TipDialog;
import com.dayu.rechargeqh.MyApplication;
import com.dayu.rechargeqh.activity.HomeActivity;
import com.dayu.rechargeqh.view.TipDialog;

public class TipUtil {
    public interface TipListener {

 app/src/main/java/com/dayu/rechargeqh/utils/ToastUtil.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/ToastUtil.java
@@ -1,8 +1,8 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import android.widget.Toast;

import com.dayu.recharge.MyApplication;
import com.dayu.rechargeqh.MyApplication;

/**
 * Created by Android Studio.

 app/src/main/java/com/dayu/rechargeqh/utils/WSHelper.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/WSHelper.java
@@ -2,7 +2,7 @@
 * Copyright (C), 2014-2017, Zhengzhou IMAN Technology Development. Co., Ltd
 * Company: ImanSoft( http://www.imansoft.cn/ )
 */
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import android.content.Context;
import android.content.SharedPreferences;
@@ -11,7 +11,7 @@
import android.util.Base64;


import com.dayu.recharge.net.WSJsonParser;
import com.dayu.rechargeqh.net.WSJsonParser;

import java.util.Map;
import java.util.Set;

 app/src/main/java/com/dayu/rechargeqh/utils/WSMD5.java

File was renamed from app/src/main/java/com/dayu/recharge/utils/WSMD5.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.utils;
package com.dayu.rechargeqh.utils;

import java.io.FileInputStream;
import java.io.InputStream;

 app/src/main/java/com/dayu/rechargeqh/view/ChooseView.java

File was renamed from app/src/main/java/com/dayu/recharge/view/ChooseView.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.view;
package com.dayu.rechargeqh.view;

import android.app.Activity;
import android.content.Context;
@@ -12,7 +12,7 @@
import com.bigkoo.pickerview.listener.CustomListener;
import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
import com.bigkoo.pickerview.view.OptionsPickerView;
import com.dayu.recharge.R;
import com.dayu.rechargeqh.R;

import java.util.List;


 app/src/main/java/com/dayu/rechargeqh/view/EdtDialog.java

File was renamed from app/src/main/java/com/dayu/recharge/view/EdtDialog.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.view;
package com.dayu.rechargeqh.view;

import android.app.Dialog;
import android.content.Context;
@@ -11,8 +11,7 @@
import android.widget.EditText;
import android.widget.TextView;

import com.dayu.recharge.R;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.rechargeqh.R;

/**
 * Copyright (C), 2022,

 app/src/main/java/com/dayu/rechargeqh/view/PassWordDialog.java

File was renamed from app/src/main/java/com/dayu/recharge/view/PassWordDialog.java
@@ -1,8 +1,7 @@
package com.dayu.recharge.view;
package com.dayu.rechargeqh.view;

import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.view.Gravity;
import android.view.View;
@@ -12,9 +11,9 @@
import android.widget.TextView;

import com.tencent.bugly.crashreport.CrashReport;
import com.dayu.recharge.R;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.utils.WSMD5;
import com.dayu.rechargeqh.R;
import com.dayu.rechargeqh.utils.TipUtil;
import com.dayu.rechargeqh.utils.WSMD5;

/**
 * Created by zuoxiao on 2018/12/30.

 app/src/main/java/com/dayu/rechargeqh/view/ProgressDialog.java

File was renamed from app/src/main/java/com/dayu/recharge/view/ProgressDialog.java
@@ -1,10 +1,7 @@
package com.dayu.recharge.view;
package com.dayu.rechargeqh.view;

import android.app.Activity;
import android.app.Dialog;
import android.content.Context;

import com.dayu.recharge.activity.NewCardActivity;

/**
 * Created by Android Studio.

 app/src/main/java/com/dayu/rechargeqh/view/TipDialog.java

File was renamed from app/src/main/java/com/dayu/recharge/view/TipDialog.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.view;
package com.dayu.rechargeqh.view;

import android.app.Dialog;
import android.content.Context;
@@ -8,8 +8,8 @@
import android.view.WindowManager;
import android.widget.TextView;

import com.dayu.recharge.R;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.rechargeqh.R;
import com.dayu.rechargeqh.utils.TipUtil;

/**
 * Created by Android Studio.

 app/src/main/java/com/dayu/rechargeqh/view/TitleBar.java

File was renamed from app/src/main/java/com/dayu/recharge/view/TitleBar.java
@@ -1,7 +1,7 @@
/**
 *
 */
package com.dayu.recharge.view;
package com.dayu.rechargeqh.view;

import android.content.Context;
import android.content.res.TypedArray;
@@ -13,7 +13,7 @@
import android.widget.LinearLayout;
import android.widget.TextView;

import com.dayu.recharge.R;
import com.dayu.rechargeqh.R;


/***

 app/src/main/java/com/dayu/rechargeqh/view/datepicker/CustomDatePicker.java

File was renamed from app/src/main/java/com/dayu/recharge/view/datepicker/CustomDatePicker.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.view.datepicker;
package com.dayu.rechargeqh.view.datepicker;

import android.app.Dialog;
import android.content.Context;
@@ -10,7 +10,7 @@
import android.widget.TextView;


import com.dayu.recharge.R;
import com.dayu.rechargeqh.R;

import java.text.DecimalFormat;
import java.util.ArrayList;

 app/src/main/java/com/dayu/rechargeqh/view/datepicker/DateFormatUtils.java

File was renamed from app/src/main/java/com/dayu/recharge/view/datepicker/DateFormatUtils.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.view.datepicker;
package com.dayu.rechargeqh.view.datepicker;

import java.text.SimpleDateFormat;
import java.util.Date;

 app/src/main/java/com/dayu/rechargeqh/view/datepicker/PickerView.java

File was renamed from app/src/main/java/com/dayu/recharge/view/datepicker/PickerView.java
@@ -1,4 +1,4 @@
package com.dayu.recharge.view.datepicker;
package com.dayu.rechargeqh.view.datepicker;

import android.animation.ObjectAnimator;
import android.animation.PropertyValuesHolder;
@@ -14,7 +14,7 @@
import android.view.MotionEvent;
import android.view.View;

import com.dayu.recharge.R;
import com.dayu.rechargeqh.R;

import java.lang.ref.WeakReference;
import java.util.ArrayList;

 app/src/main/res/layout/activity_admin.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_admin_setup.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_domain.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_electric_meter.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_electric_price.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_electricty_price.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_home.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_identyfying.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_ip.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_location.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_main.xml

@@ -9,7 +9,7 @@
    android:paddingLeft="@dimen/activity_horizontal_margin"
    android:paddingRight="@dimen/activity_horizontal_margin"
    android:paddingTop="@dimen/activity_vertical_margin"
    tools:context="com.dayu.recharge.activity.MainActivity">
    tools:context="com.dayu.rechargeqh.activity.MainActivity">

    <TextView
        android:id="@+id/write"

 app/src/main/res/layout/activity_manage_setup.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_my.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_new_card.xml

@@ -4,7 +4,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_newcard_list.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_parameter.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"
@@ -55,7 +55,17 @@
        android:layout_marginLeft="20dp"
        android:layout_marginTop="20dp"
        android:padding="5dp"
        android:text="电量单价设置"
        android:text="卡密码设置"
        android:textColor="@color/text_selecter"
        android:textSize="@dimen/text_size" />
    <TextView
        android:id="@+id/parameter_region"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginLeft="20dp"
        android:layout_marginTop="20dp"
        android:padding="5dp"
        android:text="区域表号设置"
        android:textColor="@color/text_selecter"
        android:textSize="@dimen/text_size" />
    <TextView

 app/src/main/res/layout/activity_password_card.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_patch.xml

@@ -4,7 +4,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_patch_list.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_power.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_psw.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_recharge.xml

@@ -4,7 +4,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_recharge_detail.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_recharge_ext.xml

@@ -4,7 +4,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_recharge_list.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_red_card.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_region.xml

New file
@@ -0,0 +1,94 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"
        android:background="@drawable/title_bar_bg"
        app:centerText="电价设置"
        app:leftImage="@mipmap/icon_back" />

    <LinearLayout
        android:id="@+id/region_ll"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_below="@id/titleBar"
        android:layout_margin="20dp"
        android:orientation="horizontal">

        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="当前区域地址："
            android:textSize="@dimen/text_size" />

        <TextView
            android:id="@+id/region_oldText"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:textSize="@dimen/text_size" />

    </LinearLayout>
    <LinearLayout
        android:id="@+id/controller_ll"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_below="@id/region_ll"
        android:layout_margin="20dp"
        android:orientation="horizontal">

        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="当前控制器编号："
            android:textSize="@dimen/text_size" />

        <TextView
            android:id="@+id/controller_oldText"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:textSize="@dimen/text_size" />

    </LinearLayout>

    <EditText
        android:id="@+id/region_newET"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_below="@+id/controller_ll"
        android:layout_alignParentStart="true"
        android:layout_marginStart="20dp"
        android:layout_marginTop="20dp"
        android:layout_marginEnd="20dp"
        android:layout_marginBottom="20dp"
        android:hint="请输入新区域地址（两位16进制字符）"
        android:inputType="numberDecimal" />

    <EditText
        android:id="@+id/controller_newET"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_below="@+id/region_newET"
        android:layout_alignParentStart="true"
        android:layout_marginStart="20dp"
        android:layout_marginTop="20dp"
        android:layout_marginEnd="20dp"
        android:layout_marginBottom="20dp"
        android:hint="请输入新控制器编号（两位16进制字符）"
        android:inputType="numberDecimal" />

    <TextView
        android:id="@+id/electric_ok"
        android:layout_width="match_parent"
        android:layout_height="50dp"
        android:layout_alignParentBottom="true"
        android:background="@color/title_bg"
        android:gravity="center"
        android:text="确  定"
        android:textSize="@dimen/text_size" />
</RelativeLayout>

 app/src/main/res/layout/activity_replacement.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_water_meter.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_water_num.xml

@@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/activity_write_text.xml

@@ -6,7 +6,7 @@
    android:layout_height="match_parent"
    android:background="@color/colorBackground">

    <com.dayu.recharge.view.TitleBar
    <com.dayu.rechargeqh.view.TitleBar
        android:id="@+id/titleBar"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dimen_title_height"

 app/src/main/res/layout/dialog_date_picker.xml

@@ -62,7 +62,7 @@
        android:paddingStart="20dp"
        android:paddingTop="15dp">

        <com.dayu.recharge.view.datepicker.PickerView
        <com.dayu.rechargeqh.view.datepicker.PickerView
            android:id="@+id/dpv_year"
            android:layout_width="0dp"
            android:layout_height="@dimen/picker_view_height"
@@ -77,7 +77,7 @@
            android:textColor="@color/date_picker_text_dark"
            android:textSize="@dimen/date_unit_text_size" />

        <com.dayu.recharge.view.datepicker.PickerView
        <com.dayu.rechargeqh.view.datepicker.PickerView
            android:id="@+id/dpv_month"
            android:layout_width="0dp"
            android:layout_height="@dimen/picker_view_height"
@@ -92,7 +92,7 @@
            android:textColor="@color/date_picker_text_dark"
            android:textSize="@dimen/date_unit_text_size" />

        <com.dayu.recharge.view.datepicker.PickerView
        <com.dayu.rechargeqh.view.datepicker.PickerView
            android:id="@+id/dpv_day"
            android:layout_width="0dp"
            android:layout_height="@dimen/picker_view_height"
@@ -107,7 +107,7 @@
            android:textColor="@color/date_picker_text_dark"
            android:textSize="@dimen/date_unit_text_size" />

        <com.dayu.recharge.view.datepicker.PickerView
        <com.dayu.rechargeqh.view.datepicker.PickerView
            android:id="@+id/dpv_hour"
            android:layout_width="0dp"
            android:layout_height="@dimen/picker_view_height"
@@ -123,7 +123,7 @@
            android:textColor="@color/date_picker_text_dark"
            android:textSize="@dimen/date_unit_text_size" />

        <com.dayu.recharge.view.datepicker.PickerView
        <com.dayu.rechargeqh.view.datepicker.PickerView
            android:id="@+id/dpv_minute"
            android:layout_width="0dp"
            android:layout_height="@dimen/picker_view_height"

 app/src/main/res/layout/item_replacement.xml

@@ -7,7 +7,7 @@

        <variable
            name="activity"
            type="com.dayu.recharge.activity.ReplacementActivity" />
            type="com.dayu.rechargeqh.activity.ReplacementActivity" />

    </data>