From 15d9aae9a65c3385aaea29cb6d9810e4a8e8bd27 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 07 五月 2024 11:04:45 +0800
Subject: [PATCH] 1.修复开卡列表显示异常bug 2.实现读卡界面相关功能 3.所有Activity去掉齐河后缀
---
qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml | 4
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PowerActivity.java | 2
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivity.java | 20
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java | 16
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivity.java | 21
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java | 24
henanlibrary/src/main/java/com/dayu/henanlibrary/tools/BaseNFCHelper.java | 2
qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml | 39 +
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/view/ProgressDialog.java | 2
henanlibrary/src/main/java/com/dayu/henanlibrary/tools/NfcReadHelper.java | 5
qihealonelibrary/src/main/res/layout/activity_new_card_qha.xml | 1
app/src/main/java/com/dayu/recharge/activity/LoginActivity.java | 4
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java | 9
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivity.java | 3
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivity.java | 4
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/BaseNFCHelper.java | 2
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/NfcReadHelper.java | 130 ++++++
qihealonelibrary/src/main/res/layout/activity_my_qha.xml | 2
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/DomainActivity.java | 76 ++++
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivity.java | 4
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/NewCardAdapter.java | 1
qihealonelibrary/src/main/AndroidManifest.xml | 38 +-
qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml | 6
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java | 30
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java | 3
qihealonelibrary/src/main/res/layout/qihe_item_new_card.xml | 13
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivity.java | 58 +++
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java | 236 +++++++------
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivity.java | 6
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivity.java | 4
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java | 18
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/UserCardDao.java | 7
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java | 13
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ElectricPriceActivity.java | 2
/dev/null | 76 ----
qihealonelibrary/src/main/res/layout/qihe_item_replacements.xml | 2
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManageSetUpActivity.java | 2
baselibrary/src/main/java/com/dayu/baselibrary/utils/BaseCommon.java | 6
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RegionActivity.java | 2
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java | 88 ++--
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/ReplacementAdapter.java | 6
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivity.java | 12
baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java | 5
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivity.java | 2
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java | 8
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/UserCardBean.java | 10
46 files changed, 650 insertions(+), 374 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
index 3b41b88..a785b32 100644
--- a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
@@ -20,7 +20,7 @@
import com.dayu.henanlibrary.dbBean.PassWordBean;
-import com.dayu.qihealonelibrary.activity.HomeActivityQHAlone;
+import com.dayu.qihealonelibrary.activity.HomeActivity;
import com.dayu.recharge.MyApplication;
import com.dayu.recharge.databinding.ActivityLoginBinding;
import com.hjq.permissions.OnPermissionCallback;
@@ -77,7 +77,7 @@
if (MyApplication.myApplication.libraryType == BaseCommon.HeNanLibrary) {
startActivity(new Intent(LoginActivity.this, com.dayu.henanlibrary.activity.HomeActivity.class));
} else if (MyApplication.myApplication.libraryType == BaseCommon.QHAloneLibrary) {
- startActivity(new Intent(LoginActivity.this, HomeActivityQHAlone.class));
+ startActivity(new Intent(LoginActivity.this, HomeActivity.class));
}
LoginActivity.this.finish();
} else {
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/utils/BaseCommon.java b/baselibrary/src/main/java/com/dayu/baselibrary/utils/BaseCommon.java
index 8350567..8d2eae5 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/utils/BaseCommon.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/utils/BaseCommon.java
@@ -15,5 +15,11 @@
public final static int HeNanLibrary = 0;
public final static int QHAloneLibrary = 1;
+ /**
+ * 褰撳墠鍗″瘑鐮侀敊璇紝涓嶆槸鏈叕鍙稿崱
+ */
+ public final static String CARD_TYPE_ERROR2= "-2";
+
+ public final static String CARD_TYPE_ERROR1="-1";
}
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java b/baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java
index 0d49596..48301b1 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java
@@ -33,6 +33,8 @@
int type;
String data;
+ ConfirmDialog confirmDialog;
+
public LibraryDialog(Activity context, libraryBack libraryBack) {
super(context, com.dayu.baselibrary.R.style.ws_pay_showSelfDialog);
mContext = context;
@@ -68,12 +70,13 @@
okBtn.setOnClickListener(v -> {
if (ischose) {
//浜屾纭
- ConfirmDialog confirmDialog = new ConfirmDialog(mContext, data, new View.OnClickListener() {
+ confirmDialog = new ConfirmDialog(mContext, data, new View.OnClickListener() {
@Override
public void onClick(View v) {
libraryDao.insert(libraryBean);
mLibraryBack.listener(type);
LibraryDialog.this.dismiss();
+ confirmDialog.dismiss();
}
});
confirmDialog.show();
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
index b409ef6..6a1df4c 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
@@ -12,6 +12,7 @@
import com.dayu.baselibrary.tools.BcdUtil;
import com.dayu.baselibrary.utils.AidlUtil;
+import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.CRC8;
import com.dayu.baselibrary.utils.DateUtil;
import com.dayu.baselibrary.utils.MornyUtil;
@@ -253,11 +254,11 @@
) {
binding.textView.setText("璇ュ崱宸茬粡鍐欏叆鐢ㄦ埛淇℃伅锛岃鏇存崲鍗＄墖");
binding.textView.setTextColor(getResources().getColor(com.dayu.baselibrary.R.color.red));
- } else if (cardType.equals("-1")) {
+ } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR1)) {
TipUtil.show(NFCWreatActivity.this, "璇峰嬁绉诲姩鍗＄墖锛岃鍗″け璐ヨ閲嶈瘯锛侊紒");
- } else if (cardType.equals("-2")) {
- TipUtil.show(NFCWreatActivity.this, "璇诲崱澶辫触,璇锋鏌ュ崱鏄惁鏄敤鎴峰崱");
- } else {
+ } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR2)) {
+ TipUtil.show(NFCWreatActivity.this, "锛屽崱鐗囨湭鑳借瘑鍒紝璇锋鏌ュ崱鐗囨槸鍚︽槸鏈叕鍙稿崱鐗�");
+ } else {
Log.i("NFCWreatActivity", "olduserCard!=null saveData");
saveData();
}
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/tools/BaseNFCHelper.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/tools/BaseNFCHelper.java
index 5bb6007..758c73f 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/tools/BaseNFCHelper.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/tools/BaseNFCHelper.java
@@ -38,7 +38,7 @@
static {
- System.loadLibrary("native-lib");
+ System.loadLibrary("henan-native-lib");
}
public native String getSafeKey(Object object);
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/tools/NfcReadHelper.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/tools/NfcReadHelper.java
index 171bd43..cd8c1bd 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/tools/NfcReadHelper.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/tools/NfcReadHelper.java
@@ -8,6 +8,7 @@
import android.util.Log;
import com.dayu.baselibrary.tools.HexUtil;
+import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.henanlibrary.card.UserCard;
import com.dayu.henanlibrary.utils.CardCommon;
@@ -134,10 +135,10 @@
} else {
Log.i("NFCWreatActivity", "isOpen===" + isOpen);
- return "-2";
+ return BaseCommon.CARD_TYPE_ERROR2;
}
} catch (IOException e) {
- return "-1";
+ return BaseCommon.CARD_TYPE_ERROR1;
} finally {
try {
mfc.close();
diff --git a/qihealonelibrary/src/main/AndroidManifest.xml b/qihealonelibrary/src/main/AndroidManifest.xml
index b945f37..b3d9328 100644
--- a/qihealonelibrary/src/main/AndroidManifest.xml
+++ b/qihealonelibrary/src/main/AndroidManifest.xml
@@ -10,18 +10,18 @@
<activity
- android:name="com.dayu.qihealonelibrary.activity.AdminSetupActivityQHAlone"
+ android:name="com.dayu.qihealonelibrary.activity.AdminSetupActivity"
android:exported="true">
</activity>
<activity
- android:name="com.dayu.qihealonelibrary.activity.HomeActivityQHAlone"
+ android:name="com.dayu.qihealonelibrary.activity.HomeActivity"
android:exported="true">
</activity>
<activity
- android:name="com.dayu.qihealonelibrary.activity.NewCardActivityQHAlone"
+ android:name="com.dayu.qihealonelibrary.activity.NewCardActivity"
android:exported="true"
android:launchMode="singleTop"
android:screenOrientation="portrait">
@@ -31,15 +31,15 @@
</intent-filter>
</activity>
<activity
- android:name="com.dayu.qihealonelibrary.activity.SysActivityQHAlone"
+ android:name="com.dayu.qihealonelibrary.activity.SysActivity"
android:exported="true">
</activity>
- <activity android:name="com.dayu.qihealonelibrary.activity.PassWordActivityQHAlone" />
- <activity android:name="com.dayu.qihealonelibrary.activity.MyActivityQHAlone" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.PassWordActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.MyActivity" />
<activity
- android:name="com.dayu.qihealonelibrary.activity.RechargeActivityQHAlone"
+ android:name="com.dayu.qihealonelibrary.activity.RechargeActivity"
android:exported="true"
android:launchMode="singleTop">
<intent-filter>
@@ -59,7 +59,7 @@
</intent-filter>
</activity>
<activity
- android:name="com.dayu.qihealonelibrary.activity.NFCWreatActivityQHAlone"
+ android:name="com.dayu.qihealonelibrary.activity.NFCWreatActivity"
android:exported="true"
android:launchMode="singleTop">
<intent-filter>
@@ -67,17 +67,17 @@
<data android:mimeType="text/plain" />
</intent-filter>
</activity>
- <activity android:name="com.dayu.qihealonelibrary.activity.RechargeListActivityQHAlone" />
- <activity android:name="com.dayu.qihealonelibrary.activity.NewCardListActivityQHAlone" />
- <activity android:name="com.dayu.qihealonelibrary.activity.ParameterActivityQHAlone" />
- <activity android:name="com.dayu.qihealonelibrary.activity.PowerActivityQHAlone" />
- <activity android:name="com.dayu.qihealonelibrary.activity.DomainActivityQHAlone" />
- <activity android:name="com.dayu.qihealonelibrary.activity.ElectricPriceActivityQHAlone" />
- <activity android:name="com.dayu.qihealonelibrary.activity.IdentifyingActivityQHAlone" />
- <activity android:name="com.dayu.qihealonelibrary.activity.ReplacementActivityQHAlone" />
- <activity android:name="com.dayu.qihealonelibrary.activity.RechargeDetail" />
- <activity android:name="com.dayu.qihealonelibrary.activity.PasswordCardActivityQHAlone" />
- <activity android:name="com.dayu.qihealonelibrary.activity.RegionActivityQHAlone" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.RechargeListActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.NewCardListActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.ParameterActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.PowerActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.DomainActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.ElectricPriceActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.IdentifyingActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.ReplacementActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.RechargeDetailActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.PasswordCardActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.RegionActivity" />
</application>
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java
similarity index 74%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java
index 4f4eba1..a257a7d 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java
@@ -15,11 +15,11 @@
* Date: 2023-11-10 19:52
* Description: 绠＄悊鍛樹俊鎭缃�
*/
-public class AdminSetupActivityQHAlone extends BaseActivityQHAlone {
+public class AdminSetupActivity extends BaseActivity {
ActivityAdminSetupQhaBinding adminBinding;
- public static AdminSetupActivityQHAlone adminSetupActivity;
+ public static AdminSetupActivity adminSetupActivity;
AdminDataBean adminData = new AdminDataBean();
@Override
@@ -44,26 +44,26 @@
if (!TextUtils.isEmpty(strAddressCode)
&& !TextUtils.isEmpty(strSerial)) {
- if (Integer.valueOf(adminBinding.adminSerial.getText().toString()) <= 65535) {
- if (Integer.valueOf(adminBinding.adminSerial.getText().toString()) <= 65535) {
+ if (Integer.valueOf(strSerial) <= 65535) {
+ if (Integer.valueOf(strAddressCode) <= 65535) {
adminData.setAddressCode(strAddressCode);
adminData.setSerial(strSerial);
baseDao.adminDao().insert(adminData);
- TipUtil.show(AdminSetupActivityQHAlone.this, "璁剧疆鎴愬姛", new TipUtil.TipListener() {
+ TipUtil.show(AdminSetupActivity.this, "璁剧疆鎴愬姛", new TipUtil.TipListener() {
@Override
public void onCancle() {
- AdminSetupActivityQHAlone.this.finish();
+ AdminSetupActivity.this.finish();
}
});
} else {
- TipUtil.show(AdminSetupActivityQHAlone.this, "杈撳叆鐨勫尯鍩熷彿涓嶈兘瓒呰繃65535");
+ TipUtil.show(AdminSetupActivity.this, "杈撳叆鐨勫尯鍩熷彿涓嶈兘瓒呰繃65535");
}
} else {
- TipUtil.show(AdminSetupActivityQHAlone.this, "杈撳叆鐨勮澶囩紪鍙蜂笉鑳借秴杩�65535");
+ TipUtil.show(AdminSetupActivity.this, "杈撳叆鐨勮澶囩紪鍙蜂笉鑳借秴杩�65535");
}
} else {
- TipUtil.show(AdminSetupActivityQHAlone.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
+ TipUtil.show(AdminSetupActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
}
});
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivity.java
similarity index 96%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivity.java
index f9c4679..576c2c1 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivity.java
@@ -7,7 +7,6 @@
import android.util.Log;
import android.view.View;
-import com.dayu.baselibrary.activity.BaseActivity;
import com.dayu.baselibrary.view.TitleBar;
import com.dayu.qihealonelibrary.R;
import com.dayu.qihealonelibrary.dao.QHAloneAppDatabase;
@@ -18,7 +17,7 @@
* Created by zuoxiao on 2018/12/20.
*/
-public class BaseActivityQHAlone extends BaseActivity {
+public class BaseActivity extends com.dayu.baselibrary.activity.BaseActivity {
private final String TAG = "BaseActivity";
public TitleBar titleBar = null;
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java
similarity index 96%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java
index 4de667f..00a9e59 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java
@@ -18,14 +18,13 @@
* 鍦╫nNewIntent鏂规硶涓墽琛宨ntent浼犻�掕繃鏉ョ殑Tag鏁版嵁
* 灏哊FC鏍囩鍗￠潬杩戞墜鏈哄悗閮紙NFC鏍囩鍗″彲缃戜笂鑷璐拱锛�
*/
-public class BaseNfcActivityQHAlone extends BaseActivityQHAlone {
+public class BaseNfcActivity extends BaseActivity {
protected NfcAdapter mNfcAdapter;
private PendingIntent mPendingIntent;
volatile UserCard userCard;
- Handler handler;
/**
* onCreat->onStart->onResume->onPause->onStop->onDestroy
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/DomainActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/DomainActivity.java
new file mode 100644
index 0000000..2dc8cda
--- /dev/null
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/DomainActivity.java
@@ -0,0 +1,76 @@
+package com.dayu.qihealonelibrary.activity;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.dayu.baselibrary.utils.TipUtil;
+
+import com.dayu.qihealonelibrary.databinding.ActivityDomainQhaBinding;
+import com.dayu.qihealonelibrary.dbBean.DomainBean;
+
+
+/**
+ * Created by Android Studio.
+ * author: zuo
+ * Date: 2023-11-14
+ * Time: 10:19
+ * 澶囨敞锛� 璁剧疆鍗″煙鍚嶅拰ip
+ */
+public class DomainActivity extends BaseActivity {
+ ActivityDomainQhaBinding binding;
+ DomainBean domainBean;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ binding = ActivityDomainQhaBinding.inflate(LayoutInflater.from(this));
+ setContentView(binding.getRoot());
+ initData();
+ binding.electricOk.setOnClickListener(v -> {
+ String domainNumber = binding.domainNumber.getText().toString();
+ String domain = binding.domain.getText().toString();
+ String port = binding.port.getText().toString();
+ int portInt = 0;
+ if (TextUtils.isEmpty(domainNumber)) {
+ TipUtil.show("璇疯緭鍏ユ纭殑鍩熷悕搴忓彿");
+ return;
+ }
+ if (TextUtils.isEmpty(port)) {
+ TipUtil.show("璇疯緭鍏ユ纭殑绔彛鍙�");
+ return;
+ } else {
+ portInt = Integer.valueOf(port);
+ }
+ if (TextUtils.isEmpty(domain)) {
+ TipUtil.show("璇疯緭鍏ュ煙鍚�");
+ return;
+ } else if (portInt <= 0 || portInt > 65535) {
+ TipUtil.show("璇疯緭鍏ユ纭殑绔彛鍙�");
+ return;
+ }
+ domainBean.setDomainNumber(domainNumber);
+ domainBean.setDomain(domain);
+ domainBean.setPort(portInt);
+ baseDao.domainPortDao().insert(domainBean);
+ TipUtil.show("淇濆瓨鎴愬姛");
+ initData();
+ });
+ initData();
+ }
+
+ private void initData() {
+ domainBean = baseDao.domainPortDao().findFirst();
+ if (domainBean != null) {
+ binding.domainOldTV.setText("搴忓彿锛�" + domainBean.getDomainNumber() + "\n" + "鍩熷悕锛�" + domainBean.getDomain() + "\n" + "绔彛鍙凤細" + domainBean.getPort());
+ } else {
+ domainBean = new DomainBean();
+ binding.domainOldTV.setText("璇疯缃柊鐨勫煙鍚嶅崱淇℃伅");
+ }
+
+ }
+}
+
+
+
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/DomainActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/DomainActivityQHAlone.java
deleted file mode 100644
index 6ab41dd..0000000
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/DomainActivityQHAlone.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.dayu.qihealonelibrary.activity;
-
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.dayu.baselibrary.utils.TipUtil;
-
-import com.dayu.qihealonelibrary.databinding.ActivityDomainQhaBinding;
-import com.dayu.qihealonelibrary.dbBean.DomainBean;
-
-
-/**
- * Created by Android Studio.
- * author: zuo
- * Date: 2023-11-14
- * Time: 10:19
- * 澶囨敞锛� 璁剧疆鍗″煙鍚嶅拰ip
- */
-public class DomainActivityQHAlone extends BaseActivityQHAlone {
- ActivityDomainQhaBinding binding;
- DomainBean domainBean;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- binding = ActivityDomainQhaBinding.inflate(LayoutInflater.from(this));
- setContentView(binding.getRoot());
- initData();
- binding.electricOk.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- String domainNumber = binding.domainNumber.getText().toString();
- String domain = binding.domain.getText().toString();
- String port = binding.port.getText().toString();
- int portInt = 0;
- if (TextUtils.isEmpty(domainNumber)) {
- TipUtil.show("璇疯緭鍏ユ纭殑鍩熷悕搴忓彿");
- return;
- }
- if (TextUtils.isEmpty(port)) {
- TipUtil.show("璇疯緭鍏ユ纭殑绔彛鍙�");
- return;
- } else {
- portInt = Integer.valueOf(port);
- }
- if (TextUtils.isEmpty(domain)) {
- TipUtil.show("璇疯緭鍏ュ煙鍚�");
- return;
- } else if (portInt <= 0 || portInt > 65535) {
- TipUtil.show("璇疯緭鍏ユ纭殑绔彛鍙�");
- return;
- }
- domainBean.setDomainNumber(domainNumber);
- domainBean.setDomain(domain);
- domainBean.setPort(portInt);
- baseDao.domainPortDao().insert(domainBean);
- TipUtil.show("淇濆瓨鎴愬姛");
- initData();
- }
- });
- initData();
- }
-
- private void initData() {
- domainBean = baseDao.domainPortDao().findFirst();
- if (domainBean != null) {
- binding.domainOldTV.setText("搴忓彿锛�" + domainBean.getDomainNumber() + "\n" + "鍩熷悕锛�" + domainBean.getDomain() + "\n" + "绔彛鍙凤細" + domainBean.getPort());
- } else {
- domainBean = new DomainBean();
- binding.domainOldTV.setText("璇疯缃柊鐨勫煙鍚嶅崱淇℃伅");
- }
-
- }
-}
-
-
-
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ElectricPriceActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ElectricPriceActivity.java
similarity index 97%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ElectricPriceActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ElectricPriceActivity.java
index 376fd17..6f1eb1c 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ElectricPriceActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ElectricPriceActivity.java
@@ -19,7 +19,7 @@
* Date: 2023-11-10 10:18
* Description: 鐢甸噺鍗曚环璁剧疆
*/
-public class ElectricPriceActivityQHAlone extends BaseActivityQHAlone {
+public class ElectricPriceActivity extends BaseActivity {
ActivityElectricPriceQhaBinding electricPriceBinding;
ElectricPriceBean electricPriceBean;
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
similarity index 74%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
index 745efc4..605ea0a 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
@@ -19,9 +19,9 @@
* Date: 2023-11-6 19:52
* Description: 涓荤晫闈�
*/
-public class HomeActivityQHAlone extends BaseActivityQHAlone {
+public class HomeActivity extends BaseActivity {
- public static HomeActivityQHAlone homeActivity;
+ public static HomeActivity homeActivity;
ActivityHomeQhaBinding homeBinding;
@Override
@@ -44,9 +44,9 @@
public void onClick(View v) {
AdminDataBean adminData = baseDao.adminDao().findFirst();
if (adminData != null) {
- startActivity(new Intent(HomeActivityQHAlone.this, NewCardActivityQHAlone.class));
+ startActivity(new Intent(HomeActivity.this, NewCardActivity.class));
} else {
- TipUtil.show("璇峰厛璁剧疆鍦板潃淇℃伅");
+ TipUtil.show("璇峰厛璁剧疆璁惧缂栧彿鍜屽尯鍩熷彿");
}
}
@@ -56,9 +56,9 @@
public void onClick(View v) {
AdminDataBean adminData = baseDao.adminDao().findFirst();
if (adminData != null) {
- startActivity(new Intent(HomeActivityQHAlone.this, RechargeActivityQHAlone.class));
+ startActivity(new Intent(HomeActivity.this, RechargeActivity.class));
} else {
- TipUtil.show("璇峰厛璁剧疆鍦板潃淇℃伅");
+ TipUtil.show("璇峰厛璁剧疆璁惧缂栧彿鍜屽尯鍩熷彿");
}
}
@@ -66,28 +66,28 @@
homeBinding.homeRedCard.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(HomeActivityQHAlone.this, ReadCardAcitivy.class));
+ startActivity(new Intent(HomeActivity.this, ReadCardAcitivy.class));
}
});
//绠＄悊绯荤粺鐣岄潰
homeBinding.homeAdmin.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(HomeActivityQHAlone.this, SysActivityQHAlone.class));
+ startActivity(new Intent(HomeActivity.this, SysActivity.class));
}
});
//鍙傛暟璁剧疆
homeBinding.homeParameter.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(HomeActivityQHAlone.this, ParameterActivityQHAlone.class));
+ startActivity(new Intent(HomeActivity.this, ParameterActivity.class));
}
});
homeBinding.homeMy.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(HomeActivityQHAlone.this, MyActivityQHAlone.class));
+ startActivity(new Intent(HomeActivity.this, MyActivity.class));
}
});
@@ -107,10 +107,10 @@
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
if ((System.currentTimeMillis() - mExitTime) > 2000) {
- Toast.makeText(HomeActivityQHAlone.this, "鍐嶆寜涓�娆￠��鍑虹▼搴�", Toast.LENGTH_SHORT).show();
+ Toast.makeText(HomeActivity.this, "鍐嶆寜涓�娆￠��鍑虹▼搴�", Toast.LENGTH_SHORT).show();
mExitTime = System.currentTimeMillis();
} else {
- HomeActivityQHAlone.this.finish();
+ HomeActivity.this.finish();
}
return true;
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivity.java
similarity index 96%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivity.java
index 9993883..034d137 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivity.java
@@ -27,7 +27,7 @@
* Time: 10:21
* 澶囨敞锛氬崱鏍囪瘑璁剧疆
*/
-public class IdentifyingActivityQHAlone extends BaseActivityQHAlone {
+public class IdentifyingActivity extends BaseActivity {
ActivityIdentyfyingQhaBinding binding;
@@ -48,7 +48,7 @@
binding.chooseCardType.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- ChooseView.getIntence(IdentifyingActivityQHAlone.this, Arrays.asList(nianfen.clone()), new ChooseView.ChooseCallBack() {
+ ChooseView.getIntence(IdentifyingActivity.this, Arrays.asList(nianfen.clone()), new ChooseView.ChooseCallBack() {
@Override
public void onOptionsSelect(int options1) {
chooseData(nianfen[options1]);
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManageSetUpActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManageSetUpActivity.java
similarity index 81%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManageSetUpActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManageSetUpActivity.java
index 10a89bd..d376aa6 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManageSetUpActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManageSetUpActivity.java
@@ -8,7 +8,7 @@
* Date: 2023-11-08 16:52
* Description:绠＄悊鍗¤缃晫闈�
*/
-public class ManageSetUpActivityQHAlone extends BaseActivityQHAlone {
+public class ManageSetUpActivity extends BaseActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
similarity index 87%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
index 312b576..2184a4f 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
@@ -34,7 +34,7 @@
* Date: 2023-11-10 19:52
* Description: 涓汉涓績
*/
-public class MyActivityQHAlone extends BaseActivityQHAlone {
+public class MyActivity extends BaseActivity {
private CustomDatePicker beginDatePicker;
@@ -60,13 +60,13 @@
myBinding.cardReplacement.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(MyActivityQHAlone.this, ReplacementActivityQHAlone.class));
+ startActivity(new Intent(MyActivity.this, ReplacementActivity.class));
}
});
myBinding.myAdmin.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- PassWordDialog passWordDialog = new PassWordDialog(MyActivityQHAlone.this, new Intent(MyActivityQHAlone.this, AdminSetupActivityQHAlone.class));
+ PassWordDialog passWordDialog = new PassWordDialog(MyActivity.this, new Intent(MyActivity.this, AdminSetupActivity.class));
passWordDialog.show();
// startActivity(new Intent(MyActivity.this, AdminSetupActivity.class));
}
@@ -74,19 +74,19 @@
myBinding.myPsw.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(MyActivityQHAlone.this, PassWordActivityQHAlone.class));
+ startActivity(new Intent(MyActivity.this, PassWordActivity.class));
}
});
myBinding.myRechargeListLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(MyActivityQHAlone.this, RechargeListActivityQHAlone.class));
+ startActivity(new Intent(MyActivity.this, RechargeListActivity.class));
}
});
myBinding.myNewCardListLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(MyActivityQHAlone.this, NewCardListActivityQHAlone.class));
+ startActivity(new Intent(MyActivity.this, NewCardListActivity.class));
}
});
myBinding.myNewCardOut.setOnClickListener(new View.OnClickListener() {
@@ -113,13 +113,13 @@
public boolean handleMessage(@NonNull Message msg) {
switch (msg.what) {
case 1:
- TipUtil.show(MyActivityQHAlone.this, "瀵煎嚭鎴愬姛!");
+ TipUtil.show(MyActivity.this, "瀵煎嚭鎴愬姛!");
break;
case 3:
- TipUtil.show(MyActivityQHAlone.this, "璁板綍涓虹┖!");
+ TipUtil.show(MyActivity.this, "璁板綍涓虹┖!");
break;
default:
- TipUtil.show(MyActivityQHAlone.this, "瀵煎嚭澶辫触!");
+ TipUtil.show(MyActivity.this, "瀵煎嚭澶辫触!");
break;
}
stopAnim();
@@ -159,7 +159,7 @@
String[] title;
String fileName;
if (listData == null || listData.size() == 0) {
- TipUtil.show(MyActivityQHAlone.this, "璁板綍涓虹┖");
+ TipUtil.show(MyActivity.this, "璁板綍涓虹┖");
return;
}
if (isRechargeList) {
@@ -170,7 +170,7 @@
fileName = file.toString() + "/" + ExcelUtil.outUserPathName;
}
ExcelUtil.initExcel(fileName, title);
- ExcelUtil.writeObjListToExcel(listData, fileName, MyActivityQHAlone.this);
+ ExcelUtil.writeObjListToExcel(listData, fileName, MyActivity.this);
handler.sendEmptyMessage(1);
} catch (Exception e) {
handler.sendEmptyMessage(2);
@@ -205,11 +205,11 @@
try {
adminData = baseDao.adminDao().findFirst();
if (adminData != null) {
- myBinding.myAdminName.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
+ myBinding.myAdminName.setText(adminData.getAddressCode());
myBinding.myVillageNum.setText(adminData.getSerial());
} else {
- myBinding.myAdminName.setText("璇风偣鍑诲湴鍧�淇℃伅璁剧疆");
- myBinding.myVillageNum.setText("璇风偣鍑诲湴鍧�淇℃伅璁剧疆");
+ myBinding.myAdminName.setText("璇风偣鍑诲尯鍩熷彿璁剧疆");
+ myBinding.myVillageNum.setText("璇风偣鍑诲尯鍩熷彿璁剧疆");
}
StringBuilder msgData = new StringBuilder();
@@ -259,7 +259,7 @@
public void onTimeSelected(long timestamp) {
endTime = timestamp;
if ((endTime < beginTime) && endTime != beginTime) {
- TipUtil.show(MyActivityQHAlone.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
+ TipUtil.show(MyActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
} else {
try {
endTime = endTime + (1000 * 60 * 60 * 24) - 1;
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
similarity index 85%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
index 2d1e1a1..59d571b 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
@@ -1,6 +1,7 @@
package com.dayu.qihealonelibrary.activity;
import android.content.Intent;
+import android.content.res.Resources;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
@@ -8,6 +9,7 @@
import android.widget.Toast;
import com.dayu.baselibrary.utils.AidlUtil;
+import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.DateUtil;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.qihealonelibrary.QHAloneApplication;
@@ -36,7 +38,7 @@
* Date: 2023-11-08 21:19
* Description: nfc鍐欏崱鐣岄潰
*/
-public class NFCWreatActivityQHAlone extends BaseNfcActivityQHAlone {
+public class NFCWreatActivity extends BaseNfcActivity {
boolean cleanFlag = false;
@@ -77,7 +79,7 @@
//鎵撳嵃
QHAloneApplication baseApp;
- public static NFCWreatActivityQHAlone nfcWreatActivity;
+ public static NFCWreatActivity nfcWreatActivity;
/**
* 鏄惁鏄敤鎴峰崱锛屽亣濡傛槸鐢ㄦ埛鍗＄殑璇濋渶瑕佹娴嬪崱鐗囨槸鍚﹀凡缁忓紑杩囨埛锛屽亣濡傚凡寮�鎴峰垯鎶ラ敊涓嶈兘鍐嶅啓鍗�
*/
@@ -85,9 +87,11 @@
//鏄惁鏄厖鍊艰繃绋�
boolean isRecharge = false;
- //鍏呭�奸�氫俊鏄惁瀹屾垚
- boolean rechargeIsOk = false;
+
ActivityWriteTextQhaBinding binding;
+
+ //褰撳墠鍗＄殑鐗╃悊鍗″彿
+ String cardNumber;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -173,19 +177,33 @@
*/
private void checkHasUser() {
- String cardType = NfcReadHelper.getInstence(intent, this).getCradType();
- Log.i("NFCWreatActivity", "cardType=" + cardType);
- if (cardType.equals(CardCommon.USER_CARD_TYPE_1) ||
- cardType.equals(CardCommon.USER_CARD_TYPE_2) ||
- cardType.equals(CardCommon.USER_CARD_TYPE_3)
- ) {
- binding.textView.setText("璇ュ崱宸茬粡鍐欏叆鐢ㄦ埛淇℃伅锛岃鏇存崲鍗＄墖");
- binding.textView.setTextColor(getResources().getColor(com.dayu.baselibrary.R.color.red));
- } else if (cardType.equals("-1")) {
- TipUtil.show(NFCWreatActivityQHAlone.this, "璇峰嬁绉诲姩鍗＄墖锛岃鍗″け璐ヨ閲嶈瘯锛侊紒");
- } else {
- Log.i("NFCWreatActivity", "olduserCard!=null saveData");
- saveData();
+ try {
+ String cardType = NfcReadHelper.getInstence(intent, this).getCradTypeAndCardNumber();
+
+ String[] cardTypes = cardType.split(",");
+ if (cardTypes != null && cardTypes.length == 2) {
+ cardNumber = cardType.split(",")[0];
+ cardType = cardType.split(",")[1];
+ }
+ Log.i("NFCWreatActivity", "cardType=" + cardType);
+ if (cardType.equals(CardCommon.USER_CARD_TYPE_1) ||
+ cardType.equals(CardCommon.USER_CARD_TYPE_2) ||
+ cardType.equals(CardCommon.USER_CARD_TYPE_3)
+ ) {
+ binding.textView.setText("璇ュ崱宸茬粡鍐欏叆鐢ㄦ埛淇℃伅锛岃鏇存崲鍗＄墖");
+ binding.textView.setTextColor(getResources().getColor(com.dayu.baselibrary.R.color.red));
+ } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR1)) {
+ TipUtil.show(NFCWreatActivity.this, "璇峰嬁绉诲姩鍗＄墖锛岃鍗″け璐ヨ閲嶈瘯锛侊紒");
+ } else if (cardType.equals(BaseCommon.CARD_TYPE_ERROR2)) {
+ TipUtil.show(NFCWreatActivity.this, "鍗＄墖鏈兘璇嗗埆锛岃妫�鏌ュ崱鐗囨槸鍚︽槸鏈叕鍙稿崱鐗�");
+ } else {
+ Log.i("NFCWreatActivity", "olduserCard!=null saveData");
+ userCardBean.setCardNumber(cardNumber);
+ baseDao.userCardDao().insert(userCardBean);
+ saveData();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
}
stopAnim();
@@ -201,7 +219,6 @@
|| configureDeviceRegistrationCrad != null
|| configurationPowerCard != null) {
if (userCard != null && TextUtils.isEmpty(morny)) {
-
userFlag = WriteCardUtils.setUser(intent, userCard, this);
}
if (cleanCard != null) {
@@ -234,9 +251,9 @@
//鐢ㄦ埛鍗�
startDetailActivity(userCardBean.getUserName(), "鍚敤");
} else if (!TextUtils.isEmpty(morny)) {
- TipUtil.show(NFCWreatActivityQHAlone.this, "鍏呭�兼垚鍔�", () -> NFCWreatActivityQHAlone.this.finish());
+ TipUtil.show(NFCWreatActivity.this, "鍏呭�兼垚鍔�", () -> NFCWreatActivity.this.finish());
} else {
- TipUtil.show(NFCWreatActivityQHAlone.this, "鍐欏崱鎴愬姛", () -> NFCWreatActivityQHAlone.this.finish());
+ TipUtil.show(NFCWreatActivity.this, "鍐欏崱鎴愬姛", () -> NFCWreatActivity.this.finish());
}
} catch (Exception e) {
@@ -244,7 +261,7 @@
CrashReport.postCatchedException(e);
}
} else {
- TipUtil.show(NFCWreatActivityQHAlone.this, "鍐欏崱澶辫触");
+ TipUtil.show(NFCWreatActivity.this, "鍐欏崱澶辫触");
}
stopAnim();
} else if (userCard == null && userCardBean != null) {
@@ -268,15 +285,13 @@
startAnim();
Log.i("NFCWreatActivity", "isUser:" + isUser);
if (isUser) {
+ //鏂板崱娉ㄥ唽閫昏緫
checkHasUser();
} else if (isRecharge) {
- if (rechargeIsOk) {
- rechargeWrratCard();
- } else {
- Toast.makeText(this, "姝ｅ湪閫氫俊璇风◢鍚�", Toast.LENGTH_SHORT).show();
- }
-
+ //鍏呭�奸�昏緫
+ rechargeWrratCard();
} else {
+ //鍏朵粬绠＄悊鍗￠�昏緫
saveData();
}
} catch (Exception e) {
@@ -312,7 +327,7 @@
AidlUtil.getInstance().printText(data.toString(), size, true, false);
AidlUtil.getInstance().print3Line();
} catch (Exception e) {
- e.printStackTrace();
+ e.printStackTrace();
}
} catch (Exception e) {
@@ -330,7 +345,6 @@
binding.avi.hide();
// or avi.smoothToHide();
}
-
//寰�鍗″唴鍐欏厖鍊煎悗鐨勬暟鎹�
@@ -434,23 +448,25 @@
private void startDetailActivity(String userName, String statu) {
- Intent detail = new Intent(this, RechargeDetail.class);
+ Intent detail = new Intent(this, RechargeDetailActivity.class);
detail.putExtra("userName", userName);
detail.putExtra("statu", statu);
detail.putExtra("userCard", userCard);
if (!TextUtils.isEmpty(morny)) {
detail.putExtra("morny", morny);
}
+ if (!TextUtils.isEmpty(cardNumber)) {
+ detail.putExtra("cardNumber", cardNumber);
+ }
startActivity(detail);
- if (NewCardActivityQHAlone.newCardActivity != null) {
- NewCardActivityQHAlone.newCardActivity.finish();
+ if (NewCardActivity.newCardActivity != null) {
+ NewCardActivity.newCardActivity.finish();
}
- if (RechargeActivityQHAlone.rechargeActivity != null) {
- RechargeActivityQHAlone.rechargeActivity.finish();
+ if (RechargeActivity.rechargeActivity != null) {
+ RechargeActivity.rechargeActivity.finish();
}
- NFCWreatActivityQHAlone.nfcWreatActivity.finish();
+ NFCWreatActivity.nfcWreatActivity.finish();
}
-
protected void onDestroy() {
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivity.java
similarity index 92%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivity.java
index d0ecd29..9627cb6 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivity.java
@@ -38,7 +38,7 @@
* Date: 2023-11-10 19:52
* Description: 鏂板崱娉ㄥ唽
*/
-public class NewCardActivityQHAlone extends BaseActivityQHAlone {
+public class NewCardActivity extends BaseActivity {
public static final int SCAN_IDCARD_REQUEST = 1;
UserCardBean userCardBean;
@@ -46,7 +46,7 @@
ActivityNewCardQhaBinding newCardBinding;
AdminDataBean adminData;
- static NewCardActivityQHAlone newCardActivity;
+ static NewCardActivity newCardActivity;
private int defValueMainId = 2;
private int defValueSubId = 0;
@@ -84,11 +84,11 @@
&& !TextUtils.isEmpty(phone) && !TextUtils.isEmpty(userID)
) {
if (userName.length() <= 1 || !validateName(userName)) {
- TipUtil.show(NewCardActivityQHAlone.this, "璇疯緭鍏ユ纭鍚�");
+ TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭鍚�");
} else if (phone.length() < 11 || !isValidPhoneNumber(phone)) {
- TipUtil.show(NewCardActivityQHAlone.this, "璇疯緭鍏ユ纭墜鏈哄彿");
+ TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭墜鏈哄彿");
} else if (!Utils.check(userID)) {
- TipUtil.show(NewCardActivityQHAlone.this, "璇疯緭鍏ユ纭韩浠借瘉鍙�");
+ TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭韩浠借瘉鍙�");
} else {
userCardBean = new UserCardBean();
userCardBean.setUserName(userName);
@@ -96,10 +96,11 @@
userCardBean.setSerial(adminData.getSerial());
userCardBean.setPhone(phone);
userCardBean.setUserID(userID);
- baseDao.userCardDao().insert(userCardBean);
+
+
UserCard userCard = new UserCard();
- userCard.setArerNumber(Short.valueOf(adminData.getSerial()));
- userCard.setDeviceNumberl(Short.valueOf(adminData.getAddressCode()));
+ userCard.setArerNumber(Integer.valueOf(adminData.getSerial()));
+ userCard.setDeviceNumberl(Integer.valueOf(adminData.getAddressCode()));
userCard.setRechargeTimes((byte) 0);
userCard.setTotalWater(0);
userCard.setTotalElectric(0);
@@ -107,14 +108,14 @@
userCard.setSurplusWater(0);
userCard.setRechargeDate(Calendar.getInstance());
- Intent intent = new Intent(NewCardActivityQHAlone.this, NFCWreatActivityQHAlone.class);
+ Intent intent = new Intent(NewCardActivity.this, NFCWreatActivity.class);
intent.putExtra("userCard", userCard);
intent.putExtra("dbUserCard", userCardBean);
startActivity(intent);
}
} else {
- TipUtil.show(NewCardActivityQHAlone.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
+ TipUtil.show(NewCardActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
}
});
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivity.java
similarity index 97%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivity.java
index 6724634..c13fa90 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivity.java
@@ -32,7 +32,7 @@
* Description: 鏂板崱娉ㄥ唽鍒楄〃鐣岄潰
*/
-public class NewCardListActivityQHAlone extends BaseActivityQHAlone {
+public class NewCardListActivity extends BaseActivity {
ActivityNewcardListQhaBinding newcardListBinding;
@@ -152,7 +152,7 @@
public void onTimeSelected(long timestamp) {
endTime = timestamp;
if ((endTime < beginTime) && endTime != beginTime) {
- TipUtil.show(NewCardListActivityQHAlone.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
+ TipUtil.show(NewCardListActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
} else {
// try {
// endTime = endTime + (1000 * 60 * 60 * 24) - 1;
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivity.java
new file mode 100644
index 0000000..4949def
--- /dev/null
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivity.java
@@ -0,0 +1,58 @@
+package com.dayu.qihealonelibrary.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.dayu.qihealonelibrary.databinding.ActivityParameterQhaBinding;
+
+/**
+ * Copyright (C), 2023,
+ * Author: zuo
+ * Date: 2023-11-06 11:47
+ * Description: 鍙傛暟璁剧疆鐣岄潰
+ */
+public class ParameterActivity extends BaseActivity {
+ ActivityParameterQhaBinding binding;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ binding = ActivityParameterQhaBinding.inflate(LayoutInflater.from(this));
+ setContentView(binding.getRoot());
+ initView();
+ }
+
+ private void initView() {
+ //璁剧疆鍩熷悕鍗�
+ binding.parameterDomain.setOnClickListener(v -> {
+ Intent intent = new Intent(ParameterActivity.this, DomainActivity.class);
+ startActivity(intent);
+ });
+// 姘存车鍔熺巼璁剧疆
+ binding.parameterPower.setOnClickListener(v -> {
+ Intent intent = new Intent(ParameterActivity.this, PowerActivity.class);
+ startActivity(intent);
+ });
+ //鐢甸噺鍗曚环璁剧疆
+ binding.parameterElectricPrice.setOnClickListener(v -> {
+ Intent intent = new Intent(ParameterActivity.this, ElectricPriceActivity.class);
+ startActivity(intent);
+ });
+ //鍗℃爣璇嗚缃�
+ binding.parameterCardIdentifying.setOnClickListener(v -> {
+ Intent intent = new Intent(ParameterActivity.this, IdentifyingActivity.class);
+ startActivity(intent);
+ });
+ //瀵嗙爜鍗¤缃瘑鐮�
+ binding.parameterPassWordCard.setOnClickListener(v -> {
+ Intent intent = new Intent(ParameterActivity.this, PasswordCardActivity.class);
+ startActivity(intent);
+ });
+ binding.parameterRegion.setOnClickListener(v -> {
+ Intent intent = new Intent(ParameterActivity.this, RegionActivity.class);
+ startActivity(intent);
+ });
+ }
+}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivityQHAlone.java
deleted file mode 100644
index 4889c8f..0000000
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivityQHAlone.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.dayu.qihealonelibrary.activity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.dayu.qihealonelibrary.databinding.ActivityParameterQhaBinding;
-
-/**
- * Copyright (C), 2023,
- * Author: zuo
- * Date: 2023-11-06 11:47
- * Description: 鍙傛暟璁剧疆鐣岄潰
- */
-public class ParameterActivityQHAlone extends BaseActivityQHAlone {
- ActivityParameterQhaBinding binding;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- binding = ActivityParameterQhaBinding.inflate(LayoutInflater.from(this));
- setContentView(binding.getRoot());
- initView();
- }
-
- private void initView() {
- //璁剧疆鍩熷悕鍗�
- binding.parameterDomain.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(ParameterActivityQHAlone.this, DomainActivityQHAlone.class);
- startActivity(intent);
- }
- });
-// 姘存车鍔熺巼璁剧疆
- binding.parameterPower.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(ParameterActivityQHAlone.this, PowerActivityQHAlone.class);
- startActivity(intent);
- }
- });
- //鐢甸噺鍗曚环璁剧疆
- binding.parameterElectricPrice.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(ParameterActivityQHAlone.this, ElectricPriceActivityQHAlone.class);
- startActivity(intent);
- }
- });
- //鍗℃爣璇嗚缃�
- binding.parameterCardIdentifying.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(ParameterActivityQHAlone.this, IdentifyingActivityQHAlone.class);
- startActivity(intent);
- }
- });
- //瀵嗙爜鍗¤缃瘑鐮�
- binding.parameterPassWordCard.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(ParameterActivityQHAlone.this, PasswordCardActivityQHAlone.class);
- startActivity(intent);
- }
- });
- binding.parameterRegion.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(ParameterActivityQHAlone.this, RegionActivityQHAlone.class);
- startActivity(intent);
- }
- });
- }
-}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivity.java
similarity index 81%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivity.java
index 22f3222..cbce68f 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivity.java
@@ -17,7 +17,7 @@
* Date: 2023-11-10 19:52
* Description: 淇敼瀵嗙爜鐣岄潰
*/
-public class PassWordActivityQHAlone extends BaseActivityQHAlone {
+public class PassWordActivity extends BaseActivity {
ActivityPswQhaBinding pswBinding;
@@ -44,18 +44,18 @@
if (pswBinding.pswNew.getText().toString().equals(pswBinding.pswNewAgin.getText().toString())) {
passWordBean.setPassWord(pswBinding.pswNewAgin.getText().toString());
baseDao.loginPsDao().insert(passWordBean);
- TipUtil.show(PassWordActivityQHAlone.this, "瀵嗙爜淇敼瀹屾垚", () -> {
- PassWordActivityQHAlone.this.finish();
+ TipUtil.show(PassWordActivity.this, "瀵嗙爜淇敼瀹屾垚", () -> {
+ PassWordActivity.this.finish();
});
} else {
- TipUtil.show(PassWordActivityQHAlone.this, "涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�");
+ TipUtil.show(PassWordActivity.this, "涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�");
}
} else {
- TipUtil.show(PassWordActivityQHAlone.this, "鏃у瘑鐮佽緭鍏ラ敊璇�");
+ TipUtil.show(PassWordActivity.this, "鏃у瘑鐮佽緭鍏ラ敊璇�");
}
} else {
- TipUtil.show(PassWordActivityQHAlone.this, "璇疯緭瀹屽唴瀹�");
+ TipUtil.show(PassWordActivity.this, "璇疯緭瀹屽唴瀹�");
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivity.java
similarity index 96%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivity.java
index 3200c77..19d776c 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivity.java
@@ -15,7 +15,7 @@
* Time: 16:21
* 澶囨敞锛氬瘑鐮佸崱璁剧疆鐣岄潰
*/
-public class PasswordCardActivityQHAlone extends BaseActivityQHAlone {
+public class PasswordCardActivity extends BaseActivity {
ActivityPasswordCardQhaBinding binding;
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PowerActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PowerActivity.java
similarity index 96%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PowerActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PowerActivity.java
index 73d071e..090af4c 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PowerActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PowerActivity.java
@@ -15,7 +15,7 @@
* Date: 2023-11-08 21:19
* Description: 鍔熺巼璁剧疆
*/
-public class PowerActivityQHAlone extends BaseActivityQHAlone {
+public class PowerActivity extends BaseActivity {
ActivityPowerQhaBinding powerBinding;
PowerBean powerBean = new PowerBean();
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
index bc359e9..dfe6a06 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
@@ -3,6 +3,7 @@
import android.content.Intent;
import android.nfc.NfcAdapter;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -16,6 +17,7 @@
import com.dayu.qihealonelibrary.card.RegionCard;
import com.dayu.qihealonelibrary.card.UserCard;
import com.dayu.qihealonelibrary.databinding.ActivityRedCardQhaBinding;
+import com.dayu.qihealonelibrary.dbBean.UserCardBean;
import com.dayu.qihealonelibrary.tools.NfcReadHelper;
import com.dayu.qihealonelibrary.utils.CardCommon;
import com.dayu.qihealonelibrary.view.ProgressDialog;
@@ -29,7 +31,7 @@
* Date: 2023-11-10 19:52
* Description: 璇诲崱鐣岄潰
*/
-public class ReadCardAcitivy extends BaseNfcActivityQHAlone {
+public class ReadCardAcitivy extends BaseNfcActivity {
volatile UserCard userCard;
ActivityRedCardQhaBinding redCardBinding;
@@ -45,13 +47,11 @@
}
- private void setUserData(String userName, int blance, String statu) {
+ private void setUserData(String userName, String statu, String cardNumber) {
viweGone(true);
redCardBinding.redName.setText("鐢ㄦ埛濮撳悕锛�" + userName);
- redCardBinding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(blance) + "鍏�");
redCardBinding.redStatu.setText("鍗＄姸鎬侊細" + statu);
if (userCard != null) {
-
Calendar calendar = userCard.getRechargeDate();
if (calendar != null) {
int year = calendar.get(Calendar.YEAR);
@@ -60,12 +60,16 @@
int hour = calendar.get(Calendar.HOUR_OF_DAY);
int minute = calendar.get(Calendar.MINUTE);
int second = calendar.get(Calendar.SECOND);
- redCardBinding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細" + year + month + day + " " + hour + ":" + minute + ":" + second);
+ redCardBinding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細" + year + "骞�" + month + "鏈�" + day + "鏃�");
} else {
redCardBinding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細鏃�");
}
-
+ redCardBinding.redInitCode.setText(cardNumber);
redCardBinding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + "");
+ redCardBinding.redTotalWater.setText("鎬荤敤姘撮噺锛�" + userCard.getTotalWater());
+ redCardBinding.redTotalPower.setText("鎬荤敤鐢甸噺锛�" + userCard.getTotalElectric());
+ redCardBinding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(userCard.getBalance()) + "鍏�");
+ redCardBinding.redRemainderWater.setText("鍓╀綑姘撮噺锛�" + userCard.getSurplusWater());
}
}
@@ -85,115 +89,131 @@
*/
public void readAllData(Intent intent) {
- NfcReadHelper.getInstence(intent, this)
- .getOneSectorData(new NfcReadHelper.NFCCallListback() {
- @Override
- public void callBack(List<byte[]> data) {
- //鑾峰彇1鎵囧尯鏁版嵁
- if (data != null && data.size() > 0) {
- byte cardType = data.get(0)[0];
- String cardTypeStr = HexUtil.byteToHex(cardType);
- switch (cardTypeStr) {
- case CardCommon.USER_CARD_TYPE_1:
- case CardCommon.USER_CARD_TYPE_2:
- case CardCommon.USER_CARD_TYPE_3:
- userCard = UserCard.getBean(data);
- break;
- case CardCommon.MANAGE_CRAD:
- viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱");
- stopAnim();
- break;
- case CardCommon.CLEAN_CARD_TYPE:
- viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓烘竻闆跺崱");
- stopAnim();
- break;
- case CardCommon.REGISTERED_CARD_TYPE:
- viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓洪噸鏂版敞鍐岃澶囧崱");
- stopAnim();
- break;
- case CardCommon.CLEAN_ALL_USER_CARD_TYPE:
- viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓哄垹闄ゅ叏閮ㄧ敤鎴峰崱");
- stopAnim();
- break;
- case CardCommon.DOMAIN_CARD_TYPE:
- 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;
- case CardCommon.TEST_CARD_TYPE:
- viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓烘祴璇曞崱");
- stopAnim();
- break;
- case CardCommon.CONFIGURATION_CARD_TYPE:
- viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓洪厤缃澶囨敞鍐屼俊鎭崱");
- stopAnim();
- break;
- case CardCommon.CONFIGURATION_POWER_CARD_TYPE:
- viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠閰嶇疆姘存车鍔熺巼鍗�");
- ConfigurationPowerCard powerCard = ConfigurationPowerCard.toBean(data.get(0));
- redCardBinding.readCardDataTV.setText(powerCard.getPower());
- stopAnim();
- break;
- case CardCommon.BLACK:
- viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓洪粦鍗�");
- BlackCard blackCard = BlackCard.getBean(data);
- redCardBinding.readCardDataTV.setText("褰撳墠榛戝崱鐢ㄦ埛鍙蜂负锛�" + blackCard.getBlackCard());
- break;
- case CardCommon.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 CardCommon.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();
- break;
- }
+ String cardType = NfcReadHelper.getInstence(intent, this).getCradTypeAndCardNumber();
+ String cardNumber = null;
+ String[] cardTypes = cardType.split(",");
+ if (cardTypes != null && cardTypes.length == 2) {
+ cardNumber = cardType.split(",")[0];
+ cardType = cardType.split(",")[1];
+ }
+ List<byte[]> data = NfcReadHelper.getInstence(intent, this).getOnesectorData();
+ switch (cardType) {
+ case CardCommon.USER_CARD_TYPE_1:
+ case CardCommon.USER_CARD_TYPE_2:
+ case CardCommon.USER_CARD_TYPE_3:
+ if (!data.isEmpty()) {
+ if (!TextUtils.isEmpty(cardNumber)) {
+ userCard = UserCard.getBean(data);
+ List<UserCardBean> userCardBeans = baseDao.userCardDao().findUserName(cardNumber);
+ if (userCardBeans != null && !userCardBeans.isEmpty()) {
+ UserCardBean userName = userCardBeans.get(0);
+ setUserData(userName.getUserName(), "鍚敤", cardNumber);
} else {
- TipUtil.show(ReadCardAcitivy.this, "鍗＄墖鏃犳硶璇嗗埆");
- stopAnim();
+ setUserData("鏈煡璇㈠埌鐢ㄦ埛鍚�", "鍚敤", cardNumber);
}
+ } else {
}
+ } else {
+ TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
+ }
- @Override
- public void error(int code) {
- switch (code) {
- case CardCommon.ERROR_MOVE:
- stopAnim();
- TipUtil.show("杩炴帴涓柇锛岃閲嶆柊璐村悎鍗＄墖");
- break;
- default:
- stopAnim();
- TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
- }
- }
- });
+ stopAnim();
+ break;
+ case CardCommon.MANAGE_CRAD:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱");
+ stopAnim();
+ break;
+ case CardCommon.CLEAN_CARD_TYPE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓烘竻闆跺崱");
+ stopAnim();
+ break;
+ case CardCommon.REGISTERED_CARD_TYPE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓洪噸鏂版敞鍐岃澶囧崱");
+ stopAnim();
+ break;
+ case CardCommon.CLEAN_ALL_USER_CARD_TYPE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓哄垹闄ゅ叏閮ㄧ敤鎴峰崱");
+ stopAnim();
+ break;
+ case CardCommon.DOMAIN_CARD_TYPE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓鸿缃煙鍚嶅崱");
+ if (!data.isEmpty()) {
+ DomainCard domainCard = DomainCard.toBean(data);
+ assert domainCard != null;
+ redCardBinding.readCardDataTV.setText("搴忓彿锛�" + domainCard.getDomainNumber() + "\n" + "鍩熷悕锛�" + domainCard.getDomainName() + "\n" + "绔彛鍙凤細" + domainCard.getPort());
+ } else {
+ TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
+ }
+ stopAnim();
+ break;
+ case CardCommon.TEST_CARD_TYPE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓烘祴璇曞崱");
+ stopAnim();
+ break;
+ case CardCommon.CONFIGURATION_CARD_TYPE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓洪厤缃澶囨敞鍐屼俊鎭崱");
+ stopAnim();
+ break;
+ case CardCommon.CONFIGURATION_POWER_CARD_TYPE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠閰嶇疆姘存车鍔熺巼鍗�");
+ if (!data.isEmpty()) {
+ ConfigurationPowerCard powerCard = ConfigurationPowerCard.toBean(data.get(0));
+ redCardBinding.readCardDataTV.setText(powerCard.getPower());
+ } else {
+ TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
+ }
+ stopAnim();
+ break;
+ case CardCommon.BLACK:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓洪粦鍗�");
+ BlackCard blackCard = BlackCard.getBean(data);
+ redCardBinding.readCardDataTV.setText("褰撳墠榛戝崱鐢ㄦ埛鍙蜂负锛�" + blackCard.getBlackCard());
+ break;
+ case CardCommon.REGION:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓哄尯鍩熻〃鍙峰崱");
+ if (!data.isEmpty()) {
+ 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());
+ } else {
+ TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
+ }
+
+ break;
+ case CardCommon.ELECTRIC_PRICE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓虹數閲忓崟浠峰崱");
+ if (!data.isEmpty()) {
+ ElectricPriceCard electricPriceCard = ElectricPriceCard.getBean(data);
+ StringBuilder electricPriceBuilder = new StringBuilder();
+ electricPriceBuilder.append("鐢甸噺鍗曚环锛�").append(electricPriceCard.getElectricPrice()).append("\n");
+ redCardBinding.readCardDataTV.setText(electricPriceBuilder.toString());
+ } else {
+ TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
+ }
+ break;
+ default:
+ TipUtil.show(ReadCardAcitivy.this, "鍗＄墖鏃犳硶璇嗗埆");
+ stopAnim();
+ break;
+ }
+
+
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
similarity index 88%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
index ec99ab7..d8e842f 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
@@ -23,13 +23,12 @@
* Date: 2023-11-5 09:52
* Description: 鍏呭�肩晫闈�
*/
-public class RechargeActivityQHAlone extends BaseNfcActivityQHAlone {
+public class RechargeActivity extends BaseNfcActivity {
Intent intent;
- boolean userFlag;
ActivityRechargeQhaBinding binding;
- public static RechargeActivityQHAlone rechargeActivity;
+ public static RechargeActivity rechargeActivity;
AdminDataBean adminData;
String userName;
@@ -58,7 +57,7 @@
ProgressDialog.show(this);
// selectBalance(userCard.getInitPeasantCode());
} else {
- TipUtil.show(RechargeActivityQHAlone.this, "鍗＄墖璇诲彇澶辫触");
+ TipUtil.show(RechargeActivity.this, "鍗＄墖璇诲彇澶辫触");
}
// readAllData(intent);
@@ -81,16 +80,16 @@
if (!TextUtils.isEmpty(morny)) {
String initCode = DeviceNumberUtils.getDeviceNumber();
if (TextUtils.isEmpty(initCode)) {
- TipUtil.show(RechargeActivityQHAlone.this, "璁惧娉ㄥ唽鍙蜂负绌猴紝璇峰厛璁剧疆IP鍜岀鐞嗗憳鍦板潃");
+ TipUtil.show(RechargeActivity.this, "璁惧娉ㄥ唽鍙蜂负绌猴紝璇峰厛璁剧疆IP鍜岀鐞嗗憳鍦板潃");
return;
}
- Intent intent = new Intent(RechargeActivityQHAlone.this, NFCWreatActivityQHAlone.class);
+ Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
intent.putExtra("morny", morny);
intent.putExtra("userName", userName);
intent.putExtra("userCard", userCard);
startActivity(intent);
} else {
- TipUtil.show(RechargeActivityQHAlone.this, "璇疯緭鍏ュ厖鍊奸噾棰濓紙鍏冿級");
+ TipUtil.show(RechargeActivity.this, "璇疯緭鍏ュ厖鍊奸噾棰濓紙鍏冿級");
}
});
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetail.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java
similarity index 90%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetail.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java
index e0c3f3e..b505371 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetail.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java
@@ -18,13 +18,14 @@
* Time: 15:01
* 澶囨敞锛氬啓鍗″悗鐨勮鎯呴〉
*/
-public class RechargeDetail extends BaseActivityQHAlone {
+public class RechargeDetailActivity extends BaseActivity {
ActivityRechargeDetailQhaBinding binding;
UserCard userCard;
String statu;
String userName;
String morny;
+ String cardNumber;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -39,6 +40,9 @@
userName = getIntent().getStringExtra("userName");
if (getIntent().hasExtra("morny")) {
morny = getIntent().getStringExtra("morny");
+ }
+ if (getIntent().hasExtra("cardNumber")) {
+ cardNumber = getIntent().getStringExtra("cardNumber");
}
setUserData(userName, statu);
} catch (Exception e) {
@@ -62,7 +66,7 @@
binding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(balance) + " 鍏�");
binding.redStatu.setText("鍗＄姸鎬侊細" + statu);
if (userCard != null) {
-// binding.redInitCode.setText("鐢ㄦ埛娉ㄥ唽缂栧彿锛�" + userCard.getInitPeasantCode());
+ binding.redInitCode.setText("褰撳墠鍗″彿锛�" + cardNumber);
Calendar calendar = userCard.getRechargeDate();
if (calendar != null) {
int year = calendar.get(Calendar.YEAR);
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivity.java
similarity index 97%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivity.java
index dacaf43..5159f8f 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivity.java
@@ -33,7 +33,7 @@
* Date: 2023-11-5 09:52
* Description: 鍏呭�艰褰�
*/
-public class RechargeListActivityQHAlone extends BaseActivityQHAlone {
+public class RechargeListActivity extends BaseActivity {
ActivityRechargeListQhaBinding rechargeListBinding;
RechargeAdapter adapter;
@@ -163,7 +163,7 @@
public void onTimeSelected(long timestamp) {
endTime = timestamp;
if ((endTime < beginTime) && endTime != beginTime) {
- TipUtil.show(RechargeListActivityQHAlone.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
+ TipUtil.show(RechargeListActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
} else {
endTime = endTime + (1000 * 60 * 60 * 24) - 1;
rechargeList.clear();
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RegionActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RegionActivity.java
similarity index 96%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RegionActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RegionActivity.java
index 7060126..394f560 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RegionActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RegionActivity.java
@@ -16,7 +16,7 @@
* Time: 17:28
* 澶囨敞锛氬尯鍩熸爣鍙峰崱璁剧疆鐣岄潰
*/
-public class RegionActivityQHAlone extends BaseActivityQHAlone {
+public class RegionActivity extends BaseActivity {
ActivityRegionQhaBinding binding;
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivity.java
similarity index 94%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivity.java
index 857df52..e916f27 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivity.java
@@ -32,7 +32,7 @@
* Time: 17:32
* 澶囨敞锛� 琛ュ崱鐣岄潰
*/
-public class ReplacementActivityQHAlone extends BaseActivityQHAlone {
+public class ReplacementActivity extends BaseActivity {
ActivityReplacementQhaBinding newcardListBinding;
List<UserCardBean> userCardBeanList = new ArrayList<>();
ReplacementAdapter adapter;
@@ -57,7 +57,7 @@
public void itemClick(View view) {
UserCardBean userCardBean = userCardBeanList.get((int) view.getTag());
- Intent intent = new Intent(ReplacementActivityQHAlone.this, NFCWreatActivityQHAlone.class);
+ Intent intent = new Intent(ReplacementActivity.this, NFCWreatActivity.class);
intent.putExtra("dbUserCard", userCardBean);
startActivity(intent);
}
@@ -123,7 +123,7 @@
titleBar.setOnItemclickListner(ClickType_RIGHT_TEXT, new View.OnClickListener() {
@Override
public void onClick(View v) {
- edtDialog = new EdtDialog(ReplacementActivityQHAlone.this, new EdtDialog.DialogBack() {
+ edtDialog = new EdtDialog(ReplacementActivity.this, new EdtDialog.DialogBack() {
@Override
public void onOk(String data) {
List<UserCardBean> beans = baseDao.userCardDao().findByData(data);
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivity.java
similarity index 86%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivity.java
index e1a1a4b..26f3ce8 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivity.java
@@ -27,7 +27,7 @@
* Date: 2023-11-5 09:52
* Description: 绠＄悊绯荤粺
*/
-public class SysActivityQHAlone extends BaseActivityQHAlone {
+public class SysActivity extends BaseActivity {
ActivityAdminQhaBinding adminBinding;
@@ -47,7 +47,7 @@
adminBinding.adminAdmin.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
+ Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
ManageCard manageCard = new ManageCard();
intent.putExtra("manageCard", manageCard);
startActivity(intent);
@@ -57,7 +57,7 @@
adminBinding.adminCleanZero.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
+ Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
CleanCard cleanCard = new CleanCard();
intent.putExtra("cleanCard", cleanCard);
startActivity(intent);
@@ -66,7 +66,7 @@
adminBinding.adminRegistered.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
+ Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
RegisteredCard registeredCard = new RegisteredCard();
intent.putExtra("registeredCard", registeredCard);
startActivity(intent);
@@ -76,7 +76,7 @@
adminBinding.adminCleanUser.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
+ Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
CleanUserCard cleanUserCard = new CleanUserCard();
intent.putExtra("cleanUserCard", cleanUserCard);
startActivity(intent);
@@ -86,7 +86,7 @@
adminBinding.adminDomain.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
+ Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
DomainBean domainBean = baseDao.domainPortDao().findFirst();
DomainCard domainCard = new DomainCard();
if (domainBean != null) {
@@ -107,7 +107,7 @@
adminBinding.adminTest.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
+ Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
TestCard testCard = new TestCard();
intent.putExtra("testCard", testCard);
startActivity(intent);
@@ -118,7 +118,7 @@
adminBinding.adminConfigDeviceRegistration.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
+ Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
ConfigureDeviceRegistrationCrad configureDeviceRegistrationCrad = new ConfigureDeviceRegistrationCrad();
intent.putExtra("configureDeviceRegistrationCrad", configureDeviceRegistrationCrad);
startActivity(intent);
@@ -131,7 +131,7 @@
public void onClick(View v) {
PowerBean powerBean = baseDao.powerDao().findFirst();
if (powerBean != null) {
- Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
+ Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
ConfigurationPowerCard configurationPowerCard = new ConfigurationPowerCard();
configurationPowerCard.setPower(powerBean.getPower());
intent.putExtra("configurationPowerCard", configurationPowerCard);
@@ -149,7 +149,7 @@
public void onClick(View v) {
PassWordCardBean powerBean = baseDao.passWordCardDao().findFirst();
if (powerBean != null) {
- Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
+ Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
PassWordCard passWordCard = new PassWordCard();
passWordCard.setPassWord(powerBean.getPassWord());
intent.putExtra("passWordCard", passWordCard);
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/NewCardAdapter.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/NewCardAdapter.java
index 8d70754..7beb1cf 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/NewCardAdapter.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/NewCardAdapter.java
@@ -51,6 +51,7 @@
if (holder instanceof ViewHolder) {
if (rechargeList.size() > 0) {
((ViewHolder) holder).getBinding().userName.setText("鐢ㄦ埛鍚�:" + rechargeList.get(position).getUserName());
+ ((ViewHolder) holder).getBinding().cardNumber.setText("鍗″彿:" + rechargeList.get(position).getCardNumber());
((ViewHolder) holder).getBinding().userNo.setText("韬唤璇佸彿:" + rechargeList.get(position).getUserID());
((ViewHolder) holder).getBinding().water.setText("鐢佃瘽:" + rechargeList.get(position).getPhone());
((ViewHolder) holder).getBinding().date.setText("鏃ユ湡:" + DateUtil.dateToStamp(rechargeList.get(position).getDate(), DateUtil.type1));
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/ReplacementAdapter.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/ReplacementAdapter.java
index 0f84284..9006aa7 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/ReplacementAdapter.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/ReplacementAdapter.java
@@ -11,7 +11,7 @@
import com.dayu.baselibrary.databinding.ItemNoMoreBinding;
import com.dayu.baselibrary.utils.DateUtil;
import com.dayu.qihealonelibrary.R;
-import com.dayu.qihealonelibrary.activity.ReplacementActivityQHAlone;
+import com.dayu.qihealonelibrary.activity.ReplacementActivity;
import com.dayu.qihealonelibrary.databinding.QiheItemReplacementsBinding;
import com.dayu.qihealonelibrary.dbBean.UserCardBean;
@@ -20,9 +20,9 @@
public class ReplacementAdapter extends BaseRecyclerAdapter<RecyclerView.ViewHolder> {
List<UserCardBean> rechargeList;
- ReplacementActivityQHAlone mContext;
+ ReplacementActivity mContext;
- public ReplacementAdapter(ReplacementActivityQHAlone context, List<UserCardBean> rechargeList) {
+ public ReplacementAdapter(ReplacementActivity context, List<UserCardBean> rechargeList) {
mContext = context;
this.rechargeList = rechargeList;
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java
index d9bee63..ce0fc24 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java
@@ -17,9 +17,9 @@
public class UserCard implements Serializable {
public String cardType = CardCommon.USER_CARD_TYPE_1;//鍐欏崱鏍囧織 A1鍒峰崱寮�娉靛墠 A8鍒峰崱寮�娉靛悗 A2鍙犲姞鍏呭��
- public short arerNumber;//鍖哄煙鍙�(搴曚綅鍦ㄥ墠楂樹綅鍦ㄥ悗)
+ public int arerNumber;//鍖哄煙鍙�(搴曚綅鍦ㄥ墠楂樹綅鍦ㄥ悗)
- public short deviceNumberl;//璁惧缂栧彿(搴曚綅鍦ㄥ墠楂樹綅鍦ㄥ悗)
+ public int deviceNumberl;//璁惧缂栧彿(搴曚綅鍦ㄥ墠楂樹綅鍦ㄥ悗)
public byte rechargeTimes;//鍏呭�兼鏁�
public int totalWater;//鐢ㄦ埛鎬荤敤姘撮噺 搴曚綅鍦ㄥ墠锛岄珮浣嶅湪鍚�2浣嶅皬鏁扮偣 鍚袱涓皬鏁扮偣鐨勬暣鏁�
@@ -48,11 +48,11 @@
byte[] arerNumberByte = new byte[2];
System.arraycopy(zero, 1, arerNumberByte, 0, arerNumberByte.length);
- userCard.arerNumber = (short) HexUtil.get16to10LowHigh(HexUtil.bytesToHex(arerNumberByte));
+ userCard.arerNumber = HexUtil.get16to10LowHigh(HexUtil.bytesToHex(arerNumberByte));
byte[] deviceNumberlByte = new byte[2];
System.arraycopy(zero, 3, deviceNumberlByte, 0, deviceNumberlByte.length);
- userCard.deviceNumberl = (short) HexUtil.get16to10LowHigh(HexUtil.bytesToHex(deviceNumberlByte));
+ userCard.deviceNumberl = HexUtil.get16to10LowHigh(HexUtil.bytesToHex(deviceNumberlByte));
userCard.rechargeTimes = HexUtil.hexToByte(HexUtil.byteToHex(zero[5]));
@@ -242,19 +242,19 @@
this.cardType = cardType;
}
- public short getArerNumber() {
+ public int getArerNumber() {
return arerNumber;
}
- public void setArerNumber(short arerNumber) {
+ public void setArerNumber(int arerNumber) {
this.arerNumber = arerNumber;
}
- public short getDeviceNumberl() {
+ public int getDeviceNumberl() {
return deviceNumberl;
}
- public void setDeviceNumberl(short deviceNumberl) {
+ public void setDeviceNumberl(int deviceNumberl) {
this.deviceNumberl = deviceNumberl;
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/UserCardDao.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/UserCardDao.java
index d28bfd2..5e70e23 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/UserCardDao.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/UserCardDao.java
@@ -33,11 +33,16 @@
@Query("select * from UserCardBean where date>=:beginTime and date<=:endTime")
List<UserCardBean> findByTime(long beginTime, long endTime);
+
@Query("select * from UserCardBean where userName like :data or userID like :data or phone like :data")
List<UserCardBean> findByData(String data);
@Query("select * from UserCardBean order by date desc LIMIT :limit OFFSET :offset")
- List<UserCardBean> findAll(int offset,int limit);
+ List<UserCardBean> findAll(int offset, int limit);
+
@Query("select COUNT(*) from UserCardBean")
int getUserTotale();
+
+ @Query("select * from UserCardBean where cardNumber =:data")
+ List<UserCardBean> findUserName(String data);
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/UserCardBean.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/UserCardBean.java
index 3909a2c..4b282a2 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/UserCardBean.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/UserCardBean.java
@@ -18,6 +18,8 @@
private String userName ;//鐢ㄦ埛鍚嶇О
private String userID ;//韬唤璇佸彿
+ private String cardNumber;//鍗″彿
+
private long date;
private String phone;
//鐘舵�� 0绌洪棽 1浣跨敤
@@ -29,6 +31,14 @@
private String addressCode;//鍖哄煙鍙�
+ public String getCardNumber() {
+ return cardNumber;
+ }
+
+ public void setCardNumber(String cardNumber) {
+ this.cardNumber = cardNumber;
+ }
+
public String getAddressCode() {
return addressCode;
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/BaseNFCHelper.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/BaseNFCHelper.java
index aadf21e..9f6f979 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/BaseNFCHelper.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/BaseNFCHelper.java
@@ -38,7 +38,7 @@
static {
- System.loadLibrary("native-lib");
+ System.loadLibrary("qihealone-native-lib");
}
public native String getSafeKey(Object object);
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/NfcReadHelper.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/NfcReadHelper.java
index 2c8542f..dff0d49 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/NfcReadHelper.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/tools/NfcReadHelper.java
@@ -8,12 +8,14 @@
import android.util.Log;
import com.dayu.baselibrary.tools.HexUtil;
+import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.qihealonelibrary.card.UserCard;
import com.dayu.qihealonelibrary.utils.CardCommon;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -113,13 +115,74 @@
return null;
}
- public String getCradType() {
+ /**
+ * 鑾峰彇鍗″彿
+ *
+ * @return
+ */
+ public String getCardNumber() {
+ MifareClassic mfc = MifareClassic.get(tag);
+ if (null != mfc) {
+ try {
+ mfc.connect();
+ //鑾峰彇褰撳墠鍗″彿
+ boolean isOpen = mfc.authenticateSectorWithKeyA(0, defauleKey);
+ if (!isOpen) {
+ isOpen = mfc.authenticateSectorWithKeyA(0, companyKey);
+ }
+ if (isOpen) {
+ int bIndex = mfc.sectorToBlock(0);
+ byte[] data = mfc.readBlock(bIndex + 0);
+ if (data != null && data.length > 0) {
+ String hex = HexUtil.bytesToHex(Arrays.copyOfRange(data, 0, 4));
+ Log.i("NFCWreatActivity", "hex===" + hex);
+ return hex;
+ }
+ }
+
+ } catch (IOException e) {
+ return BaseCommon.CARD_TYPE_ERROR1;
+ } finally {
+ try {
+ mfc.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return "";
+ }
+
+
+ /**
+ * 鑾峰彇鍗＄墖绫诲瀷鍜屽崱鍙�
+ *
+ * @return
+ */
+ public String getCradTypeAndCardNumber() {
MifareClassic mfc = MifareClassic.get(tag);
if (null != mfc) {
try {
mfc.connect();
- boolean isOpen = mfc.authenticateSectorWithKeyA(1, defauleKey);
+ StringBuilder strData = new StringBuilder();
+ //鑾峰彇褰撳墠鍗″彿
+ boolean isOpen = mfc.authenticateSectorWithKeyA(0, defauleKey);
+ if (!isOpen) {
+ isOpen = mfc.authenticateSectorWithKeyA(0, companyKey);
+ }
+ if (isOpen) {
+ int bIndex = mfc.sectorToBlock(0);
+ byte[] data = mfc.readBlock(bIndex + 0);
+ if (data != null && data.length > 0) {
+ String hex = HexUtil.bytesToHex(Arrays.copyOfRange(data, 0, 4));
+ strData.append(hex);
+ strData.append(",");
+ Log.i("NFCWreatActivity", "hex===" + hex);
+ }
+ }
+ //鑾峰彇鍗＄墖绫诲瀷
+ isOpen = mfc.authenticateSectorWithKeyA(1, defauleKey);
if (!isOpen) {
isOpen = mfc.authenticateSectorWithKeyA(1, companyKey);
}
@@ -128,16 +191,16 @@
byte[] data = mfc.readBlock(bIndex + 0);
if (data != null && data.length > 0) {
String hex = HexUtil.byteToHex(data[0]);
+ strData.append(hex);
Log.i("NFCWreatActivity", "hex===" + hex);
- return hex;
+ return strData.toString();
}
-
} else {
Log.i("NFCWreatActivity", "isOpen===" + isOpen);
- return "-1";
+ return BaseCommon.CARD_TYPE_ERROR2;
}
} catch (IOException e) {
- return "-1";
+ return BaseCommon.CARD_TYPE_ERROR1;
} finally {
try {
mfc.close();
@@ -217,6 +280,61 @@
}
+ public List<byte[]> getOnesectorData() {
+ MifareClassic mfc = null;
+ try {
+ mfc = MifareClassic.get(tag);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ List<byte[]> list = new ArrayList<>();
+ if (null != mfc) {
+ try {
+ //閾炬帴NFC
+ mfc.connect();
+ //鐢ㄤ簬鍒ゆ柇鏃跺�欐湁鍐呭璇诲彇鍑烘潵
+ boolean flag = false;
+
+ //楠岃瘉鎵囧尯瀵嗙爜锛屽惁鍒欎細鎶ラ敊锛堥摼鎺ュけ璐ラ敊璇級
+ boolean isOpen = mfc.authenticateSectorWithKeyA(1, companyKey);
+ if (!isOpen) {
+ isOpen = mfc.authenticateSectorWithKeyA(1, defauleKey);
+ }
+ if (isOpen) {
+ //鑾峰彇鎵囧尯閲岄潰鍧楃殑鏁伴噺
+ int bCount = mfc.getBlockCountInSector(1);
+ //鑾峰彇鎵囧尯绗竴涓潡瀵瑰簲鑺墖瀛樺偍鍣ㄧ殑浣嶇疆锛堟垜鏄繖鏍风悊瑙ｇ殑锛屽洜涓虹0鎵囧尯鐨勮繖涓�兼槸4鑰屼笉鏄�0锛�
+ int bIndex = mfc.sectorToBlock(1);
+ //String data1 = "";
+ for (int j = 0; j < bCount; j++) {
+ //璇诲彇鏁版嵁
+ byte[] data = null;
+ try {
+ data = mfc.readBlock(bIndex);
+ bIndex++;
+ list.add(data);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ mfc.close();
+ return list;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return null;
+ }
+
/**
* 鑾峰彇1鎵囧尯淇℃伅
*
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/view/ProgressDialog.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/view/ProgressDialog.java
index 9e133b5..d8981e5 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/view/ProgressDialog.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/view/ProgressDialog.java
@@ -14,7 +14,7 @@
static Dialog dialog;
public static void show(Activity activity) {
- dialog = android.app.ProgressDialog.show(activity, "", "姝ｅ湪閫氫俊璇风◢鍚�", true, true);
+ dialog = android.app.ProgressDialog.show(activity, "", "姝ｅ湪璇诲彇璇风◢鍚�", true, true);
}
public static void dismiss() {
diff --git a/qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml b/qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml
index a3c6bc3..aad804e 100644
--- a/qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml
@@ -44,7 +44,9 @@
android:layout_weight="2"
android:background="@drawable/editbg"
android:inputType="number"
- android:maxLength="11"
+ android:lines="1"
+ android:maxLength="5"
+
android:paddingLeft="10dp"
android:textSize="@dimen/new_card_size" />
@@ -72,6 +74,8 @@
android:layout_weight="2"
android:background="@drawable/editbg"
android:inputType="number"
+ android:lines="1"
+ android:maxLength="5"
android:paddingLeft="10dp"
android:textSize="@dimen/new_card_size" />
</LinearLayout>
diff --git a/qihealonelibrary/src/main/res/layout/activity_my_qha.xml b/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
index 8093a9b..a01d709 100644
--- a/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
@@ -56,7 +56,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鍦板潃淇℃伅锛�"
+ android:text="鍖哄煙鍙凤細"
android:textColor="@color/text_selecter"
android:textSize="@dimen/text_size" />
diff --git a/qihealonelibrary/src/main/res/layout/activity_new_card_qha.xml b/qihealonelibrary/src/main/res/layout/activity_new_card_qha.xml
index 0725425..58933f4 100644
--- a/qihealonelibrary/src/main/res/layout/activity_new_card_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_new_card_qha.xml
@@ -67,7 +67,6 @@
android:id="@+id/newCard_scanBtn"
android:layout_width="45dp"
android:layout_height="45dp"
- android:visibility="gone"
android:padding="10dp"
android:src="@mipmap/icon_scan" />
diff --git a/qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml b/qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml
index 343b546..8cfaf8e 100644
--- a/qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml
@@ -27,14 +27,14 @@
android:text="鐢ㄦ埛濮撳悕锛�"
android:textSize="@dimen/text_size" />
+
<TextView
android:id="@+id/red_initCode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:text="鐢ㄦ埛娉ㄥ唽缂栧彿锛�"
+ android:text="褰撳墠鍗″彿锛�"
android:textSize="@dimen/text_size" />
-
<TextView
android:id="@+id/red_remainder_morny"
diff --git a/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml b/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml
index 61b91fa..8da0c8c 100644
--- a/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml
@@ -18,7 +18,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/titleBar"
- android:visibility="gone">
+ android:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
@@ -43,7 +43,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鐢ㄦ埛娉ㄥ唽缂栧彿锛�"
+ android:text="鍗″彿锛�"
android:textSize="@dimen/text_size" />
<TextView
@@ -62,24 +62,49 @@
android:layout_marginTop="15dp"
android:text="鍓╀綑閲戦锛�"
android:textSize="@dimen/text_size" />
+ <TextView
+ android:id="@+id/red_remainder_water"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="鍓╀綑姘撮噺锛�"
+ android:textSize="@dimen/text_size" />
<TextView
android:id="@+id/red_rechargeDate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:text="鏈崱鏈�鍚庤喘姘存棩鏈燂細"
+ android:text="鏈�鍚庤喘姘存棩鏈燂細"
android:textSize="@dimen/text_size"
- android:visibility="gone" />
+ android:visibility="visible" />
<TextView
android:id="@+id/red_rechargeNumber"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
- android:text="鏈崱鍏呭�兼鏁帮細"
+ android:text="鍏呭�兼鏁帮細"
android:textSize="@dimen/text_size"
- android:visibility="gone" />
+ android:visibility="visible" />
+
+ <TextView
+ android:id="@+id/red_total_water"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="鎬荤敤姘撮噺锛�"
+ android:textSize="@dimen/text_size"
+ android:visibility="visible" />
+
+ <TextView
+ android:id="@+id/red_total_power"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:text="鎬荤敤鐢甸噺锛�"
+ android:textSize="@dimen/text_size"
+ android:visibility="visible" />
<TextView
android:id="@+id/red_statu"
@@ -135,7 +160,7 @@
android:layout_below="@id/titleBar"
android:background="#ffffff"
android:orientation="vertical"
- android:visibility="visible">
+ android:visibility="gone">
<TextView
android:layout_width="match_parent"
diff --git a/qihealonelibrary/src/main/res/layout/qihe_item_new_card.xml b/qihealonelibrary/src/main/res/layout/qihe_item_new_card.xml
index 323228f..f57e4d1 100644
--- a/qihealonelibrary/src/main/res/layout/qihe_item_new_card.xml
+++ b/qihealonelibrary/src/main/res/layout/qihe_item_new_card.xml
@@ -6,7 +6,7 @@
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
@@ -27,11 +27,18 @@
android:textSize="14sp" />
<TextView
+ android:id="@+id/cardNumber"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鍗″彿锛�" />
+
+ <TextView
android:id="@+id/userNo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="鎴峰彿锛�123123"
+ android:text="韬唤璇佸彿锛�123123"
android:textSize="14sp" />
<TextView
@@ -39,7 +46,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="姘撮噺锛�123123"
+ android:text="鐢佃瘽锛�123123"
android:textSize="14sp" />
<TextView
diff --git a/qihealonelibrary/src/main/res/layout/qihe_item_replacements.xml b/qihealonelibrary/src/main/res/layout/qihe_item_replacements.xml
index 99ee08c..72c0f55 100644
--- a/qihealonelibrary/src/main/res/layout/qihe_item_replacements.xml
+++ b/qihealonelibrary/src/main/res/layout/qihe_item_replacements.xml
@@ -7,7 +7,7 @@
<variable
name="activity"
- type="com.dayu.qihealonelibrary.activity.ReplacementActivityQHAlone" />
+ type="com.dayu.qihealonelibrary.activity.ReplacementActivity" />
</data>
--
Gitblit v1.8.0