From 1cbb505922e010cace51020773a2dc1529713322 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 06 三月 2024 16:12:58 +0800
Subject: [PATCH] 1.修改包名
---
app/src/main/java/com/dayu/rechargeqh/utils/DateUtil.java | 3
app/src/main/java/com/dayu/rechargeqh/activity/NewCardActivity.java | 39
app/src/main/java/com/dayu/rechargeqh/dbBean/DeviceNumber.java | 2
app/src/main/java/com/dayu/rechargeqh/card/CleanCard.java | 40 +
app/src/main/cpp/native-lib.cpp | 2
app/src/main/java/com/dayu/rechargeqh/view/ProgressDialog.java | 5
app/src/main/res/layout/activity_domain.xml | 2
app/src/main/java/com/dayu/rechargeqh/tools/Utils.java | 2
app/src/main/java/com/dayu/rechargeqh/MyApplication.java | 40
app/src/main/res/layout/activity_main.xml | 2
app/src/main/java/com/dayu/rechargeqh/activity/RechargeListActivity.java | 21
app/src/main/res/layout/activity_my.xml | 2
app/src/main/java/com/dayu/rechargeqh/socketBean/BalanceSelecteRequestBean.java | 6
app/src/main/java/com/dayu/rechargeqh/utils/ArithUtil.java | 2
app/src/main/java/com/dayu/rechargeqh/dbBean/PassWordBean.java | 2
app/src/main/java/com/dayu/rechargeqh/net/ScoketMessageProtocol.java | 8
app/src/main/java/com/dayu/rechargeqh/socketBean/InitCardRequestBean.java | 8
app/src/main/java/com/dayu/rechargeqh/bean/TableItem.java | 2
app/src/main/java/com/dayu/rechargeqh/activity/LoginActivity.java | 14
app/src/main/res/layout/activity_identyfying.xml | 2
app/src/main/java/com/dayu/rechargeqh/net/IMessage.java | 2
app/src/main/java/com/dayu/rechargeqh/adapter/BaseRecyclerAdapter.java | 4
app/src/main/res/layout/activity_manage_setup.xml | 2
app/src/main/java/com/dayu/rechargeqh/utils/MyCommon.java | 28
app/src/main/java/com/dayu/rechargeqh/dbBean/AdminDataBean.java | 2
app/src/main/java/com/dayu/rechargeqh/dbBean/PassWordCardBean.java | 2
app/src/main/java/com/dayu/rechargeqh/activity/ParameterActivity.java | 4
app/src/main/java/com/dayu/rechargeqh/utils/TipUtil.java | 9
app/src/main/java/com/dayu/rechargeqh/socketBean/BaseSocketBean.java | 8
app/src/main/java/com/dayu/rechargeqh/tools/NfcReadHelper.java | 6
app/src/main/res/layout/activity_red_card.xml | 2
app/src/main/java/com/dayu/rechargeqh/card/CleanUserCard.java | 35 +
app/src/main/res/layout/activity_electric_meter.xml | 2
app/src/main/java/com/dayu/rechargeqh/tools/HexUtil.java | 2
app/src/main/res/layout/activity_ip.xml | 2
app/src/main/java/com/dayu/rechargeqh/dao/DomainPortDao.java | 5
app/src/main/java/com/dayu/rechargeqh/dbBean/PowerBean.java | 2
app/src/main/java/com/dayu/rechargeqh/view/TipDialog.java | 6
app/src/main/res/layout/activity_newcard_list.xml | 2
app/src/main/java/com/dayu/rechargeqh/tools/BcdUtil.java | 2
app/src/main/java/com/dayu/rechargeqh/utils/MornyUtil.java | 2
app/src/main/java/com/dayu/rechargeqh/card/BaseCard.java | 55 +
app/src/main/java/com/dayu/rechargeqh/view/PassWordDialog.java | 9
app/src/main/java/com/dayu/rechargeqh/activity/PasswordCardActivity.java | 11
app/src/main/java/com/dayu/rechargeqh/activity/ElectricPriceActivity.java | 94 +++
app/src/main/java/com/dayu/rechargeqh/view/EdtDialog.java | 5
app/src/main/java/com/dayu/rechargeqh/dao/IdentityDao.java | 4
app/src/main/java/com/dayu/rechargeqh/net/SocketCallBack.java | 2
app/src/main/java/com/dayu/rechargeqh/socketBean/InitMachineRequestBean.java | 11
app/src/main/java/com/dayu/rechargeqh/activity/ReplacementActivity.java | 16
app/src/main/java/com/dayu/rechargeqh/tools/ArraysUtil.java | 2
app/src/main/java/com/dayu/rechargeqh/dao/UserCardDao.java | 4
app/src/main/java/com/dayu/rechargeqh/activity/BaseActivity.java | 13
app/src/main/java/com/dayu/rechargeqh/view/TitleBar.java | 4
app/src/main/java/com/dayu/rechargeqh/dao/LoginPsDao.java | 4
app/src/main/java/com/dayu/rechargeqh/dbBean/DomainBean.java | 2
app/src/main/java/com/dayu/rechargeqh/utils/MyFileUtil.java | 2
app/src/main/java/com/dayu/rechargeqh/activity/BaseNfcActivity.java | 22
app/src/main/java/com/dayu/rechargeqh/utils/SocketUtil.java | 8
app/src/main/java/com/dayu/rechargeqh/bean/TransBean.java | 2
app/src/main/java/com/dayu/rechargeqh/activity/IdentifyingActivity.java | 26
app/src/main/java/com/dayu/rechargeqh/adapter/RechargeAdapter.java | 19
app/src/main/res/layout/activity_location.xml | 2
app/src/main/java/com/dayu/rechargeqh/activity/RechargeActivity.java | 32
app/src/main/java/com/dayu/rechargeqh/card/PassWordCard.java | 26
app/src/main/java/com/dayu/rechargeqh/utils/LogUtil.java | 4
app/src/main/java/com/dayu/rechargeqh/utils/DeviceNumberUtils.java | 8
app/src/main/res/layout/activity_patch.xml | 2
app/src/main/res/layout/activity_recharge_ext.xml | 2
app/src/main/java/com/dayu/rechargeqh/card/BlackCard.java | 68 ++
app/src/main/java/com/dayu/rechargeqh/tools/BaseNFCHelper.java | 2
app/src/main/java/com/dayu/rechargeqh/activity/AdminSetupActivity.java | 13
app/src/main/java/com/dayu/rechargeqh/dbBean/IpBean.java | 2
app/src/main/java/com/dayu/rechargeqh/model/UserListMode.java | 4
app/src/main/java/com/dayu/rechargeqh/utils/BytesUtil.java | 2
app/src/main/java/com/dayu/rechargeqh/utils/AidlUtil.java | 6
app/src/main/res/layout/activity_write_text.xml | 2
app/src/main/java/com/dayu/rechargeqh/dao/ElectricPriceDao.java | 4
app/src/main/res/layout/activity_water_num.xml | 2
app/src/main/java/com/dayu/rechargeqh/dao/PowerDao.java | 4
app/src/main/res/layout/activity_recharge.xml | 2
app/src/main/java/com/dayu/rechargeqh/view/ChooseView.java | 4
app/src/main/java/com/dayu/rechargeqh/view/datepicker/DateFormatUtils.java | 2
app/src/main/java/com/dayu/rechargeqh/card/ConfigurationPowerCard.java | 19
app/src/main/java/com/dayu/rechargeqh/utils/WSHelper.java | 4
app/src/main/java/com/dayu/rechargeqh/utils/ESCUtil.java | 2
app/src/main/java/com/dayu/rechargeqh/card/RegionCard.java | 17
app/src/main/java/com/dayu/rechargeqh/dao/IpDao.java | 5
app/src/main/java/com/dayu/rechargeqh/utils/PrinterCallback.java | 2
app/src/main/res/layout/activity_recharge_list.xml | 2
app/src/main/java/com/dayu/rechargeqh/activity/SysActivity.java | 30
app/src/main/res/layout/dialog_date_picker.xml | 10
app/src/main/java/com/dayu/rechargeqh/activity/PassWordActivity.java | 10
app/src/main/java/com/dayu/rechargeqh/utils/CRC8.java | 4
app/src/main/java/com/dayu/rechargeqh/dbBean/UserCardBean.java | 2
app/src/main/java/com/dayu/rechargeqh/utils/WSMD5.java | 2
app/build.gradle | 6
app/src/main/java/com/dayu/rechargeqh/dao/BaseDaoSingleton.java | 7
app/src/main/java/com/dayu/rechargeqh/activity/PowerActivity.java | 8
app/src/main/res/layout/activity_new_card.xml | 2
app/src/main/res/layout/activity_region.xml | 94 +++
app/src/main/java/com/dayu/rechargeqh/card/ManageCard.java | 22
app/src/main/java/com/dayu/rechargeqh/dao/CardDataDao.java | 4
app/src/main/res/layout/activity_electricty_price.xml | 2
app/src/main/res/layout/item_replacement.xml | 2
app/src/main/java/com/dayu/rechargeqh/adapter/ReplacementAdapter.java | 17
app/src/main/java/com/dayu/rechargeqh/card/ConfigureDeviceRegistrationCrad.java | 19
app/src/main/java/com/dayu/rechargeqh/utils/ExcelUtil.java | 6
app/src/main/res/layout/activity_patch_list.xml | 2
app/src/main/java/com/dayu/rechargeqh/dbBean/CardData.java | 2
app/src/main/res/layout/activity_power.xml | 2
app/src/main/java/com/dayu/rechargeqh/activity/NewCardListActivity.java | 22
app/src/main/aidl/woyou/aidlservice/jiuiv5/IWoyouService.aidl | 2
app/src/main/res/layout/activity_electric_price.xml | 2
app/src/main/java/com/dayu/rechargeqh/socketBean/RechargeRequestBean.java | 12
app/src/main/res/layout/activity_parameter.xml | 14
app/src/main/java/com/dayu/rechargeqh/activity/MyActivity.java | 21
app/src/main/java/com/dayu/rechargeqh/dao/RechargeDao.java | 6
app/src/main/res/layout/activity_password_card.xml | 2
app/src/main/res/layout/activity_admin_setup.xml | 2
app/src/main/java/com/dayu/rechargeqh/activity/HomeActivity.java | 12
app/src/main/java/com/dayu/rechargeqh/card/ElectricPriceCard.java | 26
app/src/main/java/com/dayu/rechargeqh/model/RechargeListModel.java | 9
app/src/main/java/com/dayu/rechargeqh/net/WSJsonParser.java | 2
app/src/main/res/layout/activity_water_meter.xml | 2
app/src/main/java/com/dayu/rechargeqh/dao/PassWordCardDao.java | 4
app/src/main/java/com/dayu/rechargeqh/tools/LoyaltyCardReader.java | 2
app/src/main/aidl/com/dayu/rechargeqh/bean/TransBean.aidl | 3
app/src/main/java/com/dayu/rechargeqh/adapter/NewCardAdapter.java | 16
app/src/main/java/com/dayu/rechargeqh/tools/NFCWriteHelper.java | 2
app/src/main/java/com/dayu/rechargeqh/dbBean/IdentityBean.java | 2
app/src/main/java/com/dayu/rechargeqh/socketBean/ConfirmMachineRequestBean.java | 8
app/src/main/java/com/dayu/rechargeqh/card/RegisteredCard.java | 19
app/src/main/java/com/dayu/rechargeqh/view/datepicker/CustomDatePicker.java | 4
app/src/main/java/com/dayu/rechargeqh/activity/NFCWreatActivity.java | 81 +-
app/src/main/java/com/dayu/rechargeqh/net/SocketData.java | 2
app/src/main/res/layout/activity_recharge_detail.xml | 2
app/src/main/java/com/dayu/rechargeqh/tools/WriteCardUtils.java | 4
app/src/main/java/com/dayu/rechargeqh/dao/DeviceNumberDao.java | 4
app/src/main/java/com/dayu/rechargeqh/activity/SysIpActivity.java | 16
app/src/main/java/com/dayu/rechargeqh/activity/ReadCardAcitivy.java | 83 +-
app/src/main/AndroidManifest.xml | 46
app/src/main/java/com/dayu/rechargeqh/activity/DomainActivity.java | 8
app/src/main/java/com/dayu/rechargeqh/card/DomainCard.java | 10
app/src/main/java/com/dayu/rechargeqh/activity/RechargeDetail.java | 9
app/src/main/res/layout/activity_replacement.xml | 2
app/src/main/java/com/dayu/rechargeqh/net/SocketNet.java | 38
app/src/main/java/com/dayu/rechargeqh/view/datepicker/PickerView.java | 4
app/src/main/java/com/dayu/rechargeqh/dbBean/ElectricPriceBean.java | 2
app/src/main/java/com/dayu/rechargeqh/utils/ToastUtil.java | 4
/dev/null | 50 -
app/src/main/java/com/dayu/rechargeqh/activity/ManageSetUpActivity.java | 2
app/src/main/java/com/dayu/rechargeqh/dbBean/RechargeBean.java | 2
app/src/main/res/layout/activity_admin.xml | 2
app/src/main/res/layout/activity_psw.xml | 2
app/src/main/res/layout/activity_home.xml | 2
app/src/main/java/com/dayu/rechargeqh/card/TestCard.java | 40 +
app/src/main/java/com/dayu/rechargeqh/card/UserCard.java | 9
app/src/main/java/com/dayu/rechargeqh/dao/AdminDataDao.java | 4
app/src/main/java/com/dayu/rechargeqh/dao/AppDatabase.java | 26
160 files changed, 1,079 insertions(+), 714 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 390c27d..7ce4d78 100644
--- a/app/build.gradle
+++ b/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')
//鏉冮檺鐢宠
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a90c515..a6fab18 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/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
diff --git a/app/src/main/aidl/com/dayu/recharge/bean/TransBean.aidl b/app/src/main/aidl/com/dayu/recharge/bean/TransBean.aidl
deleted file mode 100644
index e515513..0000000
--- a/app/src/main/aidl/com/dayu/recharge/bean/TransBean.aidl
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.dayu.recharge.bean;
-
-parcelable TransBean;
\ No newline at end of file
diff --git a/app/src/main/aidl/com/dayu/rechargeqh/bean/TransBean.aidl b/app/src/main/aidl/com/dayu/rechargeqh/bean/TransBean.aidl
new file mode 100644
index 0000000..709f4ff
--- /dev/null
+++ b/app/src/main/aidl/com/dayu/rechargeqh/bean/TransBean.aidl
@@ -0,0 +1,3 @@
+package com.dayu.rechargeqh.bean;
+
+parcelable TransBean;
\ No newline at end of file
diff --git a/app/src/main/aidl/woyou/aidlservice/jiuiv5/IWoyouService.aidl b/app/src/main/aidl/woyou/aidlservice/jiuiv5/IWoyouService.aidl
index 89c672f..eccc1ab 100644
--- a/app/src/main/aidl/woyou/aidlservice/jiuiv5/IWoyouService.aidl
+++ b/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
{
diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp
index 6b2ce7c..4049616 100644
--- a/app/src/main/cpp/native-lib.cpp
+++ b/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;");
diff --git a/app/src/main/java/com/dayu/recharge/activity/ElectricPriceActivity.java b/app/src/main/java/com/dayu/recharge/activity/ElectricPriceActivity.java
deleted file mode 100644
index d98ecd5..0000000
--- a/app/src/main/java/com/dayu/recharge/activity/ElectricPriceActivity.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.dayu.recharge.activity;
-
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.dayu.recharge.databinding.ActivityElectricPriceBinding;
-import com.dayu.recharge.dbBean.ElectricPriceBean;
-import com.dayu.recharge.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();
-
- 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鍏�");
- }
- }
-
-
-}
diff --git a/app/src/main/java/com/dayu/recharge/card/BaseCard.java b/app/src/main/java/com/dayu/recharge/card/BaseCard.java
deleted file mode 100644
index c7b4357..0000000
--- a/app/src/main/java/com/dayu/recharge/card/BaseCard.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.dayu.recharge.card;
-
-import com.dayu.recharge.tools.HexUtil;
-
-import java.io.Serializable;
-
-/**
- * Copyright (C), 2023,
- * Author: zuo
- * Date: 2023-11-07 20:52
- * Description:鎵�鏈夊崱缁撴瀯鐨勭埗绫�
- */
-public class BaseCard implements Serializable {
-
- /**
- * 鍓�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;
- }
-
-
-}
diff --git a/app/src/main/java/com/dayu/recharge/card/BlackCard.java b/app/src/main/java/com/dayu/recharge/card/BlackCard.java
deleted file mode 100644
index f72a5ac..0000000
--- a/app/src/main/java/com/dayu/recharge/card/BlackCard.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dayu.recharge.card;
-
-import com.dayu.recharge.utils.MyCommon;
-
-import java.io.Serializable;
-
-/**
- * author: zuo
- * Date: 2024-02-29
- * Time: 17:17
- * 澶囨敞锛氶厤缃粦鍗� 褰撶敤鎴蜂涪澶卞崱鏃讹紝闇�瑕佸湪瀵瑰簲鐨勬帶鍒跺櫒鎶婃鐢ㄦ埛閰嶇疆涓洪粦鎴凤紝闃叉闈炴硶鐢ㄦ按
- */
-public class BlackCard implements Serializable {
-
- public String cardType = MyCommon.BLACK;
-
-
-
-
-
-}
diff --git a/app/src/main/java/com/dayu/recharge/card/CleanCard.java b/app/src/main/java/com/dayu/recharge/card/CleanCard.java
deleted file mode 100644
index 2a8ac77..0000000
--- a/app/src/main/java/com/dayu/recharge/card/CleanCard.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.dayu.recharge.card;
-
-import com.dayu.recharge.tools.HexUtil;
-import com.dayu.recharge.utils.MyCommon;
-
-import java.io.Serializable;
-
-/**
- * Copyright (C), 2023,
- * Author: zuo
- * Date: 2023-11-08 10:57
- * Description:娓呴浂鍗�
- */
-public class CleanCard implements Serializable {
- public String cardType = MyCommon.CLEAN_CARD_TYPE;//鍗＄被鍨�
- public String cardData = "3668F7A30119";//鏍囪瘑鐮�
-
- public String getCardData() {
- return cardData;
- }
-
-
-
- public byte[] toByte() {
- Zero zero = new Zero();
- return zero.toByte();
- }
-
- public class Zero extends BaseCard {
- public byte[] toByte() {
- byte[] data = new byte[16];
- data[0] = HexUtil.hexToByte(cardType);
- byte[] cardDatas = HexUtil.hexToByteArray(cardData);
- for (int i = 0; i < 6; i++) {
- data[i + 1] = cardDatas[i];
- }
- data[15] = getByteSum(data);
- return data;
- }
-
- }
-}
diff --git a/app/src/main/java/com/dayu/recharge/card/CleanUserCard.java b/app/src/main/java/com/dayu/recharge/card/CleanUserCard.java
deleted file mode 100644
index 3135f07..0000000
--- a/app/src/main/java/com/dayu/recharge/card/CleanUserCard.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.dayu.recharge.card;
-
-import com.dayu.recharge.tools.HexUtil;
-import com.dayu.recharge.utils.MyCommon;
-
-import java.io.Serializable;
-
-/**
- * Copyright (C), 2023,
- * Author: zuo
- * Date: 2023-11-08 11:39
- * Description:鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�
- */
-public class CleanUserCard implements Serializable {
- public String cardType = MyCommon.CLEAN_ALL_USER_CARD_TYPE;//鍗＄被鍨�
- public String cardData = "A0B1C289";//鏍囪瘑鐮�
-
- public byte[] toByte() {
- Zero zero = new Zero();
- return zero.toByte();
- }
-
- public class Zero extends BaseCard {
- 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];
- }
- data[15] = getByteSum(data);
- return data;
- }
-
- }
-}
diff --git a/app/src/main/java/com/dayu/recharge/card/TestCard.java b/app/src/main/java/com/dayu/recharge/card/TestCard.java
deleted file mode 100644
index c12f7e2..0000000
--- a/app/src/main/java/com/dayu/recharge/card/TestCard.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.dayu.recharge.card;
-
-import com.dayu.recharge.tools.HexUtil;
-import com.dayu.recharge.utils.MyCommon;
-
-import java.io.Serializable;
-
-/**
- * Copyright (C), 2023,
- * Author: zuo
- * Date: 2023-11-08 13:23
- * Description: 娴嬭瘯鍗�
- */
-public class TestCard implements Serializable {
- public String cardType = MyCommon.TEST_CARD_TYPE;//鍗＄被鍨�
- public String cardData = "A0B1C289";//鏍囪瘑鐮�
-
- public String getCardData() {
- return cardData;
- }
-
- public byte[] toByte() {
- Zero zero = new Zero();
- return zero.toByte();
- }
-
- public class Zero extends BaseCard {
- 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];
- }
- data[15] = getByteSum(data);
- return data;
- }
-
- }
-}
-
diff --git a/app/src/main/java/com/dayu/recharge/net/CallNetBack.java b/app/src/main/java/com/dayu/recharge/net/CallNetBack.java
deleted file mode 100644
index 153f81e..0000000
--- a/app/src/main/java/com/dayu/recharge/net/CallNetBack.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.dayu.recharge.net;
-
-/**
- * Created by zuoxiao on 2018/12/25.
- */
-
-public interface CallNetBack {
- void onSuccess();
-
- void onError(String msg);
-
-}
diff --git a/app/src/main/java/com/dayu/recharge/socketBean/BalanceSelecteBackBean.java b/app/src/main/java/com/dayu/recharge/socketBean/BalanceSelecteBackBean.java
deleted file mode 100644
index 622e296..0000000
--- a/app/src/main/java/com/dayu/recharge/socketBean/BalanceSelecteBackBean.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dayu.recharge.socketBean;
-
-/**
- * Copyright (C), 2022,
- * Author: zuo
- * Date: 2022/2/7 15:52
- * Description: 鏌ヨ浣欓
- */
-public class BalanceSelecteBackBean {
- String control = "00";//鎺у埗鍩�
- String AFN = "94";
- String state;//BCD鐮�00鍚敤 01绂佺敤 02闅跺睘淇℃伅涓嶇 03鏃犳鍗′俊鎭� 04鍏跺畠
- String[] balance = new String[4];// 鍓╀綑閲戦(浣�)---鍓╀綑閲戦(楂�) 16杩涘埗 鍗曚綅:0.01鍏�
- String[] name = new String[12];//濮撳悕 涓変釜瀛楃涓茬粍鎴愪竴涓眽瀛� 16杩涘埗UTF-8
- String CRC;
-}
diff --git a/app/src/main/java/com/dayu/recharge/socketBean/ConfirmMachineBackBean.java b/app/src/main/java/com/dayu/recharge/socketBean/ConfirmMachineBackBean.java
deleted file mode 100644
index 7c259fd..0000000
--- a/app/src/main/java/com/dayu/recharge/socketBean/ConfirmMachineBackBean.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dayu.recharge.socketBean;
-
-/**
- * Copyright (C), 2022,
- * Author: zuo
- * Date: 2022/2/7 11:26
- * Description: 纭鏀跺埌娉ㄥ唽鎶ユ枃 鈥斺�斺�斺�斺�斺�旇繑鍥�
- */
-public class ConfirmMachineBackBean {
- //鑷紪娴嬭瘯鏁版嵁6803680092008A16
- String AFN="";
- String Data;//BCD鐮�00鎴愬姛01澶辫触(娉ㄥ唽鍙蜂笉鏄湇鍔″櫒杩斿洖淇℃伅)
-}
diff --git a/app/src/main/java/com/dayu/recharge/socketBean/InitCardBackBean.java b/app/src/main/java/com/dayu/recharge/socketBean/InitCardBackBean.java
deleted file mode 100644
index 2de1e9c..0000000
--- a/app/src/main/java/com/dayu/recharge/socketBean/InitCardBackBean.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dayu.recharge.socketBean;
-
-/**
- * Copyright (C), 2022,
- * Author: zuo
- * Date: 2022/2/7 14:26
- * Description: 寮�鍗℃姤鏂囪繑鍥炲弬鏁�
- */
-public class InitCardBackBean {
- //鑷紪娴嬭瘯鏁版嵁681b680093313334316364393631323334353637383938373635343332008916
- String control = "00";//鎺у埗鍩�
- String AFN = "93";
- String[] orderId = new String[8];
- String[] initPeasantCode=new String[16];//鍐滄埛娉ㄥ唽缂栧彿
- String state;//BCD鐮�00鎴愬姛01韬唤璇佸凡娉ㄥ唽02鍏朵粬鍘熷洜澶辫触
-}
diff --git a/app/src/main/java/com/dayu/recharge/socketBean/InitMachineBackBean.java b/app/src/main/java/com/dayu/recharge/socketBean/InitMachineBackBean.java
deleted file mode 100644
index ac95dd8..0000000
--- a/app/src/main/java/com/dayu/recharge/socketBean/InitMachineBackBean.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dayu.recharge.socketBean;
-
-/**
- * Copyright (C), 2022,
- * Author: zuo
- * Date: 2022/2/6 12:17
- * Description: 鍏呭�肩鐞嗘敞鍐屾姤鏂囨湇鍔″櫒杩斿洖
- */
-public class InitMachineBackBean {
-
- //鑷紪娴嬭瘯鏁版嵁 681268009131323334353637383938373635343332ED16
- String control = "00";//鎺у埗鍩�
- String AFN = "91";
- String[] initCode = new String[16];//璁惧娉ㄥ唽鍙�
- String CRC;
-
-
-}
diff --git a/app/src/main/java/com/dayu/recharge/socketBean/RechargeBackBean.java b/app/src/main/java/com/dayu/recharge/socketBean/RechargeBackBean.java
deleted file mode 100644
index 6c64501..0000000
--- a/app/src/main/java/com/dayu/recharge/socketBean/RechargeBackBean.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dayu.recharge.socketBean;
-
-/**
- * Copyright (C), 2022,
- * Author: zuo
- * Date: 2022/2/7 22:09
- * Description: 鍏呭�� 杩斿洖
- */
-public class RechargeBackBean {
-
- //681b6800950041ac28f6e59388e588a9e6b3a2e789b939623662613338635116
- String control;//鎺у埗鍩烠琛ㄧず鎶ユ枃浼犺緭鏂瑰悜鍜屾墍鎻愪緵鐨勪紶杈撴湇鍔＄被鍨嬬殑淇℃伅锛�0x00浠ｈ〃姝ゅ抚鎶ユ枃鏄敱涓績绔彂鍑虹殑涓嬭鎶ユ枃;0x01 琛ㄧず姝ゅ抚鎶ユ枃鏄敱缁堢鍙戝嚭鐨勪笂琛屾姤鏂�;
- String AFN;
- String state;//BCD鐮�;00鍚敤01绂佺敤02闅跺睘淇℃伅涓嶇03鏃犳鍗′俊鎭�04鍏跺畠
- String balance ;//= new String[4];// 鍓╀綑閲戦(浣�)---鍓╀綑閲戦(楂�) 16杩涘埗 鍗曚綅:0.01鍏�
- String name ;//= new String[12];//濮撳悕 涓変釜瀛楃涓茬粍鎴愪竴涓眽瀛� 16杩涘埗UTF-8
- String orderId ;//= new String[8];//璁㈠崟鍙�
-}
diff --git a/app/src/main/java/com/dayu/recharge/tools/CustomIsoDepReader.java b/app/src/main/java/com/dayu/recharge/tools/CustomIsoDepReader.java
deleted file mode 100644
index c9b140d..0000000
--- a/app/src/main/java/com/dayu/recharge/tools/CustomIsoDepReader.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.dayu.recharge.tools;
-
-import android.nfc.Tag;
-import android.nfc.tech.TagTechnology;
-
-import java.io.IOException;
-
-/**
- * Created by Android Studio.
- * author: zuo
- * Date: 2023-11-29
- * Time: 9:13
- * 澶囨敞锛�
- */
-public class CustomIsoDepReader implements TagTechnology {
- @Override
- public Tag getTag() {
- return null;
- }
-
- @Override
- public void connect() throws IOException {
-
- }
-
- @Override
- public void close() throws IOException {
-
- }
-
- @Override
- public boolean isConnected() {
- return false;
- }
-}
diff --git a/app/src/main/java/com/dayu/recharge/utils/StrUtil.java b/app/src/main/java/com/dayu/recharge/utils/StrUtil.java
deleted file mode 100644
index b3ebb20..0000000
--- a/app/src/main/java/com/dayu/recharge/utils/StrUtil.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.dayu.recharge.utils;
-
-/**
- * Copyright (C), 2022,
- * Author: zuo
- * Date: 2022/2/3 22:00
- * Description:
- */
-public class StrUtil {
- /**
- * 瀛楃涓茶浆鍖栨垚涓�16杩涘埗瀛楃涓�
- * @param s
- * @return
- */
- public static String strTo16(String s) {
- String str = "";
- for (int i = 0; i < s.length(); i++) {
- int ch = (int) s.charAt(i);
- String s4 = Integer.toHexString(ch);
- str = str + s4;
- }
- return str;
- }
- /**
- * 16杩涘埗杞崲鎴愪负string绫诲瀷瀛楃涓�
- * @param s
- * @return
- */
- public static String hexStringToString(String s) {
- if (s == null || s.equals("")) {
- return null;
- }
- s = s.replace(" ", "");
- byte[] baKeyword = new byte[s.length() / 2];
- for (int i = 0; i < baKeyword.length; i++) {
- try {
- baKeyword[i] = (byte) (0xff & Integer.parseInt(s.substring(i * 2, i * 2 + 2), 16));
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- try {
- s = new String(baKeyword, "UTF-8");
- new String();
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- return s;
- }
-}
diff --git a/app/src/main/java/com/dayu/recharge/MyApplication.java b/app/src/main/java/com/dayu/rechargeqh/MyApplication.java
similarity index 90%
rename from app/src/main/java/com/dayu/recharge/MyApplication.java
rename to app/src/main/java/com/dayu/rechargeqh/MyApplication.java
index 6a2370d..d3be2af 100644
--- a/app/src/main/java/com/dayu/recharge/MyApplication.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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();
diff --git a/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/AdminSetupActivity.java
similarity index 96%
rename from app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/AdminSetupActivity.java
index 7c47f40..a140874 100644
--- a/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/activity/BaseActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/BaseActivity.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/activity/BaseActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/BaseActivity.java
index 6247fed..f5c2223 100644
--- a/app/src/main/java/com/dayu/recharge/activity/BaseActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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.
diff --git a/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/BaseNfcActivity.java
similarity index 87%
rename from app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/BaseNfcActivity.java
index 89456ef..b91bacd 100644
--- a/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/activity/DomainActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/DomainActivity.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/activity/DomainActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/DomainActivity.java
index 7cf1cae..3997aa1 100644
--- a/app/src/main/java/com/dayu/recharge/activity/DomainActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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.
diff --git a/app/src/main/java/com/dayu/rechargeqh/activity/ElectricPriceActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/ElectricPriceActivity.java
new file mode 100644
index 0000000..edda127
--- /dev/null
+++ b/app/src/main/java/com/dayu/rechargeqh/activity/ElectricPriceActivity.java
@@ -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鍏�");
+ }
+ }
+
+
+}
diff --git a/app/src/main/java/com/dayu/recharge/activity/HomeActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/HomeActivity.java
similarity index 93%
rename from app/src/main/java/com/dayu/recharge/activity/HomeActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/HomeActivity.java
index 8ea87ae..20883af 100644
--- a/app/src/main/java/com/dayu/recharge/activity/HomeActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
/**
diff --git a/app/src/main/java/com/dayu/recharge/activity/IdentifyingActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/IdentifyingActivity.java
similarity index 89%
rename from app/src/main/java/com/dayu/recharge/activity/IdentifyingActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/IdentifyingActivity.java
index 520ed07..af48d32 100644
--- a/app/src/main/java/com/dayu/recharge/activity/IdentifyingActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/LoginActivity.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/LoginActivity.java
index 3d59c16..d367e72 100644
--- a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/activity/ManageSetUpActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/ManageSetUpActivity.java
similarity index 89%
rename from app/src/main/java/com/dayu/recharge/activity/ManageSetUpActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/ManageSetUpActivity.java
index 027bad7..7583c2b 100644
--- a/app/src/main/java/com/dayu/recharge/activity/ManageSetUpActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/activity/ManageSetUpActivity.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.activity;
+package com.dayu.rechargeqh.activity;
import android.os.Bundle;
diff --git a/app/src/main/java/com/dayu/recharge/activity/MyActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/MyActivity.java
similarity index 95%
rename from app/src/main/java/com/dayu/recharge/activity/MyActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/MyActivity.java
index c7cee23..5d59f84 100644
--- a/app/src/main/java/com/dayu/recharge/activity/MyActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/NFCWreatActivity.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/NFCWreatActivity.java
index bfd8072..45f4438 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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);
diff --git a/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/NewCardActivity.java
similarity index 93%
rename from app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/NewCardActivity.java
index 401cccf..25d1728 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/activity/NewCardListActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/NewCardListActivity.java
similarity index 90%
rename from app/src/main/java/com/dayu/recharge/activity/NewCardListActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/NewCardListActivity.java
index 4bab5ec..f86add1 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NewCardListActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
/**
diff --git a/app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/ParameterActivity.java
similarity index 95%
rename from app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/ParameterActivity.java
index 1838e59..5ce52da 100644
--- a/app/src/main/java/com/dayu/recharge/activity/ParameterActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/PassWordActivity.java
similarity index 91%
rename from app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/PassWordActivity.java
index b2936f4..3e38fb0 100644
--- a/app/src/main/java/com/dayu/recharge/activity/PassWordActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/activity/PasswordCardActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/PasswordCardActivity.java
similarity index 87%
rename from app/src/main/java/com/dayu/recharge/activity/PasswordCardActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/PasswordCardActivity.java
index 4ae1047..3f3ee73 100644
--- a/app/src/main/java/com/dayu/recharge/activity/PasswordCardActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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();
}
diff --git a/app/src/main/java/com/dayu/recharge/activity/PowerActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/PowerActivity.java
similarity index 89%
rename from app/src/main/java/com/dayu/recharge/activity/PowerActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/PowerActivity.java
index 91452f4..a556e9e 100644
--- a/app/src/main/java/com/dayu/recharge/activity/PowerActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java b/app/src/main/java/com/dayu/rechargeqh/activity/ReadCardAcitivy.java
similarity index 78%
rename from app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/ReadCardAcitivy.java
index 8d55630..8543ad1 100644
--- a/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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();
diff --git a/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/RechargeActivity.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/RechargeActivity.java
index 8647a08..98a7818 100644
--- a/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/activity/RechargeDetail.java b/app/src/main/java/com/dayu/rechargeqh/activity/RechargeDetail.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/activity/RechargeDetail.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/RechargeDetail.java
index 8bfa413..17dc4ce 100644
--- a/app/src/main/java/com/dayu/recharge/activity/RechargeDetail.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/RechargeListActivity.java
similarity index 91%
rename from app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/RechargeListActivity.java
index 88e8d1b..8956825 100644
--- a/app/src/main/java/com/dayu/recharge/activity/RechargeListActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/activity/ReplacementActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/ReplacementActivity.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/activity/ReplacementActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/ReplacementActivity.java
index 053aaa1..a62cc30 100644
--- a/app/src/main/java/com/dayu/recharge/activity/ReplacementActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/activity/SysActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/SysActivity.java
similarity index 89%
rename from app/src/main/java/com/dayu/recharge/activity/SysActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/SysActivity.java
index d3222ec..7173497 100644
--- a/app/src/main/java/com/dayu/recharge/activity/SysActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java b/app/src/main/java/com/dayu/rechargeqh/activity/SysIpActivity.java
similarity index 86%
rename from app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/SysIpActivity.java
index 31dc483..aa41cb6 100644
--- a/app/src/main/java/com/dayu/recharge/activity/SysIpActivity.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/adapter/BaseRecyclerAdapter.java b/app/src/main/java/com/dayu/rechargeqh/adapter/BaseRecyclerAdapter.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/adapter/BaseRecyclerAdapter.java
rename to app/src/main/java/com/dayu/rechargeqh/adapter/BaseRecyclerAdapter.java
index 2560c5f..3fc91bb 100644
--- a/app/src/main/java/com/dayu/recharge/adapter/BaseRecyclerAdapter.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/adapter/NewCardAdapter.java b/app/src/main/java/com/dayu/rechargeqh/adapter/NewCardAdapter.java
similarity index 88%
rename from app/src/main/java/com/dayu/recharge/adapter/NewCardAdapter.java
rename to app/src/main/java/com/dayu/rechargeqh/adapter/NewCardAdapter.java
index 72b7380..3380a47 100644
--- a/app/src/main/java/com/dayu/recharge/adapter/NewCardAdapter.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/adapter/RechargeAdapter.java b/app/src/main/java/com/dayu/rechargeqh/adapter/RechargeAdapter.java
similarity index 84%
rename from app/src/main/java/com/dayu/recharge/adapter/RechargeAdapter.java
rename to app/src/main/java/com/dayu/rechargeqh/adapter/RechargeAdapter.java
index 55f720f..5f42751 100644
--- a/app/src/main/java/com/dayu/recharge/adapter/RechargeAdapter.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/adapter/ReplacementAdapter.java b/app/src/main/java/com/dayu/rechargeqh/adapter/ReplacementAdapter.java
similarity index 88%
rename from app/src/main/java/com/dayu/recharge/adapter/ReplacementAdapter.java
rename to app/src/main/java/com/dayu/rechargeqh/adapter/ReplacementAdapter.java
index 127a70e..535dafd 100644
--- a/app/src/main/java/com/dayu/recharge/adapter/ReplacementAdapter.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/bean/TableItem.java b/app/src/main/java/com/dayu/rechargeqh/bean/TableItem.java
similarity index 95%
rename from app/src/main/java/com/dayu/recharge/bean/TableItem.java
rename to app/src/main/java/com/dayu/rechargeqh/bean/TableItem.java
index 672afe5..9b2553a 100644
--- a/app/src/main/java/com/dayu/recharge/bean/TableItem.java
+++ b/app/src/main/java/com/dayu/rechargeqh/bean/TableItem.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.bean;
+package com.dayu.rechargeqh.bean;
/**
* Created by Administrator on 2017/5/24.
diff --git a/app/src/main/java/com/dayu/recharge/bean/TransBean.java b/app/src/main/java/com/dayu/rechargeqh/bean/TransBean.java
similarity index 97%
rename from app/src/main/java/com/dayu/recharge/bean/TransBean.java
rename to app/src/main/java/com/dayu/rechargeqh/bean/TransBean.java
index 6367832..ccd217b 100644
--- a/app/src/main/java/com/dayu/recharge/bean/TransBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/rechargeqh/card/BaseCard.java b/app/src/main/java/com/dayu/rechargeqh/card/BaseCard.java
new file mode 100644
index 0000000..bdfa4a5
--- /dev/null
+++ b/app/src/main/java/com/dayu/rechargeqh/card/BaseCard.java
@@ -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;
+ }
+
+
+}
diff --git a/app/src/main/java/com/dayu/rechargeqh/card/BlackCard.java b/app/src/main/java/com/dayu/rechargeqh/card/BlackCard.java
new file mode 100644
index 0000000..82526f4
--- /dev/null
+++ b/app/src/main/java/com/dayu/rechargeqh/card/BlackCard.java
@@ -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;
+ }
+
+ }
+
+
+}
diff --git a/app/src/main/java/com/dayu/rechargeqh/card/CleanCard.java b/app/src/main/java/com/dayu/rechargeqh/card/CleanCard.java
new file mode 100644
index 0000000..c2798d2
--- /dev/null
+++ b/app/src/main/java/com/dayu/rechargeqh/card/CleanCard.java
@@ -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;
+ }
+
+ }
+}
diff --git a/app/src/main/java/com/dayu/rechargeqh/card/CleanUserCard.java b/app/src/main/java/com/dayu/rechargeqh/card/CleanUserCard.java
new file mode 100644
index 0000000..16a693e
--- /dev/null
+++ b/app/src/main/java/com/dayu/rechargeqh/card/CleanUserCard.java
@@ -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;
+ }
+
+ }
+}
diff --git a/app/src/main/java/com/dayu/recharge/card/ConfigurationPowerCard.java b/app/src/main/java/com/dayu/rechargeqh/card/ConfigurationPowerCard.java
similarity index 81%
rename from app/src/main/java/com/dayu/recharge/card/ConfigurationPowerCard.java
rename to app/src/main/java/com/dayu/rechargeqh/card/ConfigurationPowerCard.java
index c727b4c..b575fd7 100644
--- a/app/src/main/java/com/dayu/recharge/card/ConfigurationPowerCard.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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淇敼涓篎F锛屽啀鏂拌澶囦笂鍒锋鍗℃椂锛屾敞鍐屽彿鍜孖D鍙疯嚜鍔ㄥ啓鍒版帶鍒跺櫒鍐咃紝鍙互鐩存帴鍒峰崱浣跨敤
*/
-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); // 灏嗘诞鐐规暟鍚戜笂鍙栨暣骞惰浆鎹负鏁存暟
diff --git a/app/src/main/java/com/dayu/recharge/card/ConfigureDeviceRegistrationCrad.java b/app/src/main/java/com/dayu/rechargeqh/card/ConfigureDeviceRegistrationCrad.java
similarity index 68%
rename from app/src/main/java/com/dayu/recharge/card/ConfigureDeviceRegistrationCrad.java
rename to app/src/main/java/com/dayu/rechargeqh/card/ConfigureDeviceRegistrationCrad.java
index 796d029..a8fea71 100644
--- a/app/src/main/java/com/dayu/recharge/card/ConfigureDeviceRegistrationCrad.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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淇敼涓篎F锛屽啀鏂拌澶囦笂鍒锋鍗℃椂锛屾敞鍐屽彿鍜孖D鍙疯嚜鍔ㄥ啓鍒版帶鍒跺櫒鍐咃紝鍙互鐩存帴鍒峰崱浣跨敤
*/
-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;
}
diff --git a/app/src/main/java/com/dayu/recharge/card/DomainCard.java b/app/src/main/java/com/dayu/rechargeqh/card/DomainCard.java
similarity index 95%
rename from app/src/main/java/com/dayu/recharge/card/DomainCard.java
rename to app/src/main/java/com/dayu/rechargeqh/card/DomainCard.java
index 04e6ca7..7d55f3f 100644
--- a/app/src/main/java/com/dayu/recharge/card/DomainCard.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
/**
diff --git a/app/src/main/java/com/dayu/recharge/card/ElectricPriceCard.java b/app/src/main/java/com/dayu/rechargeqh/card/ElectricPriceCard.java
similarity index 76%
rename from app/src/main/java/com/dayu/recharge/card/ElectricPriceCard.java
rename to app/src/main/java/com/dayu/rechargeqh/card/ElectricPriceCard.java
index f6a671a..195beed 100644
--- a/app/src/main/java/com/dayu/recharge/card/ElectricPriceCard.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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);
diff --git a/app/src/main/java/com/dayu/recharge/card/ManageCard.java b/app/src/main/java/com/dayu/rechargeqh/card/ManageCard.java
similarity index 68%
rename from app/src/main/java/com/dayu/recharge/card/ManageCard.java
rename to app/src/main/java/com/dayu/rechargeqh/card/ManageCard.java
index 241150a..a3a095a 100644
--- a/app/src/main/java/com/dayu/recharge/card/ManageCard.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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);
}
diff --git a/app/src/main/java/com/dayu/recharge/card/PassWordCard.java b/app/src/main/java/com/dayu/rechargeqh/card/PassWordCard.java
similarity index 70%
rename from app/src/main/java/com/dayu/recharge/card/PassWordCard.java
rename to app/src/main/java/com/dayu/rechargeqh/card/PassWordCard.java
index dfb7f81..2ed615a 100644
--- a/app/src/main/java/com/dayu/recharge/card/PassWordCard.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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();
}
diff --git a/app/src/main/java/com/dayu/recharge/card/RegionCard.java b/app/src/main/java/com/dayu/rechargeqh/card/RegionCard.java
similarity index 84%
rename from app/src/main/java/com/dayu/recharge/card/RegionCard.java
rename to app/src/main/java/com/dayu/rechargeqh/card/RegionCard.java
index 9adf9b7..a09152c 100644
--- a/app/src/main/java/com/dayu/recharge/card/RegionCard.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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);
diff --git a/app/src/main/java/com/dayu/recharge/card/RegisteredCard.java b/app/src/main/java/com/dayu/rechargeqh/card/RegisteredCard.java
similarity index 60%
rename from app/src/main/java/com/dayu/recharge/card/RegisteredCard.java
rename to app/src/main/java/com/dayu/rechargeqh/card/RegisteredCard.java
index de5c242..354055a 100644
--- a/app/src/main/java/com/dayu/recharge/card/RegisteredCard.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
}
diff --git a/app/src/main/java/com/dayu/rechargeqh/card/TestCard.java b/app/src/main/java/com/dayu/rechargeqh/card/TestCard.java
new file mode 100644
index 0000000..fbf623f
--- /dev/null
+++ b/app/src/main/java/com/dayu/rechargeqh/card/TestCard.java
@@ -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;
+ }
+
+ }
+}
+
diff --git a/app/src/main/java/com/dayu/recharge/card/UserCard.java b/app/src/main/java/com/dayu/rechargeqh/card/UserCard.java
similarity index 97%
rename from app/src/main/java/com/dayu/recharge/card/UserCard.java
rename to app/src/main/java/com/dayu/rechargeqh/card/UserCard.java
index 90cb38a..e581719 100644
--- a/app/src/main/java/com/dayu/recharge/card/UserCard.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
/**
diff --git a/app/src/main/java/com/dayu/recharge/dao/AdminDataDao.java b/app/src/main/java/com/dayu/rechargeqh/dao/AdminDataDao.java
similarity index 87%
rename from app/src/main/java/com/dayu/recharge/dao/AdminDataDao.java
rename to app/src/main/java/com/dayu/rechargeqh/dao/AdminDataDao.java
index c1f4dc3..c3afc4c 100644
--- a/app/src/main/java/com/dayu/recharge/dao/AdminDataDao.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/dao/AppDatabase.java b/app/src/main/java/com/dayu/rechargeqh/dao/AppDatabase.java
similarity index 64%
rename from app/src/main/java/com/dayu/recharge/dao/AppDatabase.java
rename to app/src/main/java/com/dayu/rechargeqh/dao/AppDatabase.java
index 86ee82b..7839100 100644
--- a/app/src/main/java/com/dayu/recharge/dao/AppDatabase.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/dao/BaseDaoSingleton.java b/app/src/main/java/com/dayu/rechargeqh/dao/BaseDaoSingleton.java
similarity index 89%
rename from app/src/main/java/com/dayu/recharge/dao/BaseDaoSingleton.java
rename to app/src/main/java/com/dayu/rechargeqh/dao/BaseDaoSingleton.java
index 752df64..7987609 100644
--- a/app/src/main/java/com/dayu/recharge/dao/BaseDaoSingleton.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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) {
diff --git a/app/src/main/java/com/dayu/recharge/dao/CardDataDao.java b/app/src/main/java/com/dayu/rechargeqh/dao/CardDataDao.java
similarity index 87%
rename from app/src/main/java/com/dayu/recharge/dao/CardDataDao.java
rename to app/src/main/java/com/dayu/rechargeqh/dao/CardDataDao.java
index 07438d5..10d2719 100644
--- a/app/src/main/java/com/dayu/recharge/dao/CardDataDao.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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.
diff --git a/app/src/main/java/com/dayu/recharge/dao/DeviceNumberDao.java b/app/src/main/java/com/dayu/rechargeqh/dao/DeviceNumberDao.java
similarity index 88%
rename from app/src/main/java/com/dayu/recharge/dao/DeviceNumberDao.java
rename to app/src/main/java/com/dayu/rechargeqh/dao/DeviceNumberDao.java
index 3bbd7a6..18afaae 100644
--- a/app/src/main/java/com/dayu/recharge/dao/DeviceNumberDao.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/dao/DomainPortDao.java b/app/src/main/java/com/dayu/rechargeqh/dao/DomainPortDao.java
similarity index 83%
rename from app/src/main/java/com/dayu/recharge/dao/DomainPortDao.java
rename to app/src/main/java/com/dayu/rechargeqh/dao/DomainPortDao.java
index 165e74d..7cf273f 100644
--- a/app/src/main/java/com/dayu/recharge/dao/DomainPortDao.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/dao/ElectricPriceDao.java b/app/src/main/java/com/dayu/rechargeqh/dao/ElectricPriceDao.java
similarity index 88%
rename from app/src/main/java/com/dayu/recharge/dao/ElectricPriceDao.java
rename to app/src/main/java/com/dayu/rechargeqh/dao/ElectricPriceDao.java
index 66f2961..af1877c 100644
--- a/app/src/main/java/com/dayu/recharge/dao/ElectricPriceDao.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/dao/IdentityDao.java b/app/src/main/java/com/dayu/rechargeqh/dao/IdentityDao.java
similarity index 88%
rename from app/src/main/java/com/dayu/recharge/dao/IdentityDao.java
rename to app/src/main/java/com/dayu/rechargeqh/dao/IdentityDao.java
index 0348d7c..eac966a 100644
--- a/app/src/main/java/com/dayu/recharge/dao/IdentityDao.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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.
diff --git a/app/src/main/java/com/dayu/recharge/dao/IpDao.java b/app/src/main/java/com/dayu/rechargeqh/dao/IpDao.java
similarity index 83%
rename from app/src/main/java/com/dayu/recharge/dao/IpDao.java
rename to app/src/main/java/com/dayu/rechargeqh/dao/IpDao.java
index 627f60c..07d147f 100644
--- a/app/src/main/java/com/dayu/recharge/dao/IpDao.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/dao/LoginPsDao.java b/app/src/main/java/com/dayu/rechargeqh/dao/LoginPsDao.java
similarity index 88%
rename from app/src/main/java/com/dayu/recharge/dao/LoginPsDao.java
rename to app/src/main/java/com/dayu/rechargeqh/dao/LoginPsDao.java
index ce398f0..08794a4 100644
--- a/app/src/main/java/com/dayu/recharge/dao/LoginPsDao.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/dao/PassWordCardDao.java b/app/src/main/java/com/dayu/rechargeqh/dao/PassWordCardDao.java
similarity index 88%
rename from app/src/main/java/com/dayu/recharge/dao/PassWordCardDao.java
rename to app/src/main/java/com/dayu/rechargeqh/dao/PassWordCardDao.java
index 22256d2..76b34a1 100644
--- a/app/src/main/java/com/dayu/recharge/dao/PassWordCardDao.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/dao/PowerDao.java b/app/src/main/java/com/dayu/rechargeqh/dao/PowerDao.java
similarity index 87%
rename from app/src/main/java/com/dayu/recharge/dao/PowerDao.java
rename to app/src/main/java/com/dayu/rechargeqh/dao/PowerDao.java
index c34007e..48a126b 100644
--- a/app/src/main/java/com/dayu/recharge/dao/PowerDao.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/dao/RechargeDao.java b/app/src/main/java/com/dayu/rechargeqh/dao/RechargeDao.java
similarity index 86%
rename from app/src/main/java/com/dayu/recharge/dao/RechargeDao.java
rename to app/src/main/java/com/dayu/rechargeqh/dao/RechargeDao.java
index 157acc9..16cb88c 100644
--- a/app/src/main/java/com/dayu/recharge/dao/RechargeDao.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/dao/UserCardDao.java b/app/src/main/java/com/dayu/rechargeqh/dao/UserCardDao.java
similarity index 93%
rename from app/src/main/java/com/dayu/recharge/dao/UserCardDao.java
rename to app/src/main/java/com/dayu/rechargeqh/dao/UserCardDao.java
index 4e1dc5f..8b3da0a 100644
--- a/app/src/main/java/com/dayu/recharge/dao/UserCardDao.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/dbBean/AdminDataBean.java b/app/src/main/java/com/dayu/rechargeqh/dbBean/AdminDataBean.java
similarity index 97%
rename from app/src/main/java/com/dayu/recharge/dbBean/AdminDataBean.java
rename to app/src/main/java/com/dayu/rechargeqh/dbBean/AdminDataBean.java
index 68f8fe8..743ae80 100644
--- a/app/src/main/java/com/dayu/recharge/dbBean/AdminDataBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/dbBean/CardData.java b/app/src/main/java/com/dayu/rechargeqh/dbBean/CardData.java
similarity index 95%
rename from app/src/main/java/com/dayu/recharge/dbBean/CardData.java
rename to app/src/main/java/com/dayu/rechargeqh/dbBean/CardData.java
index 749a91e..c6f3141 100644
--- a/app/src/main/java/com/dayu/recharge/dbBean/CardData.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/dbBean/DeviceNumber.java b/app/src/main/java/com/dayu/rechargeqh/dbBean/DeviceNumber.java
similarity index 94%
rename from app/src/main/java/com/dayu/recharge/dbBean/DeviceNumber.java
rename to app/src/main/java/com/dayu/rechargeqh/dbBean/DeviceNumber.java
index 50b0d16..51702ef 100644
--- a/app/src/main/java/com/dayu/recharge/dbBean/DeviceNumber.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/dbBean/DomainBean.java b/app/src/main/java/com/dayu/rechargeqh/dbBean/DomainBean.java
similarity index 95%
rename from app/src/main/java/com/dayu/recharge/dbBean/DomainBean.java
rename to app/src/main/java/com/dayu/rechargeqh/dbBean/DomainBean.java
index ce57b7e..b6066e8 100644
--- a/app/src/main/java/com/dayu/recharge/dbBean/DomainBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/dbBean/ElectricPriceBean.java b/app/src/main/java/com/dayu/rechargeqh/dbBean/ElectricPriceBean.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/dbBean/ElectricPriceBean.java
rename to app/src/main/java/com/dayu/rechargeqh/dbBean/ElectricPriceBean.java
index 5d1d127..2063328 100644
--- a/app/src/main/java/com/dayu/recharge/dbBean/ElectricPriceBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/dbBean/IdentityBean.java b/app/src/main/java/com/dayu/rechargeqh/dbBean/IdentityBean.java
similarity index 93%
rename from app/src/main/java/com/dayu/recharge/dbBean/IdentityBean.java
rename to app/src/main/java/com/dayu/rechargeqh/dbBean/IdentityBean.java
index 6bc1a80..f32b526 100644
--- a/app/src/main/java/com/dayu/recharge/dbBean/IdentityBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/dbBean/IpBean.java b/app/src/main/java/com/dayu/rechargeqh/dbBean/IpBean.java
similarity index 94%
rename from app/src/main/java/com/dayu/recharge/dbBean/IpBean.java
rename to app/src/main/java/com/dayu/rechargeqh/dbBean/IpBean.java
index 8aca8e2..1f89264 100644
--- a/app/src/main/java/com/dayu/recharge/dbBean/IpBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/dbBean/PassWordBean.java b/app/src/main/java/com/dayu/rechargeqh/dbBean/PassWordBean.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/dbBean/PassWordBean.java
rename to app/src/main/java/com/dayu/rechargeqh/dbBean/PassWordBean.java
index 9e5c80b..01e4b20 100644
--- a/app/src/main/java/com/dayu/recharge/dbBean/PassWordBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/dbBean/PassWordCardBean.java b/app/src/main/java/com/dayu/rechargeqh/dbBean/PassWordCardBean.java
similarity index 93%
rename from app/src/main/java/com/dayu/recharge/dbBean/PassWordCardBean.java
rename to app/src/main/java/com/dayu/rechargeqh/dbBean/PassWordCardBean.java
index 22a9b0a..84b5225 100644
--- a/app/src/main/java/com/dayu/recharge/dbBean/PassWordCardBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/dbBean/PowerBean.java b/app/src/main/java/com/dayu/rechargeqh/dbBean/PowerBean.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/dbBean/PowerBean.java
rename to app/src/main/java/com/dayu/rechargeqh/dbBean/PowerBean.java
index ba6b17a..30116fe 100644
--- a/app/src/main/java/com/dayu/recharge/dbBean/PowerBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/dbBean/RechargeBean.java b/app/src/main/java/com/dayu/rechargeqh/dbBean/RechargeBean.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/dbBean/RechargeBean.java
rename to app/src/main/java/com/dayu/rechargeqh/dbBean/RechargeBean.java
index c2b8225..b2b1415 100644
--- a/app/src/main/java/com/dayu/recharge/dbBean/RechargeBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/dbBean/UserCardBean.java b/app/src/main/java/com/dayu/rechargeqh/dbBean/UserCardBean.java
similarity index 97%
rename from app/src/main/java/com/dayu/recharge/dbBean/UserCardBean.java
rename to app/src/main/java/com/dayu/rechargeqh/dbBean/UserCardBean.java
index 559bee4..ff83780 100644
--- a/app/src/main/java/com/dayu/recharge/dbBean/UserCardBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/model/RechargeListModel.java b/app/src/main/java/com/dayu/rechargeqh/model/RechargeListModel.java
similarity index 80%
rename from app/src/main/java/com/dayu/recharge/model/RechargeListModel.java
rename to app/src/main/java/com/dayu/rechargeqh/model/RechargeListModel.java
index 7345d47..87bdbd2 100644
--- a/app/src/main/java/com/dayu/recharge/model/RechargeListModel.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/model/UserListMode.java b/app/src/main/java/com/dayu/rechargeqh/model/UserListMode.java
similarity index 86%
rename from app/src/main/java/com/dayu/recharge/model/UserListMode.java
rename to app/src/main/java/com/dayu/rechargeqh/model/UserListMode.java
index 16631c1..5bdd243 100644
--- a/app/src/main/java/com/dayu/recharge/model/UserListMode.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/net/IMessage.java b/app/src/main/java/com/dayu/rechargeqh/net/IMessage.java
similarity index 87%
rename from app/src/main/java/com/dayu/recharge/net/IMessage.java
rename to app/src/main/java/com/dayu/rechargeqh/net/IMessage.java
index e5e2948..8326dcd 100644
--- a/app/src/main/java/com/dayu/recharge/net/IMessage.java
+++ b/app/src/main/java/com/dayu/rechargeqh/net/IMessage.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.net;
+package com.dayu.rechargeqh.net;
/**
* Copyright (C), 2022,
diff --git a/app/src/main/java/com/dayu/recharge/net/ScoketMessageProtocol.java b/app/src/main/java/com/dayu/rechargeqh/net/ScoketMessageProtocol.java
similarity index 91%
rename from app/src/main/java/com/dayu/recharge/net/ScoketMessageProtocol.java
rename to app/src/main/java/com/dayu/rechargeqh/net/ScoketMessageProtocol.java
index 5755070..7b9c420 100644
--- a/app/src/main/java/com/dayu/recharge/net/ScoketMessageProtocol.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/net/SocketCallBack.java b/app/src/main/java/com/dayu/rechargeqh/net/SocketCallBack.java
similarity index 86%
rename from app/src/main/java/com/dayu/recharge/net/SocketCallBack.java
rename to app/src/main/java/com/dayu/rechargeqh/net/SocketCallBack.java
index 52e6f30..528693f 100644
--- a/app/src/main/java/com/dayu/recharge/net/SocketCallBack.java
+++ b/app/src/main/java/com/dayu/rechargeqh/net/SocketCallBack.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.net;
+package com.dayu.rechargeqh.net;
/**
* Copyright (C), 2022,
diff --git a/app/src/main/java/com/dayu/recharge/net/SocketData.java b/app/src/main/java/com/dayu/rechargeqh/net/SocketData.java
similarity index 96%
rename from app/src/main/java/com/dayu/recharge/net/SocketData.java
rename to app/src/main/java/com/dayu/rechargeqh/net/SocketData.java
index a6a259e..a78b28e 100644
--- a/app/src/main/java/com/dayu/recharge/net/SocketData.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/net/SocketNet.java b/app/src/main/java/com/dayu/rechargeqh/net/SocketNet.java
similarity index 80%
rename from app/src/main/java/com/dayu/recharge/net/SocketNet.java
rename to app/src/main/java/com/dayu/rechargeqh/net/SocketNet.java
index 9783701..a60a966 100644
--- a/app/src/main/java/com/dayu/recharge/net/SocketNet.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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();
}
diff --git a/app/src/main/java/com/dayu/recharge/net/WSJsonParser.java b/app/src/main/java/com/dayu/rechargeqh/net/WSJsonParser.java
similarity index 99%
rename from app/src/main/java/com/dayu/recharge/net/WSJsonParser.java
rename to app/src/main/java/com/dayu/rechargeqh/net/WSJsonParser.java
index debb282..1be5e65 100644
--- a/app/src/main/java/com/dayu/recharge/net/WSJsonParser.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/socketBean/BalanceSelecteRequestBean.java b/app/src/main/java/com/dayu/rechargeqh/socketBean/BalanceSelecteRequestBean.java
similarity index 94%
rename from app/src/main/java/com/dayu/recharge/socketBean/BalanceSelecteRequestBean.java
rename to app/src/main/java/com/dayu/rechargeqh/socketBean/BalanceSelecteRequestBean.java
index eeca3e3..d34f198 100644
--- a/app/src/main/java/com/dayu/recharge/socketBean/BalanceSelecteRequestBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/socketBean/BaseSocketBean.java b/app/src/main/java/com/dayu/rechargeqh/socketBean/BaseSocketBean.java
similarity index 90%
rename from app/src/main/java/com/dayu/recharge/socketBean/BaseSocketBean.java
rename to app/src/main/java/com/dayu/rechargeqh/socketBean/BaseSocketBean.java
index 98a31f7..5c58b7b 100644
--- a/app/src/main/java/com/dayu/recharge/socketBean/BaseSocketBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/socketBean/ConfirmMachineRequestBean.java b/app/src/main/java/com/dayu/rechargeqh/socketBean/ConfirmMachineRequestBean.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/socketBean/ConfirmMachineRequestBean.java
rename to app/src/main/java/com/dayu/rechargeqh/socketBean/ConfirmMachineRequestBean.java
index 2b5aae5..dc57a51 100644
--- a/app/src/main/java/com/dayu/recharge/socketBean/ConfirmMachineRequestBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/socketBean/InitCardRequestBean.java b/app/src/main/java/com/dayu/rechargeqh/socketBean/InitCardRequestBean.java
similarity index 94%
rename from app/src/main/java/com/dayu/recharge/socketBean/InitCardRequestBean.java
rename to app/src/main/java/com/dayu/rechargeqh/socketBean/InitCardRequestBean.java
index 8cfbfce..23d95b6 100644
--- a/app/src/main/java/com/dayu/recharge/socketBean/InitCardRequestBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/socketBean/InitMachineRequestBean.java b/app/src/main/java/com/dayu/rechargeqh/socketBean/InitMachineRequestBean.java
similarity index 88%
rename from app/src/main/java/com/dayu/recharge/socketBean/InitMachineRequestBean.java
rename to app/src/main/java/com/dayu/rechargeqh/socketBean/InitMachineRequestBean.java
index 290a9e7..9363b04 100644
--- a/app/src/main/java/com/dayu/recharge/socketBean/InitMachineRequestBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/socketBean/RechargeRequestBean.java b/app/src/main/java/com/dayu/rechargeqh/socketBean/RechargeRequestBean.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/socketBean/RechargeRequestBean.java
rename to app/src/main/java/com/dayu/rechargeqh/socketBean/RechargeRequestBean.java
index b914e0c..09a7423 100644
--- a/app/src/main/java/com/dayu/recharge/socketBean/RechargeRequestBean.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/tools/ArraysUtil.java b/app/src/main/java/com/dayu/rechargeqh/tools/ArraysUtil.java
similarity index 96%
rename from app/src/main/java/com/dayu/recharge/tools/ArraysUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/tools/ArraysUtil.java
index 19ddaac..4e1d3b9 100644
--- a/app/src/main/java/com/dayu/recharge/tools/ArraysUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/tools/ArraysUtil.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.tools;
+package com.dayu.rechargeqh.tools;
/**
* Copyright (C), 2022,
diff --git a/app/src/main/java/com/dayu/recharge/tools/BaseNFCHelper.java b/app/src/main/java/com/dayu/rechargeqh/tools/BaseNFCHelper.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/tools/BaseNFCHelper.java
rename to app/src/main/java/com/dayu/rechargeqh/tools/BaseNFCHelper.java
index 342e41b..8ccf9f0 100644
--- a/app/src/main/java/com/dayu/recharge/tools/BaseNFCHelper.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/tools/BcdUtil.java b/app/src/main/java/com/dayu/rechargeqh/tools/BcdUtil.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/tools/BcdUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/tools/BcdUtil.java
index cbdf1ff..b846900 100644
--- a/app/src/main/java/com/dayu/recharge/tools/BcdUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/tools/BcdUtil.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.tools;
+package com.dayu.rechargeqh.tools;
/**
* Copyright (C), 2022,
diff --git a/app/src/main/java/com/dayu/recharge/tools/HexUtil.java b/app/src/main/java/com/dayu/rechargeqh/tools/HexUtil.java
similarity index 99%
rename from app/src/main/java/com/dayu/recharge/tools/HexUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/tools/HexUtil.java
index 79176a6..48fd8f4 100644
--- a/app/src/main/java/com/dayu/recharge/tools/HexUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/tools/LoyaltyCardReader.java b/app/src/main/java/com/dayu/rechargeqh/tools/LoyaltyCardReader.java
similarity index 99%
rename from app/src/main/java/com/dayu/recharge/tools/LoyaltyCardReader.java
rename to app/src/main/java/com/dayu/rechargeqh/tools/LoyaltyCardReader.java
index b80f6d7..3da68e4 100644
--- a/app/src/main/java/com/dayu/recharge/tools/LoyaltyCardReader.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java b/app/src/main/java/com/dayu/rechargeqh/tools/NFCWriteHelper.java
similarity index 99%
rename from app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java
rename to app/src/main/java/com/dayu/rechargeqh/tools/NFCWriteHelper.java
index 16a3046..ce9ea90 100644
--- a/app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/tools/NfcReadHelper.java b/app/src/main/java/com/dayu/rechargeqh/tools/NfcReadHelper.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/tools/NfcReadHelper.java
rename to app/src/main/java/com/dayu/rechargeqh/tools/NfcReadHelper.java
index e8ed9d6..9bc2ede 100644
--- a/app/src/main/java/com/dayu/recharge/tools/NfcReadHelper.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/tools/Utils.java b/app/src/main/java/com/dayu/rechargeqh/tools/Utils.java
similarity index 99%
rename from app/src/main/java/com/dayu/recharge/tools/Utils.java
rename to app/src/main/java/com/dayu/rechargeqh/tools/Utils.java
index ac76806..03e97eb 100644
--- a/app/src/main/java/com/dayu/recharge/tools/Utils.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/tools/WriteCardUtils.java b/app/src/main/java/com/dayu/rechargeqh/tools/WriteCardUtils.java
similarity index 91%
rename from app/src/main/java/com/dayu/recharge/tools/WriteCardUtils.java
rename to app/src/main/java/com/dayu/rechargeqh/tools/WriteCardUtils.java
index 9ace2a3..e8e7bed 100644
--- a/app/src/main/java/com/dayu/recharge/tools/WriteCardUtils.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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.
diff --git a/app/src/main/java/com/dayu/recharge/utils/AidlUtil.java b/app/src/main/java/com/dayu/rechargeqh/utils/AidlUtil.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/utils/AidlUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/AidlUtil.java
index 276bc20..b900bd5 100644
--- a/app/src/main/java/com/dayu/recharge/utils/AidlUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/utils/ArithUtil.java b/app/src/main/java/com/dayu/rechargeqh/utils/ArithUtil.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/utils/ArithUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/ArithUtil.java
index a9af776..daccaab 100644
--- a/app/src/main/java/com/dayu/recharge/utils/ArithUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/utils/BytesUtil.java b/app/src/main/java/com/dayu/rechargeqh/utils/BytesUtil.java
similarity index 99%
rename from app/src/main/java/com/dayu/recharge/utils/BytesUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/BytesUtil.java
index 8b3b9da..b3ddade 100644
--- a/app/src/main/java/com/dayu/recharge/utils/BytesUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/utils/CRC8.java b/app/src/main/java/com/dayu/rechargeqh/utils/CRC8.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/utils/CRC8.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/CRC8.java
index bc75f13..a36e947 100644
--- a/app/src/main/java/com/dayu/recharge/utils/CRC8.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/utils/DateUtil.java b/app/src/main/java/com/dayu/rechargeqh/utils/DateUtil.java
similarity index 90%
rename from app/src/main/java/com/dayu/recharge/utils/DateUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/DateUtil.java
index f0c0034..8ccf85d 100644
--- a/app/src/main/java/com/dayu/recharge/utils/DateUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/utils/DeviceNumberUtils.java b/app/src/main/java/com/dayu/rechargeqh/utils/DeviceNumberUtils.java
similarity index 86%
rename from app/src/main/java/com/dayu/recharge/utils/DeviceNumberUtils.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/DeviceNumberUtils.java
index 42a2ead..6ded9c0 100644
--- a/app/src/main/java/com/dayu/recharge/utils/DeviceNumberUtils.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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.
diff --git a/app/src/main/java/com/dayu/recharge/utils/ESCUtil.java b/app/src/main/java/com/dayu/rechargeqh/utils/ESCUtil.java
similarity index 99%
rename from app/src/main/java/com/dayu/recharge/utils/ESCUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/ESCUtil.java
index e926a15..aa7c8ea 100644
--- a/app/src/main/java/com/dayu/recharge/utils/ESCUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/utils/ESCUtil.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.utils;
+package com.dayu.rechargeqh.utils;
import android.graphics.Bitmap;
diff --git a/app/src/main/java/com/dayu/recharge/utils/ExcelUtil.java b/app/src/main/java/com/dayu/rechargeqh/utils/ExcelUtil.java
similarity index 97%
rename from app/src/main/java/com/dayu/recharge/utils/ExcelUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/ExcelUtil.java
index 7ed609d..6695c71 100644
--- a/app/src/main/java/com/dayu/recharge/utils/ExcelUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/utils/LogUtil.java b/app/src/main/java/com/dayu/rechargeqh/utils/LogUtil.java
similarity index 96%
rename from app/src/main/java/com/dayu/recharge/utils/LogUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/LogUtil.java
index 22bc12b..9fa501d 100644
--- a/app/src/main/java/com/dayu/recharge/utils/LogUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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 {
diff --git a/app/src/main/java/com/dayu/recharge/utils/MornyUtil.java b/app/src/main/java/com/dayu/rechargeqh/utils/MornyUtil.java
similarity index 94%
rename from app/src/main/java/com/dayu/recharge/utils/MornyUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/MornyUtil.java
index 5e705da..5b3306b 100644
--- a/app/src/main/java/com/dayu/recharge/utils/MornyUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/utils/MornyUtil.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.utils;
+package com.dayu.rechargeqh.utils;
import java.math.BigDecimal;
diff --git a/app/src/main/java/com/dayu/recharge/utils/MyCommon.java b/app/src/main/java/com/dayu/rechargeqh/utils/MyCommon.java
similarity index 71%
rename from app/src/main/java/com/dayu/recharge/utils/MyCommon.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/MyCommon.java
index 132a508..6d2ec5e 100644
--- a/app/src/main/java/com/dayu/recharge/utils/MyCommon.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
+ }
}
diff --git a/app/src/main/java/com/dayu/recharge/utils/MyFileUtil.java b/app/src/main/java/com/dayu/rechargeqh/utils/MyFileUtil.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/utils/MyFileUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/MyFileUtil.java
index 3af0396..7c9f7a7 100644
--- a/app/src/main/java/com/dayu/recharge/utils/MyFileUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/utils/PrinterCallback.java b/app/src/main/java/com/dayu/rechargeqh/utils/PrinterCallback.java
similarity index 81%
rename from app/src/main/java/com/dayu/recharge/utils/PrinterCallback.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/PrinterCallback.java
index 771dd38..1b9f738 100644
--- a/app/src/main/java/com/dayu/recharge/utils/PrinterCallback.java
+++ b/app/src/main/java/com/dayu/rechargeqh/utils/PrinterCallback.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.utils;
+package com.dayu.rechargeqh.utils;
/**
* Created by Administrator on 2017/6/12.
diff --git a/app/src/main/java/com/dayu/recharge/utils/SocketUtil.java b/app/src/main/java/com/dayu/rechargeqh/utils/SocketUtil.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/utils/SocketUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/SocketUtil.java
index fa8adbd..e6ec3a8 100644
--- a/app/src/main/java/com/dayu/recharge/utils/SocketUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/utils/TipUtil.java b/app/src/main/java/com/dayu/rechargeqh/utils/TipUtil.java
similarity index 90%
rename from app/src/main/java/com/dayu/recharge/utils/TipUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/TipUtil.java
index b5daea7..beb3b6e 100644
--- a/app/src/main/java/com/dayu/recharge/utils/TipUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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 {
diff --git a/app/src/main/java/com/dayu/recharge/utils/ToastUtil.java b/app/src/main/java/com/dayu/rechargeqh/utils/ToastUtil.java
similarity index 79%
rename from app/src/main/java/com/dayu/recharge/utils/ToastUtil.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/ToastUtil.java
index 6a9965a..9124cc9 100644
--- a/app/src/main/java/com/dayu/recharge/utils/ToastUtil.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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.
diff --git a/app/src/main/java/com/dayu/recharge/utils/WSHelper.java b/app/src/main/java/com/dayu/rechargeqh/utils/WSHelper.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/utils/WSHelper.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/WSHelper.java
index 0633221..f65b360 100644
--- a/app/src/main/java/com/dayu/recharge/utils/WSHelper.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/utils/WSMD5.java b/app/src/main/java/com/dayu/rechargeqh/utils/WSMD5.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/utils/WSMD5.java
rename to app/src/main/java/com/dayu/rechargeqh/utils/WSMD5.java
index 179c9a5..17fbf69 100644
--- a/app/src/main/java/com/dayu/recharge/utils/WSMD5.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/view/ChooseView.java b/app/src/main/java/com/dayu/rechargeqh/view/ChooseView.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/view/ChooseView.java
rename to app/src/main/java/com/dayu/rechargeqh/view/ChooseView.java
index a53547b..b4dca85 100644
--- a/app/src/main/java/com/dayu/recharge/view/ChooseView.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/view/EdtDialog.java b/app/src/main/java/com/dayu/rechargeqh/view/EdtDialog.java
similarity index 96%
rename from app/src/main/java/com/dayu/recharge/view/EdtDialog.java
rename to app/src/main/java/com/dayu/rechargeqh/view/EdtDialog.java
index d1f040b..9879015 100644
--- a/app/src/main/java/com/dayu/recharge/view/EdtDialog.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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,
diff --git a/app/src/main/java/com/dayu/recharge/view/PassWordDialog.java b/app/src/main/java/com/dayu/rechargeqh/view/PassWordDialog.java
similarity index 92%
rename from app/src/main/java/com/dayu/recharge/view/PassWordDialog.java
rename to app/src/main/java/com/dayu/rechargeqh/view/PassWordDialog.java
index cb564b2..aca66b8 100644
--- a/app/src/main/java/com/dayu/recharge/view/PassWordDialog.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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.
diff --git a/app/src/main/java/com/dayu/recharge/view/ProgressDialog.java b/app/src/main/java/com/dayu/rechargeqh/view/ProgressDialog.java
similarity index 81%
rename from app/src/main/java/com/dayu/recharge/view/ProgressDialog.java
rename to app/src/main/java/com/dayu/rechargeqh/view/ProgressDialog.java
index 70e6aac..14f66ce 100644
--- a/app/src/main/java/com/dayu/recharge/view/ProgressDialog.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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.
diff --git a/app/src/main/java/com/dayu/recharge/view/TipDialog.java b/app/src/main/java/com/dayu/rechargeqh/view/TipDialog.java
similarity index 95%
rename from app/src/main/java/com/dayu/recharge/view/TipDialog.java
rename to app/src/main/java/com/dayu/rechargeqh/view/TipDialog.java
index e1a540d..22a061a 100644
--- a/app/src/main/java/com/dayu/recharge/view/TipDialog.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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.
diff --git a/app/src/main/java/com/dayu/recharge/view/TitleBar.java b/app/src/main/java/com/dayu/rechargeqh/view/TitleBar.java
similarity index 98%
rename from app/src/main/java/com/dayu/recharge/view/TitleBar.java
rename to app/src/main/java/com/dayu/rechargeqh/view/TitleBar.java
index 99e4e71..6c9d480 100644
--- a/app/src/main/java/com/dayu/recharge/view/TitleBar.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
/***
diff --git a/app/src/main/java/com/dayu/recharge/view/datepicker/CustomDatePicker.java b/app/src/main/java/com/dayu/rechargeqh/view/datepicker/CustomDatePicker.java
similarity index 99%
rename from app/src/main/java/com/dayu/recharge/view/datepicker/CustomDatePicker.java
rename to app/src/main/java/com/dayu/rechargeqh/view/datepicker/CustomDatePicker.java
index d908f00..7885856 100644
--- a/app/src/main/java/com/dayu/recharge/view/datepicker/CustomDatePicker.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/view/datepicker/DateFormatUtils.java b/app/src/main/java/com/dayu/rechargeqh/view/datepicker/DateFormatUtils.java
similarity index 97%
rename from app/src/main/java/com/dayu/recharge/view/datepicker/DateFormatUtils.java
rename to app/src/main/java/com/dayu/rechargeqh/view/datepicker/DateFormatUtils.java
index f88848e..172efee 100644
--- a/app/src/main/java/com/dayu/recharge/view/datepicker/DateFormatUtils.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/java/com/dayu/recharge/view/datepicker/PickerView.java b/app/src/main/java/com/dayu/rechargeqh/view/datepicker/PickerView.java
similarity index 99%
rename from app/src/main/java/com/dayu/recharge/view/datepicker/PickerView.java
rename to app/src/main/java/com/dayu/rechargeqh/view/datepicker/PickerView.java
index 33c5659..7f9216d 100644
--- a/app/src/main/java/com/dayu/recharge/view/datepicker/PickerView.java
+++ b/app/src/main/java/com/dayu/rechargeqh/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;
diff --git a/app/src/main/res/layout/activity_admin.xml b/app/src/main/res/layout/activity_admin.xml
index ca72490..96325a4 100644
--- a/app/src/main/res/layout/activity_admin.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_admin_setup.xml b/app/src/main/res/layout/activity_admin_setup.xml
index 44fa307..733e047 100644
--- a/app/src/main/res/layout/activity_admin_setup.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_domain.xml b/app/src/main/res/layout/activity_domain.xml
index 4bead98..31ed5e8 100644
--- a/app/src/main/res/layout/activity_domain.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_electric_meter.xml b/app/src/main/res/layout/activity_electric_meter.xml
index 1bc2afa..8a9973e 100644
--- a/app/src/main/res/layout/activity_electric_meter.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_electric_price.xml b/app/src/main/res/layout/activity_electric_price.xml
index f3d094f..de50f4b 100644
--- a/app/src/main/res/layout/activity_electric_price.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_electricty_price.xml b/app/src/main/res/layout/activity_electricty_price.xml
index c419f7c..12c98d4 100644
--- a/app/src/main/res/layout/activity_electricty_price.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 2200b50..374399c 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_identyfying.xml b/app/src/main/res/layout/activity_identyfying.xml
index e72d9be..c6e91ac 100644
--- a/app/src/main/res/layout/activity_identyfying.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_ip.xml b/app/src/main/res/layout/activity_ip.xml
index 5804427..adfc8b3 100644
--- a/app/src/main/res/layout/activity_ip.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_location.xml b/app/src/main/res/layout/activity_location.xml
index 3ce3da9..8355b6f 100644
--- a/app/src/main/res/layout/activity_location.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0aac148..e9e9a4c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_manage_setup.xml b/app/src/main/res/layout/activity_manage_setup.xml
index c9531c9..1a7c580 100644
--- a/app/src/main/res/layout/activity_manage_setup.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_my.xml b/app/src/main/res/layout/activity_my.xml
index 8e4e698..4ecb60a 100644
--- a/app/src/main/res/layout/activity_my.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_new_card.xml b/app/src/main/res/layout/activity_new_card.xml
index c365bc9..78f7fcb 100644
--- a/app/src/main/res/layout/activity_new_card.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_newcard_list.xml b/app/src/main/res/layout/activity_newcard_list.xml
index 560692e..5ed03cc 100644
--- a/app/src/main/res/layout/activity_newcard_list.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_parameter.xml b/app/src/main/res/layout/activity_parameter.xml
index 30d7690..171c596 100644
--- a/app/src/main/res/layout/activity_parameter.xml
+++ b/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
diff --git a/app/src/main/res/layout/activity_password_card.xml b/app/src/main/res/layout/activity_password_card.xml
index dc0f7e2..8947ecd 100644
--- a/app/src/main/res/layout/activity_password_card.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_patch.xml b/app/src/main/res/layout/activity_patch.xml
index c48d648..0e56666 100644
--- a/app/src/main/res/layout/activity_patch.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_patch_list.xml b/app/src/main/res/layout/activity_patch_list.xml
index 6e6e8fa..9044a42 100644
--- a/app/src/main/res/layout/activity_patch_list.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_power.xml b/app/src/main/res/layout/activity_power.xml
index 5f9f21b..8ff09c5 100644
--- a/app/src/main/res/layout/activity_power.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_psw.xml b/app/src/main/res/layout/activity_psw.xml
index faf8279..e17ee4e 100644
--- a/app/src/main/res/layout/activity_psw.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_recharge.xml b/app/src/main/res/layout/activity_recharge.xml
index d48cb50..3d5f6f0 100644
--- a/app/src/main/res/layout/activity_recharge.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_recharge_detail.xml b/app/src/main/res/layout/activity_recharge_detail.xml
index 3608404..de49bfa 100644
--- a/app/src/main/res/layout/activity_recharge_detail.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_recharge_ext.xml b/app/src/main/res/layout/activity_recharge_ext.xml
index 58ca26d..ce818c4 100644
--- a/app/src/main/res/layout/activity_recharge_ext.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_recharge_list.xml b/app/src/main/res/layout/activity_recharge_list.xml
index 4c0d194..d37b70f 100644
--- a/app/src/main/res/layout/activity_recharge_list.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_red_card.xml b/app/src/main/res/layout/activity_red_card.xml
index 07f0256..cf89980 100644
--- a/app/src/main/res/layout/activity_red_card.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_region.xml b/app/src/main/res/layout/activity_region.xml
new file mode 100644
index 0000000..3c2af80
--- /dev/null
+++ b/app/src/main/res/layout/activity_region.xml
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_replacement.xml b/app/src/main/res/layout/activity_replacement.xml
index 21cd54b..12c9b40 100644
--- a/app/src/main/res/layout/activity_replacement.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_water_meter.xml b/app/src/main/res/layout/activity_water_meter.xml
index bdf9162..b8b541d 100644
--- a/app/src/main/res/layout/activity_water_meter.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_water_num.xml b/app/src/main/res/layout/activity_water_num.xml
index c419f7c..12c98d4 100644
--- a/app/src/main/res/layout/activity_water_num.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_write_text.xml b/app/src/main/res/layout/activity_write_text.xml
index 691da23..646a450 100644
--- a/app/src/main/res/layout/activity_write_text.xml
+++ b/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"
diff --git a/app/src/main/res/layout/dialog_date_picker.xml b/app/src/main/res/layout/dialog_date_picker.xml
index 8643300..a1579d5 100644
--- a/app/src/main/res/layout/dialog_date_picker.xml
+++ b/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"
diff --git a/app/src/main/res/layout/item_replacement.xml b/app/src/main/res/layout/item_replacement.xml
index cea90d1..c81be85 100644
--- a/app/src/main/res/layout/item_replacement.xml
+++ b/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>
--
Gitblit v1.8.0