From e79ced190337222c7475409363c8071c976c7de9 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 06 五月 2024 10:03:04 +0800
Subject: [PATCH] 1.修复两个工程因layout名字一样导致的bug
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysIpActivity.java | 7
qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml | 0
henanlibrary/src/main/res/layout/activity_water_meter_hn.xml | 0
henanlibrary/src/main/res/layout/activity_recharge_list_hn.xml | 0
qihealonelibrary/src/main/res/layout/activity_new_card_qha.xml | 0
henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/ReplacementAdapter.java | 12
baselibrary/src/main/res/layout/confirm_dialog.xml | 8
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetail.java | 9
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java | 10
henanlibrary/src/main/res/layout/activity_electric_price_hn.xml | 0
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivityQHAlone.java | 11
baselibrary/src/main/res/layout/edt_dialog.xml | 7
henanlibrary/build.gradle | 1
henanlibrary/src/main/res/layout/activity_recharge_detail_hn.xml | 0
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ParameterActivity.java | 6
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeActivity.java | 8
henanlibrary/src/main/res/layout/activity_manage_setup_hn.xml | 0
henanlibrary/src/main/res/layout/activity_write_text_hn.xml | 0
qihealonelibrary/src/main/res/layout/activity_recharge_list_qha.xml | 0
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java | 10
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PassWordActivity.java | 6
henanlibrary/src/main/res/layout/activity_read_text_hn.xml | 0
henanlibrary/src/main/res/layout/activity_admin_hn.xml | 0
henanlibrary/src/main/res/layout/activity_red_card_hn.xml | 0
qihealonelibrary/src/main/res/layout/activity_write_text_qha.xml | 0
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivityQHAlone.java | 2
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java | 29
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivityQHAlone.java | 20
qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml | 0
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/IdentifyingActivity.java | 6
qihealonelibrary/src/main/res/layout/qihe_item_replacements.xml | 2
qihealonelibrary/src/main/res/layout/activity_identyfying_qha.xml | 0
baselibrary/src/main/res/layout/library_dialog.xml | 4
henanlibrary/src/main/res/layout/activity_domain_hn.xml | 0
baselibrary/src/main/res/layout/password_dialog.xml | 3
qihealonelibrary/src/main/res/layout/activity_electricty_price_qha.xml | 0
qihealonelibrary/src/main/res/layout/activity_water_num_qha.xml | 0
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/UserCardBean.java | 6
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java | 33
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardActivity.java | 53 --
henanlibrary/src/main/res/layout/activity_psw_hn.xml | 0
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PowerActivity.java | 7
henanlibrary/src/main/res/layout/activity_newcard_list_hn.xml | 0
qihealonelibrary/src/main/res/layout/activity_psw_qha.xml | 0
henanlibrary/src/main/res/layout/activity_electricty_price_hn.xml | 0
qihealonelibrary/src/main/res/layout/activity_read_text_qha.xml | 0
baselibrary/src/main/res/layout/text_dialog.xml | 26 +
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/AdminDataBean.java | 2
qihealonelibrary/src/main/res/layout/activity_parameter_qha.xml | 0
qihealonelibrary/src/main/res/layout/activity_ip_qha.xml | 0
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivityQHAlone.java | 12
app/src/main/java/com/dayu/recharge/activity/LoginActivity.java | 8
qihealonelibrary/src/main/res/layout/activity_domain_qha.xml | 0
henanlibrary/src/main/res/layout/activity_patch_list_hn.xml | 0
qihealonelibrary/src/main/res/layout/activity_home_qha.xml | 0
henanlibrary/src/main/res/layout/activity_main_hn.xml | 0
qihealonelibrary/src/main/res/layout/activity_my_qha.xml | 0
qihealonelibrary/src/main/res/layout/activity_admin_qha.xml | 0
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardListActivity.java | 11
henanlibrary/src/main/res/layout/activity_patch_hn.xml | 0
qihealonelibrary/src/main/AndroidManifest.xml | 40 +
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivityQHAlone.java | 26
baselibrary/src/main/res/values/dimens.xml | 1
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeListActivity.java | 10
baselibrary/src/main/res/values/strings.xml | 2
qihealonelibrary/src/main/res/layout/activity_password_card_qha.xml | 0
qihealonelibrary/src/main/res/layout/activity_replacement_qha.xml | 0
henanlibrary/src/main/res/layout/activity_ip_hn.xml | 0
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivityQHAlone.java | 94 ++++
qihealonelibrary/src/main/res/layout/activity_patch_list_qha.xml | 0
henanlibrary/src/main/res/layout/item_replacement_hn.xml | 0
qihealonelibrary/src/main/res/layout/activity_newcard_list_qha.xml | 0
qihealonelibrary/src/main/res/layout/activity_water_meter_qha.xml | 0
qihealonelibrary/src/main/res/layout/activity_region_qha.xml | 0
henanlibrary/src/main/res/layout/activity_water_num_hn.xml | 0
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RegionActivityQHAlone.java | 8
henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/NewCardAdapter.java | 13
qihealonelibrary/src/main/res/layout/activity_power_qha.xml | 0
qihealonelibrary/build.gradle | 2
qihealonelibrary/src/main/res/layout/activity_main_qha.xml | 0
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PowerActivityQHAlone.java | 8
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ElectricPriceActivityQHAlone.java | 9
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/DomainActivityQHAlone.java | 9
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivityQHAlone.java | 8
qihealonelibrary/src/main/res/layout/activity_electric_meter_qha.xml | 0
baselibrary/build.gradle | 3
henanlibrary/src/main/res/layout/activity_home_hn.xml | 0
henanlibrary/src/main/res/layout/activity_new_card_hn.xml | 0
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivityQHAlone.java | 18
henanlibrary/src/main/res/layout/item_patch_hn.xml | 0
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivityQHAlone.java | 11
henanlibrary/src/main/res/layout/activity_recharge_ext_hn.xml | 0
app/build.gradle | 4
henanlibrary/src/main/res/layout/item_new_card_hn.xml | 0
henanlibrary/src/main/res/layout/activity_recharge_hn.xml | 0
henanlibrary/src/main/res/layout/activity_identyfying_hn.xml | 0
henanlibrary/src/main/res/layout/activity_parameter_hn.xml | 0
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java | 18
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReplacementActivity.java | 7
henanlibrary/src/main/res/layout/activity_my_hn.xml | 0
baselibrary/src/main/res/values/colors.xml | 2
qihealonelibrary/src/main/res/layout/activity_location_qha.xml | 0
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ElectricPriceActivity.java | 6
qihealonelibrary/src/main/res/layout/activity_recharge_ext_qha.xml | 0
baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java | 25
henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/RechargeAdapter.java | 13
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/AdminSetupActivity.java | 6
henanlibrary/src/main/res/layout/item_recharge_hn.xml | 0
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysActivity.java | 8
baselibrary/src/main/java/com/dayu/baselibrary/view/ConfirmDialog.java | 12
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManageSetUpActivityQHAlone.java | 2
qihealonelibrary/src/main/res/layout/activity_manage_setup_qha.xml | 0
baselibrary/src/main/res/drawable/ic_choose_gray_edge.xml | 0
baselibrary/src/main/res/drawable/textview_select_bg.xml | 7
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/DomainActivity.java | 6
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java | 16
qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml | 0
henanlibrary/src/main/res/layout/activity_location_hn.xml | 0
henanlibrary/src/main/res/layout/activity_power_hn.xml | 0
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeDetail.java | 6
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivityQHAlone.java | 308 +++++++++++++++
qihealonelibrary/src/main/res/layout/activity_patch_qha.xml | 0
baselibrary/src/main/res/drawable/editbg.xml | 0
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivityQHAlone.java | 26
qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml | 70 +-
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivityQHAlone.java | 12
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java | 8
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivityQHAlone.java | 11
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/HomeActivity.java | 7
henanlibrary/src/main/res/layout/activity_electric_meter_hn.xml | 0
/dev/null | 21 -
henanlibrary/src/main/res/layout/activity_admin_setup_hn.xml | 0
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/ReplacementAdapter.java | 10
henanlibrary/src/main/res/layout/activity_replacement_hn.xml | 0
qihealonelibrary/src/main/res/layout/activity_electric_price_qha.xml | 0
135 files changed, 788 insertions(+), 404 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 2aedab6..ec755fd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,7 @@
versionName "2.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- ndk{
+ ndk {
abiFilters 'armeabi-v7a'
}
signingConfig signingConfigs.debug
@@ -54,7 +54,7 @@
//alias:dayu
//ps:dycz@2023
dependencies {
- implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs')
+ implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
compileOnly 'com.android.support:appcompat-v7:28.0.0'
compileOnly 'com.android.support.constraint:constraint-layout:1.1.3'
compileOnly 'androidx.core:core-ktx:1.8.0'
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 c48f912..3b41b88 100644
--- a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
@@ -20,6 +20,7 @@
import com.dayu.henanlibrary.dbBean.PassWordBean;
+import com.dayu.qihealonelibrary.activity.HomeActivityQHAlone;
import com.dayu.recharge.MyApplication;
import com.dayu.recharge.databinding.ActivityLoginBinding;
import com.hjq.permissions.OnPermissionCallback;
@@ -54,6 +55,7 @@
binding.loginBtn.setOnClickListener(v -> {
String psStr = binding.loginPw.getText().toString();
if (MyApplication.myApplication.libraryType == BaseCommon.NoLibrary) {
+ //閫夋嫨鐗堟湰
LibraryDialog dialog = new LibraryDialog(this, type -> {
if (type == BaseCommon.HeNanLibrary) {
getHNPermission();
@@ -72,10 +74,10 @@
}
if ((passWordBean == null && psStr.equals("123456"))
|| passWordBean != null && passWordBean.getPassWord().equalsIgnoreCase(WSMD5.getMD5Str(psStr))) {
- if (MyApplication.myApplication.libraryType == 0) {
+ if (MyApplication.myApplication.libraryType == BaseCommon.HeNanLibrary) {
startActivity(new Intent(LoginActivity.this, com.dayu.henanlibrary.activity.HomeActivity.class));
- } else if (MyApplication.myApplication.libraryType == 1) {
- startActivity(new Intent(LoginActivity.this, com.dayu.qihealonelibrary.activity.HomeActivity.class));
+ } else if (MyApplication.myApplication.libraryType == BaseCommon.QHAloneLibrary) {
+ startActivity(new Intent(LoginActivity.this, HomeActivityQHAlone.class));
}
LoginActivity.this.finish();
} else {
diff --git a/baselibrary/build.gradle b/baselibrary/build.gradle
index 43d052c..b32585c 100644
--- a/baselibrary/build.gradle
+++ b/baselibrary/build.gradle
@@ -39,6 +39,9 @@
compileOnly 'com.google.zxing:core:3.4.1'
compileOnly 'com.tencent.bugly:crashreport:4.1.9.3'
+ //loding
+ implementation 'com.wang.avi:library:2.1.3'
+
//婊氬姩閫夋嫨妗�
compileOnly 'com.contrarywind:Android-PickerView:4.1.9'
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/view/ConfirmDialog.java b/baselibrary/src/main/java/com/dayu/baselibrary/view/ConfirmDialog.java
index fc5440a..924c2bb 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/view/ConfirmDialog.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/view/ConfirmDialog.java
@@ -22,6 +22,7 @@
Activity mContext;
View.OnClickListener mListner;
+ String mData;
public ConfirmDialog(@NonNull Activity context) {
super(context, com.dayu.baselibrary.R.style.ws_pay_showSelfDialog);
@@ -36,10 +37,21 @@
initView();
}
+
+ public ConfirmDialog(@NonNull Activity context, String data, View.OnClickListener listner) {
+ super(context, com.dayu.baselibrary.R.style.ws_pay_showSelfDialog);
+ mContext = context;
+ mListner = listner;
+ mData = data;
+ initView();
+ }
+
private void initView() {
getWindow().setGravity(Gravity.CENTER);
setContentView(R.layout.confirm_dialog);
setCanceledOnTouchOutside(false);
+ TextView data = (TextView) this.findViewById(R.id.confirm_data);
+ data.setText(mData);
TextView cannel = (TextView) this.findViewById(R.id.confirm_cancel);
TextView ok = (TextView) this.findViewById(R.id.confirm_ok);
cannel.setOnClickListener(v -> ConfirmDialog.this.dismiss());
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 cc587b9..0d49596 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java
@@ -1,8 +1,9 @@
package com.dayu.baselibrary.view;
+import static android.view.Gravity.CENTER;
+
import android.app.Activity;
import android.app.Dialog;
-import android.content.Intent;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
@@ -23,7 +24,6 @@
*/
public class LibraryDialog extends Dialog {
- Intent intent;
Activity mContext;
LibraryBean libraryBean;
LibraryDao libraryDao;
@@ -31,17 +31,17 @@
libraryBack mLibraryBack;
int type;
+ String data;
public LibraryDialog(Activity context, libraryBack libraryBack) {
super(context, com.dayu.baselibrary.R.style.ws_pay_showSelfDialog);
- this.intent = intent;
mContext = context;
mLibraryBack = libraryBack;
initView();
}
private void initView() {
- getWindow().setGravity(Gravity.CENTER);
+ getWindow().setGravity(CENTER);
setContentView(R.layout.library_dialog);
setCanceledOnTouchOutside(false);
RadioGroup radioGroup = findViewById(R.id.radioLibrary);
@@ -57,16 +57,27 @@
if (checkedId == R.id.henanLibrary) {
type = 0;
libraryBean.setType(type);
+ data = "纭閫夋嫨娌冲崡鐗堟湰鍚楋紵";
} else if (checkedId == R.id.qhAloneLibrary) {// 澶勭悊閫変腑Option 2鐨勯�昏緫
type = 1;
libraryBean.setType(type);
+ data = "纭閫夋嫨榻愭渤鍗曟満鐗堟湰鍚楋紵";
}
});
TextView okBtn = findViewById(R.id.ok);
okBtn.setOnClickListener(v -> {
if (ischose) {
- libraryDao.insert(libraryBean);
- mLibraryBack.listener(type);
+ //浜屾纭
+ ConfirmDialog confirmDialog = new ConfirmDialog(mContext, data, new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ libraryDao.insert(libraryBean);
+ mLibraryBack.listener(type);
+ LibraryDialog.this.dismiss();
+ }
+ });
+ confirmDialog.show();
+
}
});
@@ -81,7 +92,7 @@
* 璁剧疆瀹藉害鍏ㄥ睆锛岃璁剧疆鍦╯how鐨勫悗闈�
*/
WindowManager.LayoutParams layoutParams = getWindow().getAttributes();
- layoutParams.gravity = Gravity.CENTER;
+ layoutParams.gravity = CENTER;
layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT;
layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
getWindow().getDecorView().setPadding(0, 0, 0, 0);
diff --git a/baselibrary/src/main/res/drawable/editbg_dialog.xml b/baselibrary/src/main/res/drawable/editbg.xml
similarity index 100%
rename from baselibrary/src/main/res/drawable/editbg_dialog.xml
rename to baselibrary/src/main/res/drawable/editbg.xml
diff --git a/henanlibrary/src/main/res/drawable/ic_choose_gray_edge.xml b/baselibrary/src/main/res/drawable/ic_choose_gray_edge.xml
similarity index 100%
rename from henanlibrary/src/main/res/drawable/ic_choose_gray_edge.xml
rename to baselibrary/src/main/res/drawable/ic_choose_gray_edge.xml
diff --git a/baselibrary/src/main/res/drawable/textview_select_bg.xml b/baselibrary/src/main/res/drawable/textview_select_bg.xml
new file mode 100644
index 0000000..068a897
--- /dev/null
+++ b/baselibrary/src/main/res/drawable/textview_select_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- Pressed state -->
+ <item android:drawable="@color/text_on" android:state_pressed="true" />
+ <!-- Default state -->
+ <item android:drawable="@android:color/white" />
+</selector>
\ No newline at end of file
diff --git a/baselibrary/src/main/res/layout/confirm_dialog.xml b/baselibrary/src/main/res/layout/confirm_dialog.xml
index a0d9d24..eb1bbf4 100644
--- a/baselibrary/src/main/res/layout/confirm_dialog.xml
+++ b/baselibrary/src/main/res/layout/confirm_dialog.xml
@@ -16,8 +16,9 @@
<TextView
android:id="@+id/confirm_data"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
android:gravity="center"
android:text="杩樻湭鍐欏崱锛侊紒锛乗n鎮ㄧ‘璁ら��鍑哄悧锛�"
android:textColor="@color/text_color"
@@ -32,13 +33,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:padding="5dp">
<TextView
android:id="@+id/confirm_cancel"
android:layout_width="0dp"
android:layout_height="@dimen/dialog_btn_height"
android:layout_weight="1"
+ android:background="@drawable/textview_select_bg"
android:gravity="center"
android:text="鍙� 娑�"
android:textColor="@color/text_color"
@@ -54,6 +57,7 @@
android:layout_width="0dp"
android:layout_height="@dimen/dialog_btn_height"
android:layout_weight="1"
+ android:background="@drawable/textview_select_bg"
android:gravity="center"
android:text="纭� 璁�"
android:textColor="@color/dialog_btn"
diff --git a/baselibrary/src/main/res/layout/edt_dialog.xml b/baselibrary/src/main/res/layout/edt_dialog.xml
index 4368e6a..163c32a 100644
--- a/baselibrary/src/main/res/layout/edt_dialog.xml
+++ b/baselibrary/src/main/res/layout/edt_dialog.xml
@@ -18,11 +18,11 @@
<EditText
android:id="@+id/pw_et"
android:layout_width="match_parent"
- android:layout_height="50dp"
+ android:layout_height="@dimen/edt_height"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginRight="20dp"
- android:background="@drawable/editbg_dialog"
+ android:background="@drawable/editbg"
android:hint="璇疯緭鍏ヤ俊鎭�"
android:paddingLeft="10dp"
android:textColor="#000000" />
@@ -36,6 +36,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:padding="5dp"
android:gravity="center_horizontal"
android:orientation="horizontal">
@@ -44,6 +45,7 @@
android:layout_width="0dp"
android:layout_height="@dimen/dialog_btn_height"
android:layout_weight="1"
+ android:background="@drawable/textview_select_bg"
android:gravity="center"
android:text="鍙� 娑�"
android:textColor="@color/text_color"
@@ -59,6 +61,7 @@
android:layout_width="0dp"
android:layout_height="@dimen/dialog_btn_height"
android:layout_weight="1"
+ android:background="@drawable/textview_select_bg"
android:gravity="center"
android:text="纭� 璁�"
android:textColor="@color/dialog_btn"
diff --git a/baselibrary/src/main/res/layout/library_dialog.xml b/baselibrary/src/main/res/layout/library_dialog.xml
index 8d1abd9..045f51d 100644
--- a/baselibrary/src/main/res/layout/library_dialog.xml
+++ b/baselibrary/src/main/res/layout/library_dialog.xml
@@ -46,6 +46,7 @@
android:background="@drawable/radio_select"
android:button="@null"
android:gravity="center"
+ android:padding="6dp"
android:text="娌冲崡鐗堟湰"
android:textColor="@drawable/radio_text_select"
android:textSize="20sp" />
@@ -60,6 +61,7 @@
android:background="@drawable/radio_select"
android:button="@null"
android:gravity="center"
+ android:padding="6dp"
android:text="榻愭渤鍗曟満鐗�"
android:textColor="@drawable/radio_text_select"
android:textSize="20sp" />
@@ -75,12 +77,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
+ android:padding="5dp"
android:orientation="horizontal">
<TextView
android:id="@+id/ok"
android:layout_width="match_parent"
android:layout_height="@dimen/dialog_btn_height"
+ android:background="@drawable/textview_select_bg"
android:gravity="center"
android:paddingLeft="15dp"
android:paddingTop="5dp"
diff --git a/baselibrary/src/main/res/layout/password_dialog.xml b/baselibrary/src/main/res/layout/password_dialog.xml
index 0b56a45..1e0163c 100644
--- a/baselibrary/src/main/res/layout/password_dialog.xml
+++ b/baselibrary/src/main/res/layout/password_dialog.xml
@@ -10,6 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dialog_bg_margin"
+ android:padding="5dp"
android:background="@drawable/base_bg_dialog_top_stroke"
android:gravity="center"
android:orientation="vertical">
@@ -22,7 +23,7 @@
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginRight="20dp"
- android:background="@drawable/editbg_dialog"
+ android:background="@drawable/editbg"
android:hint="璇疯緭鍏ョ鐞嗗瘑鐮�"
android:inputType="textPassword"
android:paddingLeft="15dp"
diff --git a/baselibrary/src/main/res/layout/text_dialog.xml b/baselibrary/src/main/res/layout/text_dialog.xml
index 4bff1ac..a3caf38 100644
--- a/baselibrary/src/main/res/layout/text_dialog.xml
+++ b/baselibrary/src/main/res/layout/text_dialog.xml
@@ -9,18 +9,33 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:padding="5dp"
android:layout_margin="@dimen/dialog_bg_margin"
android:background="@drawable/base_bg_dialog_top_stroke"
android:gravity="center"
android:orientation="vertical">
-
-
<TextView
- android:id="@+id/textData"
- android:layout_width="300dp"
+
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
+ android:layout_marginRight="20dp"
+ android:gravity="center"
+ android:text="鎻� 绀�"
+ android:textColor="@color/text_color"
+ android:textSize="20sp" />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="2px"
+ android:layout_marginTop="20dp"
+ android:background="@color/line_bg" />
+ <TextView
+ android:id="@+id/textData"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="30dp"
android:layout_marginRight="20dp"
android:gravity="center"
android:textColor="@color/text_color"
@@ -29,7 +44,7 @@
<View
android:layout_width="match_parent"
android:layout_height="2px"
- android:layout_marginTop="20dp"
+ android:layout_marginTop="30dp"
android:background="@color/line_bg" />
<LinearLayout
@@ -47,6 +62,7 @@
android:paddingTop="5dp"
android:paddingRight="15dp"
android:paddingBottom="5dp"
+ android:background="@drawable/textview_select_bg"
android:text="纭� 璁�"
android:textColor="@color/dialog_btn"
android:textSize="20sp" />
diff --git a/baselibrary/src/main/res/values/colors.xml b/baselibrary/src/main/res/values/colors.xml
index 066e6bf..fc1b123 100644
--- a/baselibrary/src/main/res/values/colors.xml
+++ b/baselibrary/src/main/res/values/colors.xml
@@ -35,4 +35,6 @@
<color name="dialog_btn">#1FA9EC</color>
<color name="edite_bg">#F5F5F5</color>
<color name="text_color">#696969</color>
+
+ <color name="text_on">#BEBEBE</color>
</resources>
\ No newline at end of file
diff --git a/baselibrary/src/main/res/values/dimens.xml b/baselibrary/src/main/res/values/dimens.xml
index 4437375..ad5de61 100644
--- a/baselibrary/src/main/res/values/dimens.xml
+++ b/baselibrary/src/main/res/values/dimens.xml
@@ -14,4 +14,5 @@
<dimen name="date_unit_text_size">18sp</dimen>
<dimen name="dialog_btn_height">45dp</dimen>
<dimen name="dialog_bg_margin">30dp</dimen>
+ <dimen name="edt_height">50dp</dimen>
</resources>
diff --git a/baselibrary/src/main/res/values/strings.xml b/baselibrary/src/main/res/values/strings.xml
index 6aa4c1a..fef57d8 100644
--- a/baselibrary/src/main/res/values/strings.xml
+++ b/baselibrary/src/main/res/values/strings.xml
@@ -29,4 +29,6 @@
<string name="login_title">澶х鑺傛按\n鏅鸿兘鍏呭�肩鐞嗙郴缁�</string>
<string name="company_name">澶х鑺傛按绉戞妧鐮旂┒鏈夐檺鍏徃</string>
+ <string name="eq_no">璁惧缂栧彿锛�</string>
+ <string name="address_code">鍖哄煙鍙凤細</string>
</resources>
\ No newline at end of file
diff --git a/henanlibrary/build.gradle b/henanlibrary/build.gradle
index 5257996..016d3a0 100644
--- a/henanlibrary/build.gradle
+++ b/henanlibrary/build.gradle
@@ -1,5 +1,6 @@
apply plugin: 'com.android.library'
android {
+ namespace 'com.dayu.henanlibrary'
compileSdk 33
defaultConfig {
minSdk 23
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/AdminSetupActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/AdminSetupActivity.java
index c0a8983..8e7fc84 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/AdminSetupActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/AdminSetupActivity.java
@@ -7,8 +7,8 @@
import android.view.inputmethod.InputMethodManager;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.databinding.ActivityAdminSetupBinding;
import com.dayu.henanlibrary.HeNanApplication;
+import com.dayu.henanlibrary.databinding.ActivityAdminSetupHnBinding;
import com.dayu.henanlibrary.dbBean.AdminDataBean;
import com.dayu.henanlibrary.dbBean.IpBean;
import com.example.pickerviewlibrary.picker.TeaPickerView;
@@ -22,7 +22,7 @@
*/
public class AdminSetupActivity extends HNBaseActivity {
- ActivityAdminSetupBinding adminBinding;
+ ActivityAdminSetupHnBinding adminBinding;
public static AdminSetupActivity adminSetupActivity;
AdminDataBean adminData = new AdminDataBean();
TeaPickerView pickerView;
@@ -31,7 +31,7 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
try {
- adminBinding = ActivityAdminSetupBinding.inflate(LayoutInflater.from(this));
+ adminBinding = ActivityAdminSetupHnBinding.inflate(LayoutInflater.from(this));
setContentView(adminBinding.getRoot());
adminSetupActivity = this;
setData();
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/DomainActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/DomainActivity.java
index 17b7085..2e40348 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/DomainActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/DomainActivity.java
@@ -6,7 +6,7 @@
import android.view.View;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.databinding.ActivityDomainBinding;
+import com.dayu.henanlibrary.databinding.ActivityDomainHnBinding;
import com.dayu.henanlibrary.dbBean.DomainBean;
/**
@@ -17,13 +17,13 @@
* 澶囨敞锛� 璁剧疆鍗″煙鍚嶅拰ip
*/
public class DomainActivity extends HNBaseActivity {
- ActivityDomainBinding binding;
+ ActivityDomainHnBinding binding;
DomainBean domainBean;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- binding = ActivityDomainBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityDomainHnBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
initData();
binding.electricOk.setOnClickListener(new View.OnClickListener() {
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ElectricPriceActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ElectricPriceActivity.java
index 0d45ec9..db10f57 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ElectricPriceActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ElectricPriceActivity.java
@@ -8,7 +8,7 @@
import android.view.View;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.databinding.ActivityElectricPriceBinding;
+import com.dayu.henanlibrary.databinding.ActivityElectricPriceHnBinding;
import com.dayu.henanlibrary.dbBean.ElectricPriceBean;
/**
@@ -19,13 +19,13 @@
*/
public class ElectricPriceActivity extends HNBaseActivity {
- ActivityElectricPriceBinding electricPriceBinding;
+ ActivityElectricPriceHnBinding electricPriceBinding;
ElectricPriceBean electricPriceBean;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- electricPriceBinding = ActivityElectricPriceBinding.inflate(LayoutInflater.from(this));
+ electricPriceBinding = ActivityElectricPriceHnBinding.inflate(LayoutInflater.from(this));
setContentView(electricPriceBinding.getRoot());
initView();
initData();
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/HomeActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/HomeActivity.java
index 324b1b9..d079dc5 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/HomeActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/HomeActivity.java
@@ -12,7 +12,7 @@
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.view.PassWordDialog;
import com.dayu.henanlibrary.HeNanApplication;
-import com.dayu.henanlibrary.databinding.ActivityHomeBinding;
+import com.dayu.henanlibrary.databinding.ActivityHomeHnBinding;
import com.dayu.henanlibrary.dbBean.AdminDataBean;
import java.lang.reflect.Method;
@@ -29,13 +29,14 @@
public class HomeActivity extends HNBaseActivity {
public static HomeActivity homeActivity;
- ActivityHomeBinding homeBinding;
+ ActivityHomeHnBinding homeBinding;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
homeActivity = this;
- homeBinding = ActivityHomeBinding.inflate(LayoutInflater.from(this));
+ homeBinding = ActivityHomeHnBinding.inflate(LayoutInflater.from(this));
setContentView(homeBinding.getRoot());
initView();
rushState();
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/IdentifyingActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/IdentifyingActivity.java
index 6ef2a30..053720c 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/IdentifyingActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/IdentifyingActivity.java
@@ -6,7 +6,7 @@
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.view.ChooseView;
-import com.dayu.henanlibrary.databinding.ActivityIdentyfyingBinding;
+import com.dayu.henanlibrary.databinding.ActivityIdentyfyingHnBinding;
import com.dayu.henanlibrary.dbBean.CardData;
import com.dayu.henanlibrary.utils.CardCommon;
@@ -21,7 +21,7 @@
*/
public class IdentifyingActivity extends HNBaseActivity {
- ActivityIdentyfyingBinding binding;
+ ActivityIdentyfyingHnBinding binding;
String[] nianfen = {"绠＄悊鍗�", "娓呴浂鍗�", "閲嶆柊娉ㄥ唽璁惧鍗�", "鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�", "娴嬭瘯鍗�", "璁惧淇℃伅鍗�", "姘存车鍔熺巼鍗�"};
@@ -35,7 +35,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- binding = ActivityIdentyfyingBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityIdentyfyingHnBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
binding.chooseCardType.setOnClickListener(v ->
ChooseView.getIntence(IdentifyingActivity.this, Arrays.asList(nianfen.clone()), options1 -> {
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java
index 2037437..958c081 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java
@@ -11,15 +11,15 @@
import android.view.LayoutInflater;
import android.view.View;
-import com.dayu.baselibrary.view.PassWordDialog;
-import com.dayu.henanlibrary.utils.DeviceNumberUtils;
-import com.dayu.henanlibrary.utils.ExcelUtil;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.databinding.ActivityMyBinding;
-import com.dayu.henanlibrary.dbBean.AdminDataBean;
-import com.dayu.henanlibrary.net.SocketNet;
+import com.dayu.baselibrary.view.PassWordDialog;
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
+import com.dayu.henanlibrary.databinding.ActivityMyHnBinding;
+import com.dayu.henanlibrary.dbBean.AdminDataBean;
+import com.dayu.henanlibrary.net.SocketNet;
+import com.dayu.henanlibrary.utils.DeviceNumberUtils;
+import com.dayu.henanlibrary.utils.ExcelUtil;
import java.io.File;
import java.util.ArrayList;
@@ -41,12 +41,12 @@
long endTime;
boolean isRechargeList = false;
- ActivityMyBinding myBinding;
+ ActivityMyHnBinding myBinding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- myBinding = ActivityMyBinding.inflate(LayoutInflater.from(this));
+ myBinding = ActivityMyHnBinding.inflate(LayoutInflater.from(this));
setContentView(myBinding.getRoot());
getVersion(this);
setData();
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 007bbb1..b409ef6 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
@@ -16,6 +16,7 @@
import com.dayu.baselibrary.utils.DateUtil;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
+import com.dayu.baselibrary.view.ConfirmDialog;
import com.dayu.baselibrary.view.TitleBar;
import com.dayu.henanlibrary.card.CleanCard;
import com.dayu.henanlibrary.card.CleanUserCard;
@@ -26,7 +27,7 @@
import com.dayu.henanlibrary.card.RegisteredCard;
import com.dayu.henanlibrary.card.TestCard;
import com.dayu.henanlibrary.card.UserCard;
-import com.dayu.henanlibrary.databinding.ActivityWriteTextBinding;
+import com.dayu.henanlibrary.databinding.ActivityWriteTextHnBinding;
import com.dayu.henanlibrary.dbBean.AdminDataBean;
import com.dayu.henanlibrary.dbBean.ElectricPriceBean;
import com.dayu.henanlibrary.dbBean.RechargeBean;
@@ -39,10 +40,9 @@
import com.dayu.henanlibrary.tools.NFCWriteHelper;
import com.dayu.henanlibrary.tools.NfcReadHelper;
import com.dayu.henanlibrary.tools.WriteCardUtils;
-import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.henanlibrary.utils.CardCommon;
+import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.henanlibrary.utils.SocketUtil;
-import com.dayu.baselibrary.view.ConfirmDialog;
import com.dayu.henanlibrary.view.ProgressDialog;
import com.tencent.bugly.crashreport.CrashReport;
@@ -109,14 +109,14 @@
boolean isRecharge = false;
//鍏呭�奸�氫俊鏄惁瀹屾垚
boolean rechargeIsOk = false;
- ActivityWriteTextBinding binding;
+ ActivityWriteTextHnBinding binding;
ConfirmDialog confirmDialog;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
try {
- binding = ActivityWriteTextBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityWriteTextHnBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
nfcWreatActivity = this;
setData();
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardActivity.java
index 91b4f77..64538bd 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardActivity.java
@@ -1,7 +1,5 @@
package com.dayu.henanlibrary.activity;
-import static android.app.Activity.RESULT_OK;
-
import android.content.Intent;
import android.os.Bundle;
import android.text.InputFilter;
@@ -17,12 +15,11 @@
import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.tools.Utils;
import com.dayu.baselibrary.utils.CRC8;
-import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.utils.ToastUtil;
import com.dayu.henanlibrary.HeNanApplication;
import com.dayu.henanlibrary.card.UserCard;
-import com.dayu.henanlibrary.databinding.ActivityNewCardBinding;
+import com.dayu.henanlibrary.databinding.ActivityNewCardHnBinding;
import com.dayu.henanlibrary.dbBean.AdminDataBean;
import com.dayu.henanlibrary.dbBean.ElectricPriceBean;
import com.dayu.henanlibrary.dbBean.IpBean;
@@ -31,6 +28,7 @@
import com.dayu.henanlibrary.net.SocketData;
import com.dayu.henanlibrary.net.SocketNet;
import com.dayu.henanlibrary.socketBean.InitCardRequestBean;
+import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.henanlibrary.utils.SocketUtil;
import com.dayu.henanlibrary.view.ProgressDialog;
import com.hjq.permissions.OnPermissionCallback;
@@ -59,7 +57,7 @@
public static final int SCAN_IDCARD_REQUEST = 1;
UserCardBean userCardBean;
- ActivityNewCardBinding newCardBinding;
+ ActivityNewCardHnBinding newCardBinding;
AdminDataBean adminData;
static NewCardActivity newCardActivity;
@@ -68,7 +66,7 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
newCardActivity = this;
- newCardBinding = ActivityNewCardBinding.inflate(LayoutInflater.from(this));
+ newCardBinding = ActivityNewCardHnBinding.inflate(LayoutInflater.from(this));
setContentView(newCardBinding.getRoot());
setData();
initView();
@@ -78,14 +76,6 @@
private void initView() {
newCardBinding.newCardName.setFilters(new InputFilter[]{new ChineseInputFilter()});
newCardBinding.newCardId.setFilters(new InputFilter[]{new AlphaNumericXFilter(), new InputFilter.LengthFilter(18)});
- //韬唤璇佽瘑鍒�
- newCardBinding.newCardScanBtn.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
-
- getPermission();
- }
- });
newCardBinding.newCardRegistBtn.setOnClickListener(v -> {
@@ -221,41 +211,6 @@
return false;
}
-
- private void getPermission() {
- try {
- XXPermissions.with(this)
- // 鐢宠鍗曚釜鏉冮檺
-// .permission(Permission.RECORD_AUDIO)
- // 鐢宠澶氫釜鏉冮檺
- .permission(Permission.CAMERA)
- // 璁剧疆鏉冮檺璇锋眰鎷︽埅鍣紙灞�閮ㄨ缃級
- //.interceptor(new PermissionInterceptor())
- // 璁剧疆涓嶈Е鍙戦敊璇娴嬫満鍒讹紙灞�閮ㄨ缃級
- //.unchecked()
- .request(new OnPermissionCallback() {
-
- @Override
- public void onGranted(@NonNull List<String> permissions, boolean allGranted) {
- if (allGranted) {
-
- }
- }
-
- @Override
- public void onDenied(@NonNull List<String> permissions, boolean doNotAskAgain) {
- if (doNotAskAgain) {
- // 濡傛灉鏄姘镐箙鎷掔粷灏辫烦杞埌搴旂敤鏉冮檺绯荤粺璁剧疆椤甸潰
- } else {
-// toast("鑾峰彇褰曢煶鍜屾棩鍘嗘潈闄愬け璐�");
- }
- }
- });
- } catch (
- Throwable e) {
- e.printStackTrace();
- }
- }
@Override
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardListActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardListActivity.java
index 6dd4a9f..53be978 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardListActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardListActivity.java
@@ -1,7 +1,6 @@
package com.dayu.henanlibrary.activity;
-
import static com.dayu.baselibrary.view.TitleBar.ClickType_RIGHT_TEXT;
import android.os.Bundle;
@@ -11,11 +10,11 @@
import androidx.recyclerview.widget.LinearLayoutManager;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.adapter.NewCardAdapter;
-import com.dayu.henanlibrary.databinding.ActivityNewcardListBinding;
-import com.dayu.henanlibrary.dbBean.UserCardBean;
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
+import com.dayu.henanlibrary.adapter.NewCardAdapter;
+import com.dayu.henanlibrary.databinding.ActivityNewcardListHnBinding;
+import com.dayu.henanlibrary.dbBean.UserCardBean;
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;
@@ -37,7 +36,7 @@
public class NewCardListActivity extends HNBaseActivity {
- ActivityNewcardListBinding newcardListBinding;
+ ActivityNewcardListHnBinding newcardListBinding;
List<UserCardBean> userCardBeanList = new ArrayList<>();
NewCardAdapter adapter;
private CustomDatePicker beginDatePicker;
@@ -54,7 +53,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- newcardListBinding = ActivityNewcardListBinding.inflate(LayoutInflater.from(this));
+ newcardListBinding = ActivityNewcardListHnBinding.inflate(LayoutInflater.from(this));
setContentView(newcardListBinding.getRoot());
setRightButton();
initDatePicker();
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ParameterActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ParameterActivity.java
index f8ccf5d..1bb9140 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ParameterActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ParameterActivity.java
@@ -6,7 +6,7 @@
import android.view.View;
import com.dayu.baselibrary.activity.BaseActivity;
-import com.dayu.henanlibrary.databinding.ActivityParameterBinding;
+import com.dayu.henanlibrary.databinding.ActivityParameterHnBinding;
/**
* Copyright (C), 2023,
@@ -15,12 +15,12 @@
* Description: 鍙傛暟璁剧疆鐣岄潰
*/
public class ParameterActivity extends BaseActivity {
- ActivityParameterBinding binding;
+ ActivityParameterHnBinding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- binding = ActivityParameterBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityParameterHnBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
initView();
}
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PassWordActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PassWordActivity.java
index f2e9f34..700717b 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PassWordActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PassWordActivity.java
@@ -6,7 +6,7 @@
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.utils.WSMD5;
-import com.dayu.henanlibrary.databinding.ActivityPswBinding;
+import com.dayu.henanlibrary.databinding.ActivityPswHnBinding;
import com.dayu.henanlibrary.dbBean.PassWordBean;
/**
@@ -17,14 +17,14 @@
*/
public class PassWordActivity extends HNBaseActivity {
- ActivityPswBinding pswBinding;
+ ActivityPswHnBinding pswBinding;
PassWordBean passWordBean;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- pswBinding = ActivityPswBinding.inflate(LayoutInflater.from(this));
+ pswBinding = ActivityPswHnBinding.inflate(LayoutInflater.from(this));
setContentView(pswBinding.getRoot());
pswBinding.waterOk.setOnClickListener(v -> {
try {
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PowerActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PowerActivity.java
index 0306f2d..f260325 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PowerActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PowerActivity.java
@@ -5,9 +5,8 @@
import android.view.LayoutInflater;
import android.view.View;
-import com.dayu.baselibrary.activity.BaseActivity;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.databinding.ActivityPowerBinding;
+import com.dayu.henanlibrary.databinding.ActivityPowerHnBinding;
import com.dayu.henanlibrary.dbBean.PowerBean;
/**
@@ -17,13 +16,13 @@
* Description: 鍔熺巼璁剧疆
*/
public class PowerActivity extends HNBaseActivity {
- ActivityPowerBinding powerBinding;
+ ActivityPowerHnBinding powerBinding;
PowerBean powerBean = new PowerBean();
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- powerBinding = ActivityPowerBinding.inflate(LayoutInflater.from(this));
+ powerBinding = ActivityPowerHnBinding.inflate(LayoutInflater.from(this));
setContentView(powerBinding.getRoot());
initData();
initView();
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java
index 59485dd..ed57dca 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java
@@ -10,13 +10,12 @@
import com.dayu.baselibrary.tools.BcdUtil;
import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.utils.CRC8;
-import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.henanlibrary.card.ConfigurationPowerCard;
import com.dayu.henanlibrary.card.DomainCard;
import com.dayu.henanlibrary.card.UserCard;
-import com.dayu.henanlibrary.databinding.ActivityRedCardBinding;
+import com.dayu.henanlibrary.databinding.ActivityRedCardHnBinding;
import com.dayu.henanlibrary.net.SocketCallBack;
import com.dayu.henanlibrary.net.SocketData;
import com.dayu.henanlibrary.net.SocketNet;
@@ -24,6 +23,7 @@
import com.dayu.henanlibrary.tools.NfcReadHelper;
import com.dayu.henanlibrary.tools.WriteCardUtils;
import com.dayu.henanlibrary.utils.CardCommon;
+import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.henanlibrary.utils.SocketUtil;
import com.dayu.henanlibrary.view.ProgressDialog;
@@ -40,14 +40,14 @@
public class ReadCardAcitivy extends BaseNfcActivity {
volatile UserCard userCard;
- ActivityRedCardBinding redCardBinding;
+ ActivityRedCardHnBinding redCardBinding;
Intent intent;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- redCardBinding = ActivityRedCardBinding.inflate(LayoutInflater.from(this));
+ redCardBinding = ActivityRedCardHnBinding.inflate(LayoutInflater.from(this));
setContentView(redCardBinding.getRoot());
}
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeActivity.java
index 8cea9de..63290fb 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeActivity.java
@@ -11,10 +11,9 @@
import com.dayu.baselibrary.tools.BcdUtil;
import com.dayu.baselibrary.utils.CRC8;
-import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.databinding.ActivityRechargeBinding;
+import com.dayu.henanlibrary.databinding.ActivityRechargeHnBinding;
import com.dayu.henanlibrary.dbBean.AdminDataBean;
import com.dayu.henanlibrary.net.SocketCallBack;
import com.dayu.henanlibrary.net.SocketData;
@@ -22,6 +21,7 @@
import com.dayu.henanlibrary.socketBean.BalanceSelecteRequestBean;
import com.dayu.henanlibrary.tools.NfcReadHelper;
import com.dayu.henanlibrary.tools.WriteCardUtils;
+import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.henanlibrary.utils.SocketUtil;
import com.dayu.henanlibrary.view.ProgressDialog;
import com.tencent.bugly.crashreport.CrashReport;
@@ -40,7 +40,7 @@
Intent intent;
boolean userFlag;
- ActivityRechargeBinding binding;
+ ActivityRechargeHnBinding binding;
public static RechargeActivity rechargeActivity;
AdminDataBean adminData;
@@ -50,7 +50,7 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
try {
- binding = ActivityRechargeBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityRechargeHnBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
setPricePoint(binding.rechargeWater);
rechargeActivity = this;
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeDetail.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeDetail.java
index 4d01ab2..e4c5e0a 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeDetail.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeDetail.java
@@ -7,7 +7,7 @@
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.henanlibrary.card.UserCard;
-import com.dayu.henanlibrary.databinding.ActivityRechargeDetailBinding;
+import com.dayu.henanlibrary.databinding.ActivityRechargeDetailHnBinding;
import java.util.Calendar;
@@ -20,7 +20,7 @@
*/
public class RechargeDetail extends HNBaseActivity {
- ActivityRechargeDetailBinding binding;
+ ActivityRechargeDetailHnBinding binding;
UserCard userCard;
String statu;
String userName;
@@ -30,7 +30,7 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- binding = ActivityRechargeDetailBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityRechargeDetailHnBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
try {
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeListActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeListActivity.java
index b97345e..f502fab 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeListActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeListActivity.java
@@ -11,11 +11,11 @@
import com.dayu.baselibrary.utils.ArithUtil;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.adapter.RechargeAdapter;
-import com.dayu.henanlibrary.databinding.ActivityRechargeListBinding;
-import com.dayu.henanlibrary.dbBean.RechargeBean;
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
+import com.dayu.henanlibrary.adapter.RechargeAdapter;
+import com.dayu.henanlibrary.databinding.ActivityRechargeListHnBinding;
+import com.dayu.henanlibrary.dbBean.RechargeBean;
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;
@@ -35,7 +35,7 @@
*/
public class RechargeListActivity extends HNBaseActivity {
- ActivityRechargeListBinding rechargeListBinding;
+ ActivityRechargeListHnBinding rechargeListBinding;
RechargeAdapter adapter;
List<RechargeBean> rechargeList = new ArrayList<>();
@@ -53,7 +53,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- rechargeListBinding = ActivityRechargeListBinding.inflate(LayoutInflater.from(this));
+ rechargeListBinding = ActivityRechargeListHnBinding.inflate(LayoutInflater.from(this));
setContentView(rechargeListBinding.getRoot());
setRightButton();
initDatePicker();
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReplacementActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReplacementActivity.java
index 94fbae1..c6debc3 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReplacementActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReplacementActivity.java
@@ -1,7 +1,6 @@
package com.dayu.henanlibrary.activity;
-
import static com.dayu.baselibrary.view.TitleBar.ClickType_RIGHT_TEXT;
import android.content.Intent;
@@ -14,7 +13,7 @@
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.view.EdtDialog;
import com.dayu.henanlibrary.adapter.ReplacementAdapter;
-import com.dayu.henanlibrary.databinding.ActivityReplacementBinding;
+import com.dayu.henanlibrary.databinding.ActivityReplacementHnBinding;
import com.dayu.henanlibrary.dbBean.UserCardBean;
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
@@ -35,7 +34,7 @@
* 澶囨敞锛� 琛ュ崱鐣岄潰
*/
public class ReplacementActivity extends HNBaseActivity {
- ActivityReplacementBinding newcardListBinding;
+ ActivityReplacementHnBinding newcardListBinding;
List<UserCardBean> userCardBeanList = new ArrayList<>();
ReplacementAdapter adapter;
long beginTime;
@@ -49,7 +48,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- newcardListBinding = ActivityReplacementBinding.inflate(LayoutInflater.from(this));
+ newcardListBinding = ActivityReplacementHnBinding.inflate(LayoutInflater.from(this));
setContentView(newcardListBinding.getRoot());
setRightButton();
initList();
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysActivity.java
index b65789c..c0d5b04 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysActivity.java
@@ -13,7 +13,7 @@
import com.dayu.henanlibrary.card.ManageCard;
import com.dayu.henanlibrary.card.RegisteredCard;
import com.dayu.henanlibrary.card.TestCard;
-import com.dayu.henanlibrary.databinding.ActivityAdminBinding;
+import com.dayu.henanlibrary.databinding.ActivityAdminHnBinding;
import com.dayu.henanlibrary.dbBean.DomainBean;
import com.dayu.henanlibrary.dbBean.PowerBean;
@@ -25,12 +25,12 @@
*/
public class SysActivity extends HNBaseActivity {
- ActivityAdminBinding adminBinding;
+ ActivityAdminHnBinding adminBinding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- adminBinding = ActivityAdminBinding.inflate(LayoutInflater.from(this));
+ adminBinding = ActivityAdminHnBinding.inflate(LayoutInflater.from(this));
setContentView(adminBinding.getRoot());
initView();
@@ -39,7 +39,7 @@
private void initView() {
- //鍒朵綔绠＄悊鍗�
+ //鍒朵綔绠＄悊鍗�
adminBinding.adminAdmin.setOnClickListener(v -> {
Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
ManageCard manageCard = new ManageCard();
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysIpActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysIpActivity.java
index b55c11e..f1ead0a 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysIpActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysIpActivity.java
@@ -5,11 +5,10 @@
import android.view.LayoutInflater;
import android.widget.Toast;
-import com.dayu.baselibrary.activity.BaseActivity;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.utils.ToastUtil;
import com.dayu.henanlibrary.HeNanApplication;
-import com.dayu.henanlibrary.databinding.ActivityIpBinding;
+import com.dayu.henanlibrary.databinding.ActivityIpHnBinding;
import com.dayu.henanlibrary.dbBean.IpBean;
/**
@@ -21,13 +20,13 @@
public class SysIpActivity extends HNBaseActivity {
- ActivityIpBinding ipBinding;
+ ActivityIpHnBinding ipBinding;
IpBean ipBean;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- ipBinding = ActivityIpBinding.inflate(LayoutInflater.from(this));
+ ipBinding = ActivityIpHnBinding.inflate(LayoutInflater.from(this));
setContentView(ipBinding.getRoot());
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/NewCardAdapter.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/NewCardAdapter.java
index 0c64962..b59dd7e 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/NewCardAdapter.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/NewCardAdapter.java
@@ -11,8 +11,7 @@
import com.dayu.baselibrary.databinding.ItemNoMoreBinding;
import com.dayu.baselibrary.utils.DateUtil;
import com.dayu.henanlibrary.R;
-import com.dayu.henanlibrary.databinding.ItemNewCardBinding;
-
+import com.dayu.henanlibrary.databinding.ItemNewCardHnBinding;
import com.dayu.henanlibrary.dbBean.UserCardBean;
import java.util.List;
@@ -39,7 +38,7 @@
ItemNoMoreBinding emptyView = DataBindingUtil.inflate((LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE), com.dayu.baselibrary.R.layout.item_no_more, parent, false);
return new ViewHolderEmpty(emptyView);
} else {
- ItemNewCardBinding binding = DataBindingUtil.inflate((LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE), R.layout.item_new_card, parent, false);
+ ItemNewCardHnBinding binding = DataBindingUtil.inflate((LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE), R.layout.item_new_card_hn, parent, false);
return new ViewHolder(binding);
}
@@ -78,17 +77,17 @@
static class ViewHolder extends RecyclerView.ViewHolder {
- ItemNewCardBinding mBinding;
+ ItemNewCardHnBinding mBinding;
- public ItemNewCardBinding getBinding() {
+ public ItemNewCardHnBinding getBinding() {
return mBinding;
}
- public void setBinding(ItemNewCardBinding binding) {
+ public void setBinding(ItemNewCardHnBinding binding) {
this.mBinding = binding;
}
- public ViewHolder(ItemNewCardBinding itemView) {
+ public ViewHolder(ItemNewCardHnBinding itemView) {
super(itemView.getRoot());
this.mBinding = itemView;
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/RechargeAdapter.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/RechargeAdapter.java
index e70dca9..c6c0bc5 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/RechargeAdapter.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/RechargeAdapter.java
@@ -11,8 +11,7 @@
import com.dayu.baselibrary.databinding.ItemNoMoreBinding;
import com.dayu.baselibrary.utils.DateUtil;
import com.dayu.henanlibrary.R;
-
-import com.dayu.henanlibrary.databinding.ItemRechargeBinding;
+import com.dayu.henanlibrary.databinding.ItemRechargeHnBinding;
import com.dayu.henanlibrary.dbBean.RechargeBean;
import java.util.List;
@@ -39,7 +38,7 @@
ItemNoMoreBinding emptyView = DataBindingUtil.inflate((LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE), com.dayu.baselibrary.R.layout.item_no_more, parent, false);
return new ViewHolderEmpty(emptyView);
} else {
- ItemRechargeBinding binding = DataBindingUtil.inflate((LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE), R.layout.item_recharge, parent, false);
+ ItemRechargeHnBinding binding = DataBindingUtil.inflate((LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE), R.layout.item_recharge_hn, parent, false);
return new ViewHolder(binding);
}
@@ -78,17 +77,17 @@
static class ViewHolder extends RecyclerView.ViewHolder {
- ItemRechargeBinding mBinding;
+ ItemRechargeHnBinding mBinding;
- public ItemRechargeBinding getBinding() {
+ public ItemRechargeHnBinding getBinding() {
return mBinding;
}
- public void setBinding(ItemRechargeBinding binding) {
+ public void setBinding(ItemRechargeHnBinding binding) {
this.mBinding = binding;
}
- public ViewHolder(ItemRechargeBinding itemView) {
+ public ViewHolder(ItemRechargeHnBinding itemView) {
super(itemView.getRoot());
this.mBinding = itemView;
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/ReplacementAdapter.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/ReplacementAdapter.java
index 563df18..ce32a68 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/ReplacementAdapter.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/adapter/ReplacementAdapter.java
@@ -12,7 +12,7 @@
import com.dayu.baselibrary.utils.DateUtil;
import com.dayu.henanlibrary.R;
import com.dayu.henanlibrary.activity.ReplacementActivity;
-import com.dayu.henanlibrary.databinding.ItemReplacementBinding;
+import com.dayu.henanlibrary.databinding.ItemReplacementHnBinding;
import com.dayu.henanlibrary.dbBean.UserCardBean;
import java.util.List;
@@ -35,7 +35,7 @@
ItemNoMoreBinding emptyView = DataBindingUtil.inflate((LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE), com.dayu.baselibrary.R.layout.item_no_more, parent, false);
return new ViewHolderEmpty(emptyView);
} else {
- ItemReplacementBinding binding = DataBindingUtil.inflate((LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE), R.layout.item_replacement, parent, false);
+ ItemReplacementHnBinding binding = DataBindingUtil.inflate((LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE), R.layout.item_replacement_hn, parent, false);
return new ViewHolder(binding);
}
@@ -76,17 +76,17 @@
static class ViewHolder extends RecyclerView.ViewHolder {
- ItemReplacementBinding mBinding;
+ ItemReplacementHnBinding mBinding;
- public ItemReplacementBinding getBinding() {
+ public ItemReplacementHnBinding getBinding() {
return mBinding;
}
- public void setBinding(ItemReplacementBinding binding) {
+ public void setBinding(ItemReplacementHnBinding binding) {
this.mBinding = binding;
}
- public ViewHolder(ItemReplacementBinding itemView) {
+ public ViewHolder(ItemReplacementHnBinding itemView) {
super(itemView.getRoot());
this.mBinding = itemView;
diff --git a/henanlibrary/src/main/res/layout/activity_admin.xml b/henanlibrary/src/main/res/layout/activity_admin_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_admin.xml
rename to henanlibrary/src/main/res/layout/activity_admin_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_admin_setup.xml b/henanlibrary/src/main/res/layout/activity_admin_setup_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_admin_setup.xml
rename to henanlibrary/src/main/res/layout/activity_admin_setup_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_domain.xml b/henanlibrary/src/main/res/layout/activity_domain_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_domain.xml
rename to henanlibrary/src/main/res/layout/activity_domain_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_electric_meter.xml b/henanlibrary/src/main/res/layout/activity_electric_meter_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_electric_meter.xml
rename to henanlibrary/src/main/res/layout/activity_electric_meter_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_electric_price.xml b/henanlibrary/src/main/res/layout/activity_electric_price_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_electric_price.xml
rename to henanlibrary/src/main/res/layout/activity_electric_price_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_electricty_price.xml b/henanlibrary/src/main/res/layout/activity_electricty_price_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_electricty_price.xml
rename to henanlibrary/src/main/res/layout/activity_electricty_price_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_home.xml b/henanlibrary/src/main/res/layout/activity_home_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_home.xml
rename to henanlibrary/src/main/res/layout/activity_home_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_identyfying.xml b/henanlibrary/src/main/res/layout/activity_identyfying_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_identyfying.xml
rename to henanlibrary/src/main/res/layout/activity_identyfying_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_ip.xml b/henanlibrary/src/main/res/layout/activity_ip_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_ip.xml
rename to henanlibrary/src/main/res/layout/activity_ip_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_location.xml b/henanlibrary/src/main/res/layout/activity_location_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_location.xml
rename to henanlibrary/src/main/res/layout/activity_location_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_main.xml b/henanlibrary/src/main/res/layout/activity_main_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_main.xml
rename to henanlibrary/src/main/res/layout/activity_main_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_manage_setup.xml b/henanlibrary/src/main/res/layout/activity_manage_setup_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_manage_setup.xml
rename to henanlibrary/src/main/res/layout/activity_manage_setup_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_my.xml b/henanlibrary/src/main/res/layout/activity_my_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_my.xml
rename to henanlibrary/src/main/res/layout/activity_my_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_new_card.xml b/henanlibrary/src/main/res/layout/activity_new_card_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_new_card.xml
rename to henanlibrary/src/main/res/layout/activity_new_card_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_newcard_list.xml b/henanlibrary/src/main/res/layout/activity_newcard_list_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_newcard_list.xml
rename to henanlibrary/src/main/res/layout/activity_newcard_list_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_parameter.xml b/henanlibrary/src/main/res/layout/activity_parameter_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_parameter.xml
rename to henanlibrary/src/main/res/layout/activity_parameter_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_patch.xml b/henanlibrary/src/main/res/layout/activity_patch_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_patch.xml
rename to henanlibrary/src/main/res/layout/activity_patch_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_patch_list.xml b/henanlibrary/src/main/res/layout/activity_patch_list_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_patch_list.xml
rename to henanlibrary/src/main/res/layout/activity_patch_list_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_power.xml b/henanlibrary/src/main/res/layout/activity_power_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_power.xml
rename to henanlibrary/src/main/res/layout/activity_power_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_psw.xml b/henanlibrary/src/main/res/layout/activity_psw_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_psw.xml
rename to henanlibrary/src/main/res/layout/activity_psw_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_read_text.xml b/henanlibrary/src/main/res/layout/activity_read_text_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_read_text.xml
rename to henanlibrary/src/main/res/layout/activity_read_text_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_recharge_detail.xml b/henanlibrary/src/main/res/layout/activity_recharge_detail_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_recharge_detail.xml
rename to henanlibrary/src/main/res/layout/activity_recharge_detail_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_recharge_ext.xml b/henanlibrary/src/main/res/layout/activity_recharge_ext_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_recharge_ext.xml
rename to henanlibrary/src/main/res/layout/activity_recharge_ext_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_recharge.xml b/henanlibrary/src/main/res/layout/activity_recharge_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_recharge.xml
rename to henanlibrary/src/main/res/layout/activity_recharge_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_recharge_list.xml b/henanlibrary/src/main/res/layout/activity_recharge_list_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_recharge_list.xml
rename to henanlibrary/src/main/res/layout/activity_recharge_list_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_red_card.xml b/henanlibrary/src/main/res/layout/activity_red_card_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_red_card.xml
rename to henanlibrary/src/main/res/layout/activity_red_card_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_replacement.xml b/henanlibrary/src/main/res/layout/activity_replacement_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_replacement.xml
rename to henanlibrary/src/main/res/layout/activity_replacement_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_test.xml b/henanlibrary/src/main/res/layout/activity_test.xml
deleted file mode 100644
index ab7ceba..0000000
--- a/henanlibrary/src/main/res/layout/activity_test.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
-
- <TextView
- android:id="@+id/testBtn"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="娴嬭瘯" />
-
- <ImageView
- android:id="@+id/img"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:scaleType="fitCenter" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/henanlibrary/src/main/res/layout/activity_water_meter.xml b/henanlibrary/src/main/res/layout/activity_water_meter_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_water_meter.xml
rename to henanlibrary/src/main/res/layout/activity_water_meter_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_water_num.xml b/henanlibrary/src/main/res/layout/activity_water_num_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_water_num.xml
rename to henanlibrary/src/main/res/layout/activity_water_num_hn.xml
diff --git a/henanlibrary/src/main/res/layout/activity_write_text.xml b/henanlibrary/src/main/res/layout/activity_write_text_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/activity_write_text.xml
rename to henanlibrary/src/main/res/layout/activity_write_text_hn.xml
diff --git a/henanlibrary/src/main/res/layout/item_new_card.xml b/henanlibrary/src/main/res/layout/item_new_card_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/item_new_card.xml
rename to henanlibrary/src/main/res/layout/item_new_card_hn.xml
diff --git a/henanlibrary/src/main/res/layout/item_patch.xml b/henanlibrary/src/main/res/layout/item_patch_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/item_patch.xml
rename to henanlibrary/src/main/res/layout/item_patch_hn.xml
diff --git a/henanlibrary/src/main/res/layout/item_recharge.xml b/henanlibrary/src/main/res/layout/item_recharge_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/item_recharge.xml
rename to henanlibrary/src/main/res/layout/item_recharge_hn.xml
diff --git a/henanlibrary/src/main/res/layout/item_replacement.xml b/henanlibrary/src/main/res/layout/item_replacement_hn.xml
similarity index 100%
rename from henanlibrary/src/main/res/layout/item_replacement.xml
rename to henanlibrary/src/main/res/layout/item_replacement_hn.xml
diff --git a/qihealonelibrary/build.gradle b/qihealonelibrary/build.gradle
index 3b51ea6..5079714 100644
--- a/qihealonelibrary/build.gradle
+++ b/qihealonelibrary/build.gradle
@@ -38,7 +38,7 @@
dependencies {
- implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs')
+ implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
compileOnly 'com.android.support:appcompat-v7:28.0.0'
compileOnly 'com.android.support.constraint:constraint-layout:1.1.3'
diff --git a/qihealonelibrary/src/main/AndroidManifest.xml b/qihealonelibrary/src/main/AndroidManifest.xml
index 4328df0..b945f37 100644
--- a/qihealonelibrary/src/main/AndroidManifest.xml
+++ b/qihealonelibrary/src/main/AndroidManifest.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.dayu.qihealonelibrary">
+ >
<application
android:allowBackup="true"
@@ -8,18 +10,18 @@
<activity
- android:name="com.dayu.qihealonelibrary.activity.AdminSetupActivity"
+ android:name="com.dayu.qihealonelibrary.activity.AdminSetupActivityQHAlone"
android:exported="true">
</activity>
<activity
- android:name="com.dayu.qihealonelibrary.activity.HomeActivity"
+ android:name="com.dayu.qihealonelibrary.activity.HomeActivityQHAlone"
android:exported="true">
</activity>
<activity
- android:name="com.dayu.qihealonelibrary.activity.NewCardActivity"
+ android:name="com.dayu.qihealonelibrary.activity.NewCardActivityQHAlone"
android:exported="true"
android:launchMode="singleTop"
android:screenOrientation="portrait">
@@ -29,15 +31,15 @@
</intent-filter>
</activity>
<activity
- android:name="com.dayu.qihealonelibrary.activity.SysActivity"
+ android:name="com.dayu.qihealonelibrary.activity.SysActivityQHAlone"
android:exported="true">
</activity>
- <activity android:name="com.dayu.qihealonelibrary.activity.PassWordActivity" />
- <activity android:name="com.dayu.qihealonelibrary.activity.MyActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.PassWordActivityQHAlone" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.MyActivityQHAlone" />
<activity
- android:name="com.dayu.qihealonelibrary.activity.RechargeActivity"
+ android:name="com.dayu.qihealonelibrary.activity.RechargeActivityQHAlone"
android:exported="true"
android:launchMode="singleTop">
<intent-filter>
@@ -57,7 +59,7 @@
</intent-filter>
</activity>
<activity
- android:name="com.dayu.qihealonelibrary.activity.NFCWreatActivity"
+ android:name="com.dayu.qihealonelibrary.activity.NFCWreatActivityQHAlone"
android:exported="true"
android:launchMode="singleTop">
<intent-filter>
@@ -65,17 +67,17 @@
<data android:mimeType="text/plain" />
</intent-filter>
</activity>
- <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.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.PasswordCardActivity" />
- <activity android:name="com.dayu.qihealonelibrary.activity.RegionActivity" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.PasswordCardActivityQHAlone" />
+ <activity android:name="com.dayu.qihealonelibrary.activity.RegionActivityQHAlone" />
</application>
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java
deleted file mode 100644
index 5c22d01..0000000
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivity.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package com.dayu.qihealonelibrary.activity;
-
-import android.content.Context;
-import android.os.Build;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-
-import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.qihealonelibrary.databinding.ActivityAdminSetupBinding;
-import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
-import com.example.pickerviewlibrary.picker.TeaPickerView;
-import com.example.pickerviewlibrary.picker.entity.PickerData;
-import com.example.pickerviewlibrary.picker.listener.OnPickerClickListener;
-import com.tencent.bugly.crashreport.CrashReport;
-
-import java.lang.reflect.Method;
-import java.util.zip.CRC32;
-
-/**
- * Copyright (C), 2023,
- * Author: zuo
- * Date: 2023-11-10 19:52
- * Description: 绠＄悊鍛樹俊鎭缃�
- */
-public class AdminSetupActivity extends QHAloneBaseActivity {
-
- ActivityAdminSetupBinding adminBinding;
-
- public static AdminSetupActivity adminSetupActivity;
- AdminDataBean adminData = new AdminDataBean();
- TeaPickerView pickerView;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- try {
- adminBinding = ActivityAdminSetupBinding.inflate(LayoutInflater.from(this));
- setContentView(adminBinding.getRoot());
- adminSetupActivity = this;
- setData();
- initView();
- } catch (Exception e) {
- CrashReport.postCatchedException(e);
- e.printStackTrace();
-
- }
- }
-
- private void initView() {
- adminBinding.setupOk.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (!TextUtils.isEmpty(adminData.getCun())
- && !TextUtils.isEmpty(adminBinding.adminSerial.getText().toString())
- ) {
- if (Integer.valueOf(adminBinding.adminSerial.getText().toString()) <= 16777215) {
- adminBinding.adminAddressCode.setText(adminData.getAddressCode());
- adminData.setSerial(adminBinding.adminSerial.getText().toString());
- baseDao.adminDao().insert(adminData);
- setData();
-
- TipUtil.show(AdminSetupActivity.this, "璁剧疆鎴愬姛", new TipUtil.TipListener() {
- @Override
- public void onCancle() {
- AdminSetupActivity.this.finish();
- }
- });
- } else {
- TipUtil.show(AdminSetupActivity.this, "杈撳叆鐨勬暟瀛椾笉鑳借秴杩�16777215");
- }
- } else {
- TipUtil.show(AdminSetupActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
- }
- }
- });
- adminBinding.choseAddress.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
- imm.hideSoftInputFromWindow(adminBinding.adminSerial.getWindowToken(), 0);
- intiPickerView();
- }
- });
- pickerView = new TeaPickerView(this);
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- pickerView.initAddressData();
- }
- }).start();
-
- }
-
-
- private void setData() {
- try {
- AdminDataBean adminData = baseDao.adminDao().findFirst();
-
- if (adminData != null) {
- this.adminData = adminData;
- adminBinding.adminSerial.setText(adminData.getSerial());
- adminBinding.adminAddressCode.setText(adminData.getAddressCode());
- adminBinding.adminAddress.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
- } else {
- adminBinding.adminSerial.setText("12" + generateUniqueNumber(getSN()));
- }
-
- } catch (Exception e) {
- CrashReport.postCatchedException(e);
- e.printStackTrace();
- }
- }
-
-
- private void intiPickerView() {
-
- try {
- pickerView.setScreenH(2)
- .setDiscolourHook(true)
- .setRadius(25)
- .setContentLine(true)
- .setRadius(25)
- .build();
- pickerView.show(adminBinding.choseAddress);
- pickerView.setOnPickerClickListener(new OnPickerClickListener() {
- @Override
- public void OnPickerClick(PickerData pickerData) {
- adminData.setSheng("娌冲崡");
- adminData.setShi(pickerData.getFirstText().getName());
- adminData.setXian(pickerData.getSecondText().getName());
- if (pickerData.getThirdText() != null) {
- adminData.setZhen(pickerData.getThirdText().getName());
- } else {
- adminData.setZhen("");
- }
- if (pickerData.getFourthText() != null) {
- adminData.setCun(pickerData.getFourthText().getName());
- adminData.setAddressCode(pickerData.getFourthText().getCode());
- } else {
- adminData.setCun("");
- adminData.setAddressCode(pickerData.getSecondText().getCode());
- }
- adminBinding.adminAddress.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
- adminBinding.adminAddressCode.setText(adminData.getAddressCode());
- pickerView.dismiss();
- }
- });
- } catch (Exception e) {
- CrashReport.postCatchedException(e);
- e.printStackTrace();
-
- }
- }
-
- public static String getSN() {
- String serial = null;
- try {
- Class<?> c = Class.forName("android.os.SystemProperties");
- Method get = c.getMethod("get", String.class);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
- try {
- serial = (String) get.invoke(c, "ro.sunmi.serial");
- } catch (Exception e) {
- e.printStackTrace();
- }
- return serial;
- } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- serial = Build.getSerial();
- return serial;
- } else {
- //瀹夊崜8浠ヤ笅浣跨敤Build.SERIAL鐩稿悓鏂瑰紡
- //return Build.SERIAL;
- try {
- serial = (String) get.invoke(c, "ro.serialno");
- } catch (Exception e) {
- e.printStackTrace();
- }
- return serial;
- }
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(e);
- } catch (NoSuchMethodException e) {
- throw new RuntimeException(e);
- }
- }
-
- public static String generateUniqueNumber(String input) {
- try {
- // 浣跨敤CRC32鍝堝笇鍑芥暟
- CRC32 crc32 = new CRC32();
- crc32.update(input.getBytes());
- long crcValue = crc32.getValue();
- // 灏嗗搱甯屽�兼槧灏勫埌6浣嶆暟瀛楃殑鑼冨洿
- long sixDigitNumber = Math.abs(crcValue) % 1000000;
- // 鏍煎紡鍖栦负6浣嶆暟瀛楃殑瀛楃涓�
- return String.format("%06d", sixDigitNumber);
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
-}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivityQHAlone.java
new file mode 100644
index 0000000..4f4eba1
--- /dev/null
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/AdminSetupActivityQHAlone.java
@@ -0,0 +1,94 @@
+package com.dayu.qihealonelibrary.activity;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+
+import com.dayu.baselibrary.utils.TipUtil;
+import com.dayu.qihealonelibrary.databinding.ActivityAdminSetupQhaBinding;
+import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
+import com.tencent.bugly.crashreport.CrashReport;
+
+/**
+ * Copyright (C), 2023,
+ * Author: zuo
+ * Date: 2023-11-10 19:52
+ * Description: 绠＄悊鍛樹俊鎭缃�
+ */
+public class AdminSetupActivityQHAlone extends BaseActivityQHAlone {
+
+ ActivityAdminSetupQhaBinding adminBinding;
+
+ public static AdminSetupActivityQHAlone adminSetupActivity;
+ AdminDataBean adminData = new AdminDataBean();
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ try {
+ adminBinding = ActivityAdminSetupQhaBinding.inflate(LayoutInflater.from(this));
+ setContentView(adminBinding.getRoot());
+ adminSetupActivity = this;
+ setViewData();
+ initView();
+ } catch (Exception e) {
+ CrashReport.postCatchedException(e);
+ e.printStackTrace();
+ }
+ }
+
+ private void initView() {
+ adminBinding.setupOk.setOnClickListener(v -> {
+ String strSerial = adminBinding.adminSerial.getText().toString();
+ String strAddressCode = adminBinding.adminAddressCode.getText().toString();
+ if (!TextUtils.isEmpty(strAddressCode)
+ && !TextUtils.isEmpty(strSerial)) {
+
+ if (Integer.valueOf(adminBinding.adminSerial.getText().toString()) <= 65535) {
+ if (Integer.valueOf(adminBinding.adminSerial.getText().toString()) <= 65535) {
+ adminData.setAddressCode(strAddressCode);
+ adminData.setSerial(strSerial);
+ baseDao.adminDao().insert(adminData);
+ TipUtil.show(AdminSetupActivityQHAlone.this, "璁剧疆鎴愬姛", new TipUtil.TipListener() {
+ @Override
+ public void onCancle() {
+ AdminSetupActivityQHAlone.this.finish();
+ }
+ });
+ } else {
+ TipUtil.show(AdminSetupActivityQHAlone.this, "杈撳叆鐨勫尯鍩熷彿涓嶈兘瓒呰繃65535");
+ }
+
+ } else {
+ TipUtil.show(AdminSetupActivityQHAlone.this, "杈撳叆鐨勮澶囩紪鍙蜂笉鑳借秴杩�65535");
+ }
+ } else {
+ TipUtil.show(AdminSetupActivityQHAlone.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
+ }
+ });
+ }
+
+
+ private void setViewData() {
+ try {
+ AdminDataBean adminData = baseDao.adminDao().findFirst();
+ if (adminData != null) {
+ this.adminData = adminData;
+ adminBinding.adminSerial.setText(adminData.getSerial());
+ adminBinding.adminAddressCode.setText(adminData.getAddressCode());
+ }
+
+ } catch (Exception e) {
+ CrashReport.postCatchedException(e);
+ e.printStackTrace();
+ }
+ }
+
+
+
+
+
+
+
+
+}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/QHAloneBaseActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivityQHAlone.java
similarity index 98%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/QHAloneBaseActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivityQHAlone.java
index 510bcda..f9c4679 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/QHAloneBaseActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseActivityQHAlone.java
@@ -18,7 +18,7 @@
* Created by zuoxiao on 2018/12/20.
*/
-public class QHAloneBaseActivity extends BaseActivity {
+public class BaseActivityQHAlone extends BaseActivity {
private final String TAG = "BaseActivity";
public TitleBar titleBar = null;
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivityQHAlone.java
similarity index 93%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivityQHAlone.java
index 438c33d..4de667f 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivityQHAlone.java
@@ -1,15 +1,8 @@
package com.dayu.qihealonelibrary.activity;
-
-/**
- * Created by zuo on 2018/12/2.
- */
-
-
import android.app.Activity;
import android.app.PendingIntent;
import android.content.Intent;
import android.nfc.NfcAdapter;
-import android.nfc.Tag;
import android.os.Handler;
import com.dayu.baselibrary.utils.TipUtil;
@@ -17,7 +10,7 @@
/**
- * Author:Created by Ricky on 2017/8/25.
+ * Author:Createdby zuo on 2018/12/2.
* Email:584182977@qq.com
* Description:
* 瀛愮被鍦╫nNewIntent鏂规硶涓繘琛孨FC鏍囩鐩稿叧鎿嶄綔銆�
@@ -25,7 +18,7 @@
* 鍦╫nNewIntent鏂规硶涓墽琛宨ntent浼犻�掕繃鏉ョ殑Tag鏁版嵁
* 灏哊FC鏍囩鍗￠潬杩戞墜鏈哄悗閮紙NFC鏍囩鍗″彲缃戜笂鑷璐拱锛�
*/
-public class BaseNfcActivity extends QHAloneBaseActivity {
+public class BaseNfcActivityQHAlone extends BaseActivityQHAlone {
protected NfcAdapter mNfcAdapter;
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/DomainActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/DomainActivityQHAlone.java
similarity index 90%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/DomainActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/DomainActivityQHAlone.java
index c6554f2..6ab41dd 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/DomainActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/DomainActivityQHAlone.java
@@ -6,7 +6,8 @@
import android.view.View;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.qihealonelibrary.databinding.ActivityDomainBinding;
+
+import com.dayu.qihealonelibrary.databinding.ActivityDomainQhaBinding;
import com.dayu.qihealonelibrary.dbBean.DomainBean;
@@ -17,14 +18,14 @@
* Time: 10:19
* 澶囨敞锛� 璁剧疆鍗″煙鍚嶅拰ip
*/
-public class DomainActivity extends QHAloneBaseActivity {
- ActivityDomainBinding binding;
+public class DomainActivityQHAlone extends BaseActivityQHAlone {
+ ActivityDomainQhaBinding binding;
DomainBean domainBean;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- binding = ActivityDomainBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityDomainQhaBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
initData();
binding.electricOk.setOnClickListener(new View.OnClickListener() {
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ElectricPriceActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ElectricPriceActivityQHAlone.java
similarity index 91%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ElectricPriceActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ElectricPriceActivityQHAlone.java
index 1948f0a..376fd17 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ElectricPriceActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ElectricPriceActivityQHAlone.java
@@ -8,7 +8,8 @@
import android.view.View;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.qihealonelibrary.databinding.ActivityElectricPriceBinding;
+
+import com.dayu.qihealonelibrary.databinding.ActivityElectricPriceQhaBinding;
import com.dayu.qihealonelibrary.dbBean.ElectricPriceBean;
@@ -18,15 +19,15 @@
* Date: 2023-11-10 10:18
* Description: 鐢甸噺鍗曚环璁剧疆
*/
-public class ElectricPriceActivity extends QHAloneBaseActivity {
+public class ElectricPriceActivityQHAlone extends BaseActivityQHAlone {
- ActivityElectricPriceBinding electricPriceBinding;
+ ActivityElectricPriceQhaBinding electricPriceBinding;
ElectricPriceBean electricPriceBean;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- electricPriceBinding = ActivityElectricPriceBinding.inflate(LayoutInflater.from(this));
+ electricPriceBinding = ActivityElectricPriceQhaBinding.inflate(LayoutInflater.from(this));
setContentView(electricPriceBinding.getRoot());
initData();
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivityQHAlone.java
similarity index 72%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivityQHAlone.java
index fa7d852..745efc4 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivityQHAlone.java
@@ -8,7 +8,7 @@
import android.widget.Toast;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.qihealonelibrary.databinding.ActivityHomeBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityHomeQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
@@ -19,16 +19,16 @@
* Date: 2023-11-6 19:52
* Description: 涓荤晫闈�
*/
-public class HomeActivity extends QHAloneBaseActivity {
+public class HomeActivityQHAlone extends BaseActivityQHAlone {
- public static HomeActivity homeActivity;
- ActivityHomeBinding homeBinding;
+ public static HomeActivityQHAlone homeActivity;
+ ActivityHomeQhaBinding homeBinding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
homeActivity = this;
- homeBinding = ActivityHomeBinding.inflate(LayoutInflater.from(this));
+ homeBinding = ActivityHomeQhaBinding.inflate(LayoutInflater.from(this));
setContentView(homeBinding.getRoot());
initView();
@@ -44,7 +44,7 @@
public void onClick(View v) {
AdminDataBean adminData = baseDao.adminDao().findFirst();
if (adminData != null) {
- startActivity(new Intent(HomeActivity.this, NewCardActivity.class));
+ startActivity(new Intent(HomeActivityQHAlone.this, NewCardActivityQHAlone.class));
} else {
TipUtil.show("璇峰厛璁剧疆鍦板潃淇℃伅");
}
@@ -56,7 +56,7 @@
public void onClick(View v) {
AdminDataBean adminData = baseDao.adminDao().findFirst();
if (adminData != null) {
- startActivity(new Intent(HomeActivity.this, RechargeActivity.class));
+ startActivity(new Intent(HomeActivityQHAlone.this, RechargeActivityQHAlone.class));
} else {
TipUtil.show("璇峰厛璁剧疆鍦板潃淇℃伅");
}
@@ -66,28 +66,28 @@
homeBinding.homeRedCard.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(HomeActivity.this, ReadCardAcitivy.class));
+ startActivity(new Intent(HomeActivityQHAlone.this, ReadCardAcitivy.class));
}
});
//绠＄悊绯荤粺鐣岄潰
homeBinding.homeAdmin.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(HomeActivity.this, SysActivity.class));
+ startActivity(new Intent(HomeActivityQHAlone.this, SysActivityQHAlone.class));
}
});
//鍙傛暟璁剧疆
homeBinding.homeParameter.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(HomeActivity.this, ParameterActivity.class));
+ startActivity(new Intent(HomeActivityQHAlone.this, ParameterActivityQHAlone.class));
}
});
homeBinding.homeMy.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(HomeActivity.this, MyActivity.class));
+ startActivity(new Intent(HomeActivityQHAlone.this, MyActivityQHAlone.class));
}
});
@@ -107,10 +107,10 @@
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_BACK) {
if ((System.currentTimeMillis() - mExitTime) > 2000) {
- Toast.makeText(HomeActivity.this, "鍐嶆寜涓�娆￠��鍑虹▼搴�", Toast.LENGTH_SHORT).show();
+ Toast.makeText(HomeActivityQHAlone.this, "鍐嶆寜涓�娆￠��鍑虹▼搴�", Toast.LENGTH_SHORT).show();
mExitTime = System.currentTimeMillis();
} else {
- HomeActivity.this.finish();
+ HomeActivityQHAlone.this.finish();
}
return true;
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivityQHAlone.java
similarity index 94%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivityQHAlone.java
index fcdf977..9993883 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivityQHAlone.java
@@ -13,10 +13,9 @@
import com.dayu.qihealonelibrary.card.ManageCard;
import com.dayu.qihealonelibrary.card.RegisteredCard;
import com.dayu.qihealonelibrary.card.TestCard;
-import com.dayu.qihealonelibrary.databinding.ActivityIdentyfyingBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityIdentyfyingQhaBinding;
import com.dayu.qihealonelibrary.dbBean.CardData;
import com.dayu.qihealonelibrary.dbBean.IdentityBean;
-
import com.dayu.qihealonelibrary.utils.CardCommon;
import java.util.Arrays;
@@ -28,9 +27,9 @@
* Time: 10:21
* 澶囨敞锛氬崱鏍囪瘑璁剧疆
*/
-public class IdentifyingActivity extends QHAloneBaseActivity {
+public class IdentifyingActivityQHAlone extends BaseActivityQHAlone {
- ActivityIdentyfyingBinding binding;
+ ActivityIdentyfyingQhaBinding binding;
String[] nianfen = {"绠＄悊鍗�", "娓呴浂鍗�", "閲嶆柊娉ㄥ唽璁惧鍗�", "鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�", "娴嬭瘯鍗�", "璁惧淇℃伅鍗�", "姘存车鍔熺巼鍗�"};
@@ -44,12 +43,12 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- binding = ActivityIdentyfyingBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityIdentyfyingQhaBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
binding.chooseCardType.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- ChooseView.getIntence(IdentifyingActivity.this, Arrays.asList(nianfen.clone()), new ChooseView.ChooseCallBack() {
+ ChooseView.getIntence(IdentifyingActivityQHAlone.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/ManageSetUpActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManageSetUpActivityQHAlone.java
similarity index 81%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManageSetUpActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManageSetUpActivityQHAlone.java
index 19681fb..10a89bd 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManageSetUpActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ManageSetUpActivityQHAlone.java
@@ -8,7 +8,7 @@
* Date: 2023-11-08 16:52
* Description:绠＄悊鍗¤缃晫闈�
*/
-public class ManageSetUpActivity extends QHAloneBaseActivity {
+public class ManageSetUpActivityQHAlone extends BaseActivityQHAlone {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java
similarity index 89%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java
index 7049960..312b576 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java
@@ -18,13 +18,10 @@
import com.dayu.baselibrary.view.PassWordDialog;
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
-import com.dayu.qihealonelibrary.databinding.ActivityMyBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityMyQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
-
import com.dayu.qihealonelibrary.utils.DeviceNumberUtils;
-
import com.dayu.qihealonelibrary.utils.ExcelUtil;
-
import java.io.File;
import java.util.ArrayList;
@@ -37,7 +34,7 @@
* Date: 2023-11-10 19:52
* Description: 涓汉涓績
*/
-public class MyActivity extends QHAloneBaseActivity {
+public class MyActivityQHAlone extends BaseActivityQHAlone {
private CustomDatePicker beginDatePicker;
@@ -46,12 +43,12 @@
long endTime;
boolean isRechargeList = false;
- ActivityMyBinding myBinding;
+ ActivityMyQhaBinding myBinding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- myBinding = ActivityMyBinding.inflate(LayoutInflater.from(this));
+ myBinding = ActivityMyQhaBinding.inflate(LayoutInflater.from(this));
setContentView(myBinding.getRoot());
getVersion(this);
setData();
@@ -63,13 +60,13 @@
myBinding.cardReplacement.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(MyActivity.this, ReplacementActivity.class));
+ startActivity(new Intent(MyActivityQHAlone.this, ReplacementActivityQHAlone.class));
}
});
myBinding.myAdmin.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- PassWordDialog passWordDialog = new PassWordDialog(MyActivity.this, new Intent(MyActivity.this, AdminSetupActivity.class));
+ PassWordDialog passWordDialog = new PassWordDialog(MyActivityQHAlone.this, new Intent(MyActivityQHAlone.this, AdminSetupActivityQHAlone.class));
passWordDialog.show();
// startActivity(new Intent(MyActivity.this, AdminSetupActivity.class));
}
@@ -77,19 +74,19 @@
myBinding.myPsw.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(MyActivity.this, PassWordActivity.class));
+ startActivity(new Intent(MyActivityQHAlone.this, PassWordActivityQHAlone.class));
}
});
myBinding.myRechargeListLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(MyActivity.this, RechargeListActivity.class));
+ startActivity(new Intent(MyActivityQHAlone.this, RechargeListActivityQHAlone.class));
}
});
myBinding.myNewCardListLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(MyActivity.this, NewCardListActivity.class));
+ startActivity(new Intent(MyActivityQHAlone.this, NewCardListActivityQHAlone.class));
}
});
myBinding.myNewCardOut.setOnClickListener(new View.OnClickListener() {
@@ -116,13 +113,13 @@
public boolean handleMessage(@NonNull Message msg) {
switch (msg.what) {
case 1:
- TipUtil.show(MyActivity.this, "瀵煎嚭鎴愬姛!");
+ TipUtil.show(MyActivityQHAlone.this, "瀵煎嚭鎴愬姛!");
break;
case 3:
- TipUtil.show(MyActivity.this, "璁板綍涓虹┖!");
+ TipUtil.show(MyActivityQHAlone.this, "璁板綍涓虹┖!");
break;
default:
- TipUtil.show(MyActivity.this, "瀵煎嚭澶辫触!");
+ TipUtil.show(MyActivityQHAlone.this, "瀵煎嚭澶辫触!");
break;
}
stopAnim();
@@ -162,7 +159,7 @@
String[] title;
String fileName;
if (listData == null || listData.size() == 0) {
- TipUtil.show(MyActivity.this, "璁板綍涓虹┖");
+ TipUtil.show(MyActivityQHAlone.this, "璁板綍涓虹┖");
return;
}
if (isRechargeList) {
@@ -173,7 +170,7 @@
fileName = file.toString() + "/" + ExcelUtil.outUserPathName;
}
ExcelUtil.initExcel(fileName, title);
- ExcelUtil.writeObjListToExcel(listData, fileName, MyActivity.this);
+ ExcelUtil.writeObjListToExcel(listData, fileName, MyActivityQHAlone.this);
handler.sendEmptyMessage(1);
} catch (Exception e) {
handler.sendEmptyMessage(2);
@@ -262,7 +259,7 @@
public void onTimeSelected(long timestamp) {
endTime = timestamp;
if ((endTime < beginTime) && endTime != beginTime) {
- TipUtil.show(MyActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
+ TipUtil.show(MyActivityQHAlone.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
} else {
try {
endTime = endTime + (1000 * 60 * 60 * 24) - 1;
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java
similarity index 93%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java
index 2fca011..2d1e1a1 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivityQHAlone.java
@@ -10,7 +10,6 @@
import com.dayu.baselibrary.utils.AidlUtil;
import com.dayu.baselibrary.utils.DateUtil;
import com.dayu.baselibrary.utils.TipUtil;
-
import com.dayu.qihealonelibrary.QHAloneApplication;
import com.dayu.qihealonelibrary.card.CleanCard;
import com.dayu.qihealonelibrary.card.CleanUserCard;
@@ -21,7 +20,7 @@
import com.dayu.qihealonelibrary.card.RegisteredCard;
import com.dayu.qihealonelibrary.card.TestCard;
import com.dayu.qihealonelibrary.card.UserCard;
-import com.dayu.qihealonelibrary.databinding.ActivityWriteTextBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityWriteTextQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
import com.dayu.qihealonelibrary.dbBean.RechargeBean;
import com.dayu.qihealonelibrary.dbBean.UserCardBean;
@@ -37,7 +36,7 @@
* Date: 2023-11-08 21:19
* Description: nfc鍐欏崱鐣岄潰
*/
-public class NFCWreatActivity extends BaseNfcActivity {
+public class NFCWreatActivityQHAlone extends BaseNfcActivityQHAlone {
boolean cleanFlag = false;
@@ -78,7 +77,7 @@
//鎵撳嵃
QHAloneApplication baseApp;
- public static NFCWreatActivity nfcWreatActivity;
+ public static NFCWreatActivityQHAlone nfcWreatActivity;
/**
* 鏄惁鏄敤鎴峰崱锛屽亣濡傛槸鐢ㄦ埛鍗＄殑璇濋渶瑕佹娴嬪崱鐗囨槸鍚﹀凡缁忓紑杩囨埛锛屽亣濡傚凡寮�鎴峰垯鎶ラ敊涓嶈兘鍐嶅啓鍗�
*/
@@ -88,13 +87,13 @@
boolean isRecharge = false;
//鍏呭�奸�氫俊鏄惁瀹屾垚
boolean rechargeIsOk = false;
- ActivityWriteTextBinding binding;
+ ActivityWriteTextQhaBinding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
try {
- binding = ActivityWriteTextBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityWriteTextQhaBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
nfcWreatActivity = this;
getData();
@@ -183,7 +182,7 @@
binding.textView.setText("璇ュ崱宸茬粡鍐欏叆鐢ㄦ埛淇℃伅锛岃鏇存崲鍗＄墖");
binding.textView.setTextColor(getResources().getColor(com.dayu.baselibrary.R.color.red));
} else if (cardType.equals("-1")) {
- TipUtil.show(NFCWreatActivity.this, "璇峰嬁绉诲姩鍗＄墖锛岃鍗″け璐ヨ閲嶈瘯锛侊紒");
+ TipUtil.show(NFCWreatActivityQHAlone.this, "璇峰嬁绉诲姩鍗＄墖锛岃鍗″け璐ヨ閲嶈瘯锛侊紒");
} else {
Log.i("NFCWreatActivity", "olduserCard!=null saveData");
saveData();
@@ -235,9 +234,9 @@
//鐢ㄦ埛鍗�
startDetailActivity(userCardBean.getUserName(), "鍚敤");
} else if (!TextUtils.isEmpty(morny)) {
- TipUtil.show(NFCWreatActivity.this, "鍏呭�兼垚鍔�", () -> NFCWreatActivity.this.finish());
+ TipUtil.show(NFCWreatActivityQHAlone.this, "鍏呭�兼垚鍔�", () -> NFCWreatActivityQHAlone.this.finish());
} else {
- TipUtil.show(NFCWreatActivity.this, "鍐欏崱鎴愬姛", () -> NFCWreatActivity.this.finish());
+ TipUtil.show(NFCWreatActivityQHAlone.this, "鍐欏崱鎴愬姛", () -> NFCWreatActivityQHAlone.this.finish());
}
} catch (Exception e) {
@@ -245,7 +244,7 @@
CrashReport.postCatchedException(e);
}
} else {
- TipUtil.show(NFCWreatActivity.this, "鍐欏崱澶辫触");
+ TipUtil.show(NFCWreatActivityQHAlone.this, "鍐欏崱澶辫触");
}
stopAnim();
} else if (userCard == null && userCardBean != null) {
@@ -443,13 +442,13 @@
detail.putExtra("morny", morny);
}
startActivity(detail);
- if (NewCardActivity.newCardActivity != null) {
- NewCardActivity.newCardActivity.finish();
+ if (NewCardActivityQHAlone.newCardActivity != null) {
+ NewCardActivityQHAlone.newCardActivity.finish();
}
- if (RechargeActivity.rechargeActivity != null) {
- RechargeActivity.rechargeActivity.finish();
+ if (RechargeActivityQHAlone.rechargeActivity != null) {
+ RechargeActivityQHAlone.rechargeActivity.finish();
}
- NFCWreatActivity.nfcWreatActivity.finish();
+ NFCWreatActivityQHAlone.nfcWreatActivity.finish();
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivity.java
deleted file mode 100644
index 6128547..0000000
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivity.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package com.dayu.qihealonelibrary.activity;
-
-import android.app.Dialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.InputFilter;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-
-import com.dayu.baselibrary.tools.Utils;
-import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.qihealonelibrary.card.UserCard;
-import com.dayu.qihealonelibrary.databinding.ActivityNewCardBinding;
-import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
-import com.dayu.qihealonelibrary.dbBean.IpBean;
-import com.dayu.qihealonelibrary.dbBean.UserCardBean;
-
-import com.dayu.qihealonelibrary.utils.DeviceNumberUtils;
-
-import com.dayu.qihealonelibrary.view.ProgressDialog;
-import com.hjq.permissions.OnPermissionCallback;
-import com.hjq.permissions.Permission;
-import com.hjq.permissions.XXPermissions;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Copyright (C), 2023,
- * Author: zuo
- * Date: 2023-11-10 19:52
- * Description: 鏂板崱娉ㄥ唽
- */
-public class NewCardActivity extends QHAloneBaseActivity {
-
- public static final int SCAN_IDCARD_REQUEST = 1;
- UserCardBean userCardBean;
- Dialog dialog;
-
- ActivityNewCardBinding newCardBinding;
- AdminDataBean adminData;
-
- static NewCardActivity newCardActivity;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- newCardActivity = this;
- newCardBinding = ActivityNewCardBinding.inflate(LayoutInflater.from(this));
- setContentView(newCardBinding.getRoot());
- setData();
- initView();
-// LibraryInitOCR.initOCR(NewCardActivity.this);
- }
-
- private void initView() {
- newCardBinding.newCardName.setFilters(new InputFilter[]{new ChineseInputFilter()});
- newCardBinding.newCardId.setFilters(new InputFilter[]{new AlphaNumericXFilter(), new InputFilter.LengthFilter(18)});
- //韬唤璇佽瘑鍒�
- newCardBinding.newCardScanBtn.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
-
- getPermission();
- }
- });
-
- newCardBinding.newCardRegistBtn.setOnClickListener(v -> {
-
- String userName = newCardBinding.newCardName.getText().toString();
- long date = System.currentTimeMillis();
- String phone = newCardBinding.newCardPhone.getText().toString();
- String userID = newCardBinding.newCardId.getText().toString().toUpperCase();
-
-
- if (!TextUtils.isEmpty(userName)
- && !TextUtils.isEmpty(phone) && !TextUtils.isEmpty(userID)
- ) {
- if (userName.length() <= 1 || !validateName(userName)) {
- TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭鍚�");
- return;
- } else if (phone.length() < 11 || !isValidPhoneNumber(phone)) {
- TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭墜鏈哄彿");
- return;
- } else if (!Utils.check(userID)) {
- TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭韩浠借瘉鍙�");
- return;
- } else {
- userCardBean = new UserCardBean();
- userCardBean.setUserName(userName);
- userCardBean.setDate(date);
- userCardBean.setSerial(adminData.getSerial());
- userCardBean.setPhone(phone);
- userCardBean.setUserID(userID);
- }
-
- } else {
- TipUtil.show(NewCardActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
- }
- });
- }
-
- private boolean isValidPhoneNumber(String phoneNumber) {
- // 瀹氫箟鎵嬫満鍙风殑姝ｅ垯琛ㄨ揪寮忥紝纭繚鏁板瓧閮ㄥ垎娌℃湁杩炵画6浣嶇浉鍚岀殑鏁板瓧
- String phoneRegex = "^1[0-9]{10}$";
-
- // 鍒涘缓 Pattern 瀵硅薄
- Pattern pattern = Pattern.compile(phoneRegex);
-
- // 鍒涘缓 matcher 瀵硅薄
- Matcher matcher = pattern.matcher(phoneNumber);
-
- // 鍒ゆ柇鎵嬫満鍙锋槸鍚﹀尮閰嶆鍒欒〃杈惧紡
- return matcher.matches() && !hasSixConsecutiveSameDigits(phoneNumber);
- }
-
- /**
- * 鍒ゆ柇鏄惁鏈�6涓浉鍚岀殑杩炵画鏁板瓧
- *
- * @param input
- * @return
- */
- public static boolean hasSixConsecutiveSameDigits(String input) {
- char[] digits = input.toCharArray();
-
- for (int i = 0; i <= digits.length - 6; i++) {
- boolean consecutiveSame = true;
- for (int j = 1; j < 6; j++) {
- if (digits[i + j] != digits[i + j - 1]) {
- consecutiveSame = false;
- break;
- }
- }
- if (consecutiveSame) {
- return true;
- }
- }
- return false;
- }
-
-
- private void getPermission() {
- try {
- XXPermissions.with(this)
- // 鐢宠鍗曚釜鏉冮檺
-// .permission(Permission.RECORD_AUDIO)
- // 鐢宠澶氫釜鏉冮檺
- .permission(Permission.CAMERA)
- // 璁剧疆鏉冮檺璇锋眰鎷︽埅鍣紙灞�閮ㄨ缃級
- //.interceptor(new PermissionInterceptor())
- // 璁剧疆涓嶈Е鍙戦敊璇娴嬫満鍒讹紙灞�閮ㄨ缃級
- //.unchecked()
- .request(new OnPermissionCallback() {
-
- @Override
- public void onGranted(@NonNull List<String> permissions, boolean allGranted) {
- if (allGranted) {
-
- }
- }
-
- @Override
- public void onDenied(@NonNull List<String> permissions, boolean doNotAskAgain) {
- if (doNotAskAgain) {
- // 濡傛灉鏄姘镐箙鎷掔粷灏辫烦杞埌搴旂敤鏉冮檺绯荤粺璁剧疆椤甸潰
- } else {
-// toast("鑾峰彇褰曢煶鍜屾棩鍘嗘潈闄愬け璐�");
- }
- }
- });
- } catch (
- Throwable e) {
- e.printStackTrace();
- }
- }
-
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- super.onActivityResult(requestCode, resultCode, data);
- if (resultCode == RESULT_OK) {
- switch (requestCode) {
- case SCAN_IDCARD_REQUEST:
- String result = data.getStringExtra("OCRResult");
- try {
- JSONObject jo = new JSONObject(result);
-
-// sb.append(String.format("姝ｉ潰 = %s\n", jo.opt("type")));
-// sb.append(String.format("濮撳悕 = %s\n", jo.opt("name")));
-// sb.append(String.format("鎬у埆 = %s\n", jo.opt("sex")));
-// sb.append(String.format("姘戞棌 = %s\n", jo.opt("folk")));
-// sb.append(String.format("鏃ユ湡 = %s\n", jo.opt("birt")));
-// sb.append(String.format("鍙风爜 = %s\n", jo.opt("num")));
-// sb.append(String.format("浣忓潃 = %s\n", jo.opt("addr")));
-// sb.append(String.format("绛惧彂鏈哄叧 = %s\n", jo.opt("issue")));
-// sb.append(String.format("鏈夋晥鏈熼檺 = %s\n", jo.opt("valid")));
-// sb.append(String.format("鏁翠綋鐓х墖 = %s\n", jo.opt("imgPath")));
-// sb.append(String.format("澶村儚璺緞 = %s\n", jo.opt("headPath")));
-
- newCardBinding.newCardName.setText(jo.opt("name").toString());
- newCardBinding.newCardId.setText(jo.opt("num").toString());
- newCardBinding.newCardIdTip.setVisibility(View.VISIBLE);
-
- } catch (JSONException e) {
- throw new RuntimeException(e);
- }
- break;
- }
- }
-
- }
-
- private void setData() {
-
- try {
- adminData = baseDao.adminDao().findFirst();
- newCardBinding.newCardVillageNum.setText(adminData.getSerial());
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
-
-
- public boolean validateName(String name) {
- // 浣跨敤姝ｅ垯琛ㄨ揪寮忓尮閰嶅鍚�
- String regex = "^[\\u4e00-\\u9fa5]+$"; // 鍙厑璁镐腑鏂囧瓧绗�
- return name.matches(regex);
- }
-
- private static class AlphaNumericXFilter implements InputFilter {
- // 姝ｅ垯琛ㄨ揪寮忓畾涔夊彧鑳借緭鍏ユ暟瀛楀拰瀛楁瘝 "X"锛堝ぇ鍐欐垨灏忓啓锛�
- private final String regex = "[0-9Xx]*";
-
- @Override
- public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
- // 妫�鏌ユ瘡涓緭鍏ュ瓧绗︽槸鍚︾鍚堟鍒欒〃杈惧紡
- for (int i = start; i < end; i++) {
- if (!String.valueOf(source.charAt(i)).matches(regex)) {
- return ""; // 涓嶇鍚堣瀹氱殑瀛楃琚繃婊ゆ帀
- }
- }
- return null; // 鍏佽杈撳叆瀛楃
- }
- }
-
- public class ChineseInputFilter implements InputFilter {
- @Override
- public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
- StringBuilder builder = new StringBuilder();
- for (int i = start; i < end; i++) {
- char currentChar = source.charAt(i);
- // 鍙厑璁告眽瀛�
- if (isChineseCharacter(currentChar)) {
- builder.append(currentChar);
- }
- }
- return builder.toString();
- }
-
- private boolean isChineseCharacter(char c) {
- // 杩欓噷浣跨敤Unicode鑼冨洿鍒ゆ柇鏄惁涓烘眽瀛�
- // 姹夊瓧鐨刄nicode鑼冨洿鏄細0x4e00 - 0x9fa5
- return (c >= 0x4e00 && c <= 0x9fa5);
- }
-
- }
-
- @Override
- protected void onDestroy() {
- super.onDestroy();
- newCardActivity = null;
- }
-
-}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivityQHAlone.java
new file mode 100644
index 0000000..d0ecd29
--- /dev/null
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivityQHAlone.java
@@ -0,0 +1,308 @@
+package com.dayu.qihealonelibrary.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.InputFilter;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+
+import com.dayu.baselibrary.tools.Utils;
+import com.dayu.baselibrary.utils.TipUtil;
+import com.dayu.baselibrary.utils.ToastUtil;
+import com.dayu.qihealonelibrary.card.UserCard;
+import com.dayu.qihealonelibrary.databinding.ActivityNewCardQhaBinding;
+import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
+import com.dayu.qihealonelibrary.dbBean.UserCardBean;
+import com.hjq.permissions.OnPermissionCallback;
+import com.hjq.permissions.Permission;
+import com.hjq.permissions.XXPermissions;
+import com.kernal.passportreader.sdk.CardsCameraActivity;
+import com.kernal.passportreader.sdk.utils.DefaultPicSavePath;
+
+import java.util.Calendar;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import kernal.idcard.android.ResultMessage;
+import kernal.idcard.camera.CardOcrRecogConfigure;
+import kernal.idcard.camera.SharedPreferencesHelper;
+
+/**
+ * Copyright (C), 2023,
+ * Author: zuo
+ * Date: 2023-11-10 19:52
+ * Description: 鏂板崱娉ㄥ唽
+ */
+public class NewCardActivityQHAlone extends BaseActivityQHAlone {
+
+ public static final int SCAN_IDCARD_REQUEST = 1;
+ UserCardBean userCardBean;
+
+ ActivityNewCardQhaBinding newCardBinding;
+ AdminDataBean adminData;
+
+ static NewCardActivityQHAlone newCardActivity;
+ private int defValueMainId = 2;
+ private int defValueSubId = 0;
+
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ newCardActivity = this;
+ newCardBinding = ActivityNewCardQhaBinding.inflate(LayoutInflater.from(this));
+ setContentView(newCardBinding.getRoot());
+ setData();
+ initView();
+ }
+
+ private void initView() {
+ newCardBinding.newCardName.setFilters(new InputFilter[]{new ChineseInputFilter()});
+ newCardBinding.newCardId.setFilters(new InputFilter[]{new AlphaNumericXFilter(), new InputFilter.LengthFilter(18)});
+ //韬唤璇佽瘑鍒�
+ newCardBinding.newCardScanBtn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ rxPermission();
+ }
+ });
+ //寮�鎴�
+ newCardBinding.newCardRegistBtn.setOnClickListener(v -> {
+
+ String userName = newCardBinding.newCardName.getText().toString();
+ long date = System.currentTimeMillis();
+ String phone = newCardBinding.newCardPhone.getText().toString();
+ String userID = newCardBinding.newCardId.getText().toString().toUpperCase();
+
+
+ if (!TextUtils.isEmpty(userName)
+ && !TextUtils.isEmpty(phone) && !TextUtils.isEmpty(userID)
+ ) {
+ if (userName.length() <= 1 || !validateName(userName)) {
+ TipUtil.show(NewCardActivityQHAlone.this, "璇疯緭鍏ユ纭鍚�");
+ } else if (phone.length() < 11 || !isValidPhoneNumber(phone)) {
+ TipUtil.show(NewCardActivityQHAlone.this, "璇疯緭鍏ユ纭墜鏈哄彿");
+ } else if (!Utils.check(userID)) {
+ TipUtil.show(NewCardActivityQHAlone.this, "璇疯緭鍏ユ纭韩浠借瘉鍙�");
+ } else {
+ userCardBean = new UserCardBean();
+ userCardBean.setUserName(userName);
+ userCardBean.setDate(date);
+ 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.setRechargeTimes((byte) 0);
+ userCard.setTotalWater(0);
+ userCard.setTotalElectric(0);
+ userCard.setBalance(0);
+ userCard.setSurplusWater(0);
+ userCard.setRechargeDate(Calendar.getInstance());
+
+ Intent intent = new Intent(NewCardActivityQHAlone.this, NFCWreatActivityQHAlone.class);
+ intent.putExtra("userCard", userCard);
+ intent.putExtra("dbUserCard", userCardBean);
+ startActivity(intent);
+ }
+
+ } else {
+ TipUtil.show(NewCardActivityQHAlone.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
+ }
+ });
+ }
+
+ private boolean isValidPhoneNumber(String phoneNumber) {
+ // 瀹氫箟鎵嬫満鍙风殑姝ｅ垯琛ㄨ揪寮忥紝纭繚鏁板瓧閮ㄥ垎娌℃湁杩炵画6浣嶇浉鍚岀殑鏁板瓧
+ String phoneRegex = "^1[0-9]{10}$";
+
+ // 鍒涘缓 Pattern 瀵硅薄
+ Pattern pattern = Pattern.compile(phoneRegex);
+
+ // 鍒涘缓 matcher 瀵硅薄
+ Matcher matcher = pattern.matcher(phoneNumber);
+
+ // 鍒ゆ柇鎵嬫満鍙锋槸鍚﹀尮閰嶆鍒欒〃杈惧紡
+ return matcher.matches() && !hasSixConsecutiveSameDigits(phoneNumber);
+ }
+
+ /**
+ * 鍒ゆ柇鏄惁鏈�6涓浉鍚岀殑杩炵画鏁板瓧
+ *
+ * @param input
+ * @return
+ */
+ public static boolean hasSixConsecutiveSameDigits(String input) {
+ char[] digits = input.toCharArray();
+
+ for (int i = 0; i <= digits.length - 6; i++) {
+ boolean consecutiveSame = true;
+ for (int j = 1; j < 6; j++) {
+ if (digits[i + j] != digits[i + j - 1]) {
+ consecutiveSame = false;
+ break;
+ }
+ }
+ if (consecutiveSame) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private void rxPermission() {
+ XXPermissions.with(this)
+ // 鐢宠鍗曚釜鏉冮檺
+// .permission(Permission.RECORD_AUDIO)
+ // 鐢宠澶氫釜鏉冮檺
+ .permission(Permission.CAMERA)
+ .request(new OnPermissionCallback() {
+
+ @Override
+ public void onGranted(@NonNull List<String> permissions, boolean allGranted) {
+ if (allGranted) {//鎵�鏈夌敵璇风殑鏉冮檺閮藉凡閫氳繃
+ startCamera();
+ }
+ }
+
+ @Override
+ public void onDenied(@NonNull List<String> permissions, boolean doNotAskAgain) {
+ if (doNotAskAgain) {
+ // 濡傛灉鏄姘镐箙鎷掔粷灏辫烦杞埌搴旂敤鏉冮檺绯荤粺璁剧疆椤甸潰
+ } else {
+// toast("鑾峰彇褰曢煶鍜屾棩鍘嗘潈闄愬け璐�");
+ }
+ }
+ });
+ }
+
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (resultCode == RESULT_OK) {
+ switch (requestCode) {
+ case SCAN_IDCARD_REQUEST:
+ try {
+ //璺宠浆鎵弿鐣岄潰璇嗗埆瀹屾垚涔嬪悗锛屾暟鎹洖浼�
+ if (data != null) {
+ //鏁版嵁鍥炰紶鐨勮幏鍙�
+ Bundle bundle = data.getBundleExtra("resultbundle");
+ //bundle涓嶄负null锛屼唬琛ㄨ繖璇嗗埆鎴愬姛
+ if (bundle != null) {
+ ResultMessage resultMessage = (ResultMessage) bundle.getSerializable("resultMessage");
+ newCardBinding.newCardName.setText(resultMessage.GetRecogResult[1]);
+ newCardBinding.newCardId.setText(resultMessage.GetRecogResult[6]);
+ newCardBinding.newCardIdTip.setVisibility(View.VISIBLE);
+ } else {
+ String error = data.getStringExtra("error");
+ String StrPath = data.getStringExtra("strpicpath");
+ ToastUtil.show(error);
+ }
+
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ break;
+ }
+ }
+
+ }
+
+ private void startCamera() {
+ CardOcrRecogConfigure.getInstance()
+ .initLanguage(getApplicationContext())
+ .setSaveCut(true)
+ .setOpenIDCopyFuction(true)
+ .setnMainId(getSharedPreferencesStoreMainId())
+ .setnSubID(getSharedPreferencesStoreSubId())
+ .setFlag(0)
+ .setnCropType(0)
+ .setSavePath(new DefaultPicSavePath(this, true));
+ Intent intent = new Intent(this, CardsCameraActivity.class);
+ startActivityForResult(intent, SCAN_IDCARD_REQUEST);
+ }
+
+ public int getSharedPreferencesStoreMainId() {
+ return SharedPreferencesHelper.getInt(
+ getApplicationContext(), "nMainId", defValueMainId);
+ }
+
+ public int getSharedPreferencesStoreSubId() {
+ return SharedPreferencesHelper.getInt(
+ getApplicationContext(), "nSubID", defValueSubId);
+ }
+
+
+ private void setData() {
+
+ try {
+ adminData = baseDao.adminDao().findFirst();
+ newCardBinding.newCardVillageNum.setText(adminData.getSerial());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+
+
+ public boolean validateName(String name) {
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忓尮閰嶅鍚�
+ String regex = "^[\\u4e00-\\u9fa5]+$"; // 鍙厑璁镐腑鏂囧瓧绗�
+ return name.matches(regex);
+ }
+
+ private static class AlphaNumericXFilter implements InputFilter {
+ // 姝ｅ垯琛ㄨ揪寮忓畾涔夊彧鑳借緭鍏ユ暟瀛楀拰瀛楁瘝 "X"锛堝ぇ鍐欐垨灏忓啓锛�
+ private final String regex = "[0-9Xx]*";
+
+ @Override
+ public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+ // 妫�鏌ユ瘡涓緭鍏ュ瓧绗︽槸鍚︾鍚堟鍒欒〃杈惧紡
+ for (int i = start; i < end; i++) {
+ if (!String.valueOf(source.charAt(i)).matches(regex)) {
+ return ""; // 涓嶇鍚堣瀹氱殑瀛楃琚繃婊ゆ帀
+ }
+ }
+ return null; // 鍏佽杈撳叆瀛楃
+ }
+ }
+
+ public class ChineseInputFilter implements InputFilter {
+ @Override
+ public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+ StringBuilder builder = new StringBuilder();
+ for (int i = start; i < end; i++) {
+ char currentChar = source.charAt(i);
+ // 鍙厑璁告眽瀛�
+ if (isChineseCharacter(currentChar)) {
+ builder.append(currentChar);
+ }
+ }
+ return builder.toString();
+ }
+
+ private boolean isChineseCharacter(char c) {
+ // 杩欓噷浣跨敤Unicode鑼冨洿鍒ゆ柇鏄惁涓烘眽瀛�
+ // 姹夊瓧鐨刄nicode鑼冨洿鏄細0x4e00 - 0x9fa5
+ return (c >= 0x4e00 && c <= 0x9fa5);
+ }
+
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ newCardActivity = null;
+ }
+
+}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivityQHAlone.java
similarity index 95%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivityQHAlone.java
index b0023b4..6724634 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivityQHAlone.java
@@ -12,9 +12,8 @@
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
import com.dayu.qihealonelibrary.adapter.NewCardAdapter;
-import com.dayu.qihealonelibrary.databinding.ActivityNewcardListBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityNewcardListQhaBinding;
import com.dayu.qihealonelibrary.dbBean.UserCardBean;
-
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;
@@ -33,10 +32,10 @@
* Description: 鏂板崱娉ㄥ唽鍒楄〃鐣岄潰
*/
-public class NewCardListActivity extends QHAloneBaseActivity {
+public class NewCardListActivityQHAlone extends BaseActivityQHAlone {
- ActivityNewcardListBinding newcardListBinding;
+ ActivityNewcardListQhaBinding newcardListBinding;
List<UserCardBean> userCardBeanList = new ArrayList<>();
NewCardAdapter adapter;
private CustomDatePicker beginDatePicker;
@@ -53,7 +52,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- newcardListBinding = ActivityNewcardListBinding.inflate(LayoutInflater.from(this));
+ newcardListBinding = ActivityNewcardListQhaBinding.inflate(LayoutInflater.from(this));
setContentView(newcardListBinding.getRoot());
setRightButton();
initDatePicker();
@@ -153,7 +152,7 @@
public void onTimeSelected(long timestamp) {
endTime = timestamp;
if ((endTime < beginTime) && endTime != beginTime) {
- TipUtil.show(NewCardListActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
+ TipUtil.show(NewCardListActivityQHAlone.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/ParameterActivityQHAlone.java
similarity index 67%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivityQHAlone.java
index 0f77e7f..4889c8f 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivityQHAlone.java
@@ -5,7 +5,7 @@
import android.view.LayoutInflater;
import android.view.View;
-import com.dayu.qihealonelibrary.databinding.ActivityParameterBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityParameterQhaBinding;
/**
* Copyright (C), 2023,
@@ -13,13 +13,13 @@
* Date: 2023-11-06 11:47
* Description: 鍙傛暟璁剧疆鐣岄潰
*/
-public class ParameterActivity extends QHAloneBaseActivity {
- ActivityParameterBinding binding;
+public class ParameterActivityQHAlone extends BaseActivityQHAlone {
+ ActivityParameterQhaBinding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- binding = ActivityParameterBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityParameterQhaBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
initView();
}
@@ -29,7 +29,7 @@
binding.parameterDomain.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(ParameterActivity.this, DomainActivity.class);
+ Intent intent = new Intent(ParameterActivityQHAlone.this, DomainActivityQHAlone.class);
startActivity(intent);
}
});
@@ -37,7 +37,7 @@
binding.parameterPower.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(ParameterActivity.this, PowerActivity.class);
+ Intent intent = new Intent(ParameterActivityQHAlone.this, PowerActivityQHAlone.class);
startActivity(intent);
}
});
@@ -45,7 +45,7 @@
binding.parameterElectricPrice.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(ParameterActivity.this, ElectricPriceActivity.class);
+ Intent intent = new Intent(ParameterActivityQHAlone.this, ElectricPriceActivityQHAlone.class);
startActivity(intent);
}
});
@@ -53,7 +53,7 @@
binding.parameterCardIdentifying.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(ParameterActivity.this, IdentifyingActivity.class);
+ Intent intent = new Intent(ParameterActivityQHAlone.this, IdentifyingActivityQHAlone.class);
startActivity(intent);
}
});
@@ -61,14 +61,14 @@
binding.parameterPassWordCard.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(ParameterActivity.this, PasswordCardActivity.class);
+ 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(ParameterActivity.this, RegionActivity.class);
+ Intent intent = new Intent(ParameterActivityQHAlone.this, RegionActivityQHAlone.class);
startActivity(intent);
}
});
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivityQHAlone.java
similarity index 75%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivityQHAlone.java
index d6d0207..22f3222 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivityQHAlone.java
@@ -7,7 +7,7 @@
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.utils.WSMD5;
-import com.dayu.qihealonelibrary.databinding.ActivityPswBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityPswQhaBinding;
import com.dayu.qihealonelibrary.dbBean.PassWordBean;
@@ -17,16 +17,16 @@
* Date: 2023-11-10 19:52
* Description: 淇敼瀵嗙爜鐣岄潰
*/
-public class PassWordActivity extends QHAloneBaseActivity {
+public class PassWordActivityQHAlone extends BaseActivityQHAlone {
- ActivityPswBinding pswBinding;
+ ActivityPswQhaBinding pswBinding;
PassWordBean passWordBean;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- pswBinding = ActivityPswBinding.inflate(LayoutInflater.from(this));
+ pswBinding = ActivityPswQhaBinding.inflate(LayoutInflater.from(this));
setContentView(pswBinding.getRoot());
pswBinding.waterOk.setOnClickListener(new View.OnClickListener() {
@Override
@@ -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(PassWordActivity.this, "瀵嗙爜淇敼瀹屾垚", () -> {
- PassWordActivity.this.finish();
+ TipUtil.show(PassWordActivityQHAlone.this, "瀵嗙爜淇敼瀹屾垚", () -> {
+ PassWordActivityQHAlone.this.finish();
});
} else {
- TipUtil.show(PassWordActivity.this, "涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�");
+ TipUtil.show(PassWordActivityQHAlone.this, "涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�");
}
} else {
- TipUtil.show(PassWordActivity.this, "鏃у瘑鐮佽緭鍏ラ敊璇�");
+ TipUtil.show(PassWordActivityQHAlone.this, "鏃у瘑鐮佽緭鍏ラ敊璇�");
}
} else {
- TipUtil.show(PassWordActivity.this, "璇疯緭瀹屽唴瀹�");
+ TipUtil.show(PassWordActivityQHAlone.this, "璇疯緭瀹屽唴瀹�");
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivityQHAlone.java
similarity index 88%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivityQHAlone.java
index 7ea7423..3200c77 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PasswordCardActivityQHAlone.java
@@ -6,7 +6,7 @@
import android.view.View;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.qihealonelibrary.databinding.ActivityPasswordCardBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityPasswordCardQhaBinding;
import com.dayu.qihealonelibrary.dbBean.PassWordCardBean;
/**
@@ -15,15 +15,15 @@
* Time: 16:21
* 澶囨敞锛氬瘑鐮佸崱璁剧疆鐣岄潰
*/
-public class PasswordCardActivity extends QHAloneBaseActivity {
+public class PasswordCardActivityQHAlone extends BaseActivityQHAlone {
- ActivityPasswordCardBinding binding;
+ ActivityPasswordCardQhaBinding binding;
PassWordCardBean cardBean;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- binding = ActivityPasswordCardBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityPasswordCardQhaBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
initView();
initData();
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PowerActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PowerActivityQHAlone.java
similarity index 85%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PowerActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PowerActivityQHAlone.java
index 2677928..73d071e 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PowerActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PowerActivityQHAlone.java
@@ -6,7 +6,7 @@
import android.view.View;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.qihealonelibrary.databinding.ActivityPowerBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityPowerQhaBinding;
import com.dayu.qihealonelibrary.dbBean.PowerBean;
/**
@@ -15,14 +15,14 @@
* Date: 2023-11-08 21:19
* Description: 鍔熺巼璁剧疆
*/
-public class PowerActivity extends QHAloneBaseActivity {
- ActivityPowerBinding powerBinding;
+public class PowerActivityQHAlone extends BaseActivityQHAlone {
+ ActivityPowerQhaBinding powerBinding;
PowerBean powerBean = new PowerBean();
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- powerBinding = ActivityPowerBinding.inflate(LayoutInflater.from(this));
+ powerBinding = ActivityPowerQhaBinding.inflate(LayoutInflater.from(this));
setContentView(powerBinding.getRoot());
initData();
initView();
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 fcbe209..bc359e9 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
@@ -15,10 +15,8 @@
import com.dayu.qihealonelibrary.card.ElectricPriceCard;
import com.dayu.qihealonelibrary.card.RegionCard;
import com.dayu.qihealonelibrary.card.UserCard;
-import com.dayu.qihealonelibrary.databinding.ActivityRedCardBinding;
-
+import com.dayu.qihealonelibrary.databinding.ActivityRedCardQhaBinding;
import com.dayu.qihealonelibrary.tools.NfcReadHelper;
-
import com.dayu.qihealonelibrary.utils.CardCommon;
import com.dayu.qihealonelibrary.view.ProgressDialog;
@@ -31,10 +29,10 @@
* Date: 2023-11-10 19:52
* Description: 璇诲崱鐣岄潰
*/
-public class ReadCardAcitivy extends BaseNfcActivity {
+public class ReadCardAcitivy extends BaseNfcActivityQHAlone {
volatile UserCard userCard;
- ActivityRedCardBinding redCardBinding;
+ ActivityRedCardQhaBinding redCardBinding;
Intent intent;
@@ -42,7 +40,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- redCardBinding = ActivityRedCardBinding.inflate(LayoutInflater.from(this));
+ redCardBinding = ActivityRedCardQhaBinding.inflate(LayoutInflater.from(this));
setContentView(redCardBinding.getRoot());
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java
similarity index 85%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java
index b602030..ec99ab7 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java
@@ -9,7 +9,7 @@
import android.widget.EditText;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.qihealonelibrary.databinding.ActivityRechargeBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityRechargeQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
import com.dayu.qihealonelibrary.tools.NfcReadHelper;
import com.dayu.qihealonelibrary.utils.DeviceNumberUtils;
@@ -23,13 +23,13 @@
* Date: 2023-11-5 09:52
* Description: 鍏呭�肩晫闈�
*/
-public class RechargeActivity extends BaseNfcActivity {
+public class RechargeActivityQHAlone extends BaseNfcActivityQHAlone {
Intent intent;
boolean userFlag;
- ActivityRechargeBinding binding;
- public static RechargeActivity rechargeActivity;
+ ActivityRechargeQhaBinding binding;
+ public static RechargeActivityQHAlone rechargeActivity;
AdminDataBean adminData;
String userName;
@@ -38,7 +38,7 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
try {
- binding = ActivityRechargeBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityRechargeQhaBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
setPricePoint(binding.rechargeWater);
rechargeActivity = this;
@@ -58,7 +58,7 @@
ProgressDialog.show(this);
// selectBalance(userCard.getInitPeasantCode());
} else {
- TipUtil.show(RechargeActivity.this, "鍗＄墖璇诲彇澶辫触");
+ TipUtil.show(RechargeActivityQHAlone.this, "鍗＄墖璇诲彇澶辫触");
}
// readAllData(intent);
@@ -81,16 +81,16 @@
if (!TextUtils.isEmpty(morny)) {
String initCode = DeviceNumberUtils.getDeviceNumber();
if (TextUtils.isEmpty(initCode)) {
- TipUtil.show(RechargeActivity.this, "璁惧娉ㄥ唽鍙蜂负绌猴紝璇峰厛璁剧疆IP鍜岀鐞嗗憳鍦板潃");
+ TipUtil.show(RechargeActivityQHAlone.this, "璁惧娉ㄥ唽鍙蜂负绌猴紝璇峰厛璁剧疆IP鍜岀鐞嗗憳鍦板潃");
return;
}
- Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(RechargeActivityQHAlone.this, NFCWreatActivityQHAlone.class);
intent.putExtra("morny", morny);
intent.putExtra("userName", userName);
intent.putExtra("userCard", userCard);
startActivity(intent);
} else {
- TipUtil.show(RechargeActivity.this, "璇疯緭鍏ュ厖鍊奸噾棰濓紙鍏冿級");
+ TipUtil.show(RechargeActivityQHAlone.this, "璇疯緭鍏ュ厖鍊奸噾棰濓紙鍏冿級");
}
});
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetail.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetail.java
index c890316..e0c3f3e 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetail.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetail.java
@@ -7,8 +7,7 @@
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.qihealonelibrary.card.UserCard;
-import com.dayu.qihealonelibrary.databinding.ActivityRechargeDetailBinding;
-
+import com.dayu.qihealonelibrary.databinding.ActivityRechargeDetailQhaBinding;
import java.util.Calendar;
@@ -19,9 +18,9 @@
* Time: 15:01
* 澶囨敞锛氬啓鍗″悗鐨勮鎯呴〉
*/
-public class RechargeDetail extends QHAloneBaseActivity {
+public class RechargeDetail extends BaseActivityQHAlone {
- ActivityRechargeDetailBinding binding;
+ ActivityRechargeDetailQhaBinding binding;
UserCard userCard;
String statu;
String userName;
@@ -31,7 +30,7 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- binding = ActivityRechargeDetailBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityRechargeDetailQhaBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
try {
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivityQHAlone.java
similarity index 94%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivityQHAlone.java
index 5359aa8..dacaf43 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivityQHAlone.java
@@ -1,7 +1,6 @@
package com.dayu.qihealonelibrary.activity;
-
import static com.dayu.baselibrary.view.TitleBar.ClickType_RIGHT_TEXT;
import android.os.Bundle;
@@ -15,9 +14,8 @@
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
import com.dayu.qihealonelibrary.adapter.RechargeAdapter;
-import com.dayu.qihealonelibrary.databinding.ActivityRechargeListBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityRechargeListQhaBinding;
import com.dayu.qihealonelibrary.dbBean.RechargeBean;
-
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;
@@ -35,9 +33,9 @@
* Date: 2023-11-5 09:52
* Description: 鍏呭�艰褰�
*/
-public class RechargeListActivity extends QHAloneBaseActivity {
+public class RechargeListActivityQHAlone extends BaseActivityQHAlone {
- ActivityRechargeListBinding rechargeListBinding;
+ ActivityRechargeListQhaBinding rechargeListBinding;
RechargeAdapter adapter;
List<RechargeBean> rechargeList = new ArrayList<>();
@@ -55,7 +53,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- rechargeListBinding = ActivityRechargeListBinding.inflate(LayoutInflater.from(this));
+ rechargeListBinding = ActivityRechargeListQhaBinding.inflate(LayoutInflater.from(this));
setContentView(rechargeListBinding.getRoot());
setRightButton();
initDatePicker();
@@ -165,7 +163,7 @@
public void onTimeSelected(long timestamp) {
endTime = timestamp;
if ((endTime < beginTime) && endTime != beginTime) {
- TipUtil.show(RechargeListActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
+ TipUtil.show(RechargeListActivityQHAlone.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
} else {
endTime = endTime + (1000 * 60 * 60 * 24) - 1;
rechargeList.clear();
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RegionActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RegionActivityQHAlone.java
similarity index 88%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RegionActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RegionActivityQHAlone.java
index 59ed995..7060126 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RegionActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RegionActivityQHAlone.java
@@ -6,7 +6,7 @@
import android.view.View;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.qihealonelibrary.databinding.ActivityRegionBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityRegionQhaBinding;
import com.dayu.qihealonelibrary.dbBean.RegionBean;
@@ -16,15 +16,15 @@
* Time: 17:28
* 澶囨敞锛氬尯鍩熸爣鍙峰崱璁剧疆鐣岄潰
*/
-public class RegionActivity extends QHAloneBaseActivity {
+public class RegionActivityQHAlone extends BaseActivityQHAlone {
- ActivityRegionBinding binding;
+ ActivityRegionQhaBinding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- binding = ActivityRegionBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityRegionQhaBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
initView();
initData();
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivityQHAlone.java
similarity index 91%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivityQHAlone.java
index 71c968e..857df52 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivityQHAlone.java
@@ -12,7 +12,7 @@
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.view.EdtDialog;
import com.dayu.qihealonelibrary.adapter.ReplacementAdapter;
-import com.dayu.qihealonelibrary.databinding.ActivityReplacementBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityReplacementQhaBinding;
import com.dayu.qihealonelibrary.dbBean.UserCardBean;
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
@@ -32,8 +32,8 @@
* Time: 17:32
* 澶囨敞锛� 琛ュ崱鐣岄潰
*/
-public class ReplacementActivity extends QHAloneBaseActivity {
- ActivityReplacementBinding newcardListBinding;
+public class ReplacementActivityQHAlone extends BaseActivityQHAlone {
+ ActivityReplacementQhaBinding newcardListBinding;
List<UserCardBean> userCardBeanList = new ArrayList<>();
ReplacementAdapter adapter;
long beginTime;
@@ -47,7 +47,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- newcardListBinding = ActivityReplacementBinding.inflate(LayoutInflater.from(this));
+ newcardListBinding = ActivityReplacementQhaBinding.inflate(LayoutInflater.from(this));
setContentView(newcardListBinding.getRoot());
setRightButton();
initList();
@@ -57,7 +57,7 @@
public void itemClick(View view) {
UserCardBean userCardBean = userCardBeanList.get((int) view.getTag());
- Intent intent = new Intent(ReplacementActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(ReplacementActivityQHAlone.this, NFCWreatActivityQHAlone.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(ReplacementActivity.this, new EdtDialog.DialogBack() {
+ edtDialog = new EdtDialog(ReplacementActivityQHAlone.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/SysActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivityQHAlone.java
similarity index 83%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivityQHAlone.java
index 49ad98a..e1a1a4b 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivityQHAlone.java
@@ -15,7 +15,7 @@
import com.dayu.qihealonelibrary.card.PassWordCard;
import com.dayu.qihealonelibrary.card.RegisteredCard;
import com.dayu.qihealonelibrary.card.TestCard;
-import com.dayu.qihealonelibrary.databinding.ActivityAdminBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityAdminQhaBinding;
import com.dayu.qihealonelibrary.dbBean.DomainBean;
import com.dayu.qihealonelibrary.dbBean.PassWordCardBean;
import com.dayu.qihealonelibrary.dbBean.PowerBean;
@@ -27,14 +27,14 @@
* Date: 2023-11-5 09:52
* Description: 绠＄悊绯荤粺
*/
-public class SysActivity extends QHAloneBaseActivity {
+public class SysActivityQHAlone extends BaseActivityQHAlone {
- ActivityAdminBinding adminBinding;
+ ActivityAdminQhaBinding adminBinding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- adminBinding = ActivityAdminBinding.inflate(LayoutInflater.from(this));
+ adminBinding = ActivityAdminQhaBinding.inflate(LayoutInflater.from(this));
setContentView(adminBinding.getRoot());
initView();
@@ -47,7 +47,7 @@
adminBinding.adminAdmin.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.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(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.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(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.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(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.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(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.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(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.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(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.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(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.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(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
PassWordCard passWordCard = new PassWordCard();
passWordCard.setPassWord(powerBean.getPassWord());
intent.putExtra("passWordCard", passWordCard);
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 a81d58e..0f84284 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/ReplacementAdapter.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/adapter/ReplacementAdapter.java
@@ -9,24 +9,20 @@
import androidx.recyclerview.widget.RecyclerView;
import com.dayu.baselibrary.databinding.ItemNoMoreBinding;
-
import com.dayu.baselibrary.utils.DateUtil;
-
import com.dayu.qihealonelibrary.R;
-import com.dayu.qihealonelibrary.activity.ReplacementActivity;
-
+import com.dayu.qihealonelibrary.activity.ReplacementActivityQHAlone;
import com.dayu.qihealonelibrary.databinding.QiheItemReplacementsBinding;
import com.dayu.qihealonelibrary.dbBean.UserCardBean;
-
import java.util.List;
public class ReplacementAdapter extends BaseRecyclerAdapter<RecyclerView.ViewHolder> {
List<UserCardBean> rechargeList;
- ReplacementActivity mContext;
+ ReplacementActivityQHAlone mContext;
- public ReplacementAdapter(ReplacementActivity context, List<UserCardBean> rechargeList) {
+ public ReplacementAdapter(ReplacementActivityQHAlone context, List<UserCardBean> rechargeList) {
mContext = context;
this.rechargeList = rechargeList;
}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/AdminDataBean.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/AdminDataBean.java
index dac9410..8caf6c3 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/AdminDataBean.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/AdminDataBean.java
@@ -13,7 +13,7 @@
@PrimaryKey(autoGenerate = true)
public long id;
- public String serial;//搴忓垪鍙�
+ public String serial;//搴忓垪鍙�(璁惧缂栧彿)
public String name;
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 4cc3adb..3909a2c 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/UserCardBean.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/UserCardBean.java
@@ -5,13 +5,17 @@
import java.io.Serializable;
+
+
+
+
@Entity
public class UserCardBean implements Serializable {
@PrimaryKey(autoGenerate = true)
public long id;
private String serial ;//璁惧搴忓垪鍙凤紙涔熸槸璁惧缂栧彿锛�
- private String userName ;
+ private String userName ;//鐢ㄦ埛鍚嶇О
private String userID ;//韬唤璇佸彿
private long date;
diff --git a/qihealonelibrary/src/main/res/layout/activity_admin.xml b/qihealonelibrary/src/main/res/layout/activity_admin_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_admin.xml
rename to qihealonelibrary/src/main/res/layout/activity_admin_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_admin_setup.xml b/qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml
similarity index 78%
rename from qihealonelibrary/src/main/res/layout/activity_admin_setup.xml
rename to qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml
index 81cc81a..a3c6bc3 100644
--- a/qihealonelibrary/src/main/res/layout/activity_admin_setup.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_admin_setup_qha.xml
@@ -22,6 +22,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_marginTop="20dp"
android:orientation="vertical">
<LinearLayout
@@ -30,30 +31,57 @@
android:layout_height="wrap_content">
<TextView
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:layout_weight="1"
android:text="@string/eq_no"
android:textSize="@dimen/new_card_size" />
<EditText
android:id="@+id/admin_serial"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/edt_height"
+ android:layout_weight="2"
+ android:background="@drawable/editbg"
android:inputType="number"
android:maxLength="11"
+ android:paddingLeft="10dp"
android:textSize="@dimen/new_card_size" />
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/chose_address_code"
+ style="@style/newCardLL"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/address_code"
+ android:textSize="@dimen/new_card_size" />
+
+ <EditText
+ android:id="@+id/admin_address_code"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/edt_height"
+ android:layout_weight="2"
+ android:background="@drawable/editbg"
+ android:inputType="number"
+ android:paddingLeft="10dp"
+ android:textSize="@dimen/new_card_size" />
+ </LinearLayout>
<LinearLayout
android:id="@+id/chose_address"
style="@style/newCardLL"
- android:visibility="gone"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:visibility="gone">
<TextView
android:layout_width="wrap_content"
@@ -66,29 +94,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="璇风偣鍑婚�夋嫨"
-
android:textSize="@dimen/new_card_size" />
</LinearLayout>
-
- <LinearLayout
- android:id="@+id/chose_address_code"
- style="@style/newCardLL"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/address_code"
- android:textSize="@dimen/new_card_size" />
-
- <EditText
- android:id="@+id/admin_address_code"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textSize="@dimen/new_card_size" />
- </LinearLayout>
-
</LinearLayout>
@@ -105,14 +112,5 @@
android:text="纭� 瀹�"
android:textSize="@dimen/text_size" />
- <com.wang.avi.AVLoadingIndicatorView
- android:id="@+id/avi"
- style="@style/AVLoadingIndicatorView"
- android:layout_width="80dp"
- android:layout_height="80dp"
- android:layout_centerHorizontal="true"
- android:layout_centerVertical="true"
- android:visibility="gone"
- app:indicatorColor="@color/title_bg"
- app:indicatorName="BallClipRotatePulseIndicator" />
+
</RelativeLayout>
\ No newline at end of file
diff --git a/qihealonelibrary/src/main/res/layout/activity_domain.xml b/qihealonelibrary/src/main/res/layout/activity_domain_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_domain.xml
rename to qihealonelibrary/src/main/res/layout/activity_domain_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_electric_meter.xml b/qihealonelibrary/src/main/res/layout/activity_electric_meter_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_electric_meter.xml
rename to qihealonelibrary/src/main/res/layout/activity_electric_meter_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_electric_price.xml b/qihealonelibrary/src/main/res/layout/activity_electric_price_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_electric_price.xml
rename to qihealonelibrary/src/main/res/layout/activity_electric_price_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_electricty_price.xml b/qihealonelibrary/src/main/res/layout/activity_electricty_price_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_electricty_price.xml
rename to qihealonelibrary/src/main/res/layout/activity_electricty_price_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_home.xml b/qihealonelibrary/src/main/res/layout/activity_home_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_home.xml
rename to qihealonelibrary/src/main/res/layout/activity_home_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_identyfying.xml b/qihealonelibrary/src/main/res/layout/activity_identyfying_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_identyfying.xml
rename to qihealonelibrary/src/main/res/layout/activity_identyfying_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_ip.xml b/qihealonelibrary/src/main/res/layout/activity_ip_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_ip.xml
rename to qihealonelibrary/src/main/res/layout/activity_ip_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_location.xml b/qihealonelibrary/src/main/res/layout/activity_location_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_location.xml
rename to qihealonelibrary/src/main/res/layout/activity_location_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_main.xml b/qihealonelibrary/src/main/res/layout/activity_main_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_main.xml
rename to qihealonelibrary/src/main/res/layout/activity_main_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_manage_setup.xml b/qihealonelibrary/src/main/res/layout/activity_manage_setup_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_manage_setup.xml
rename to qihealonelibrary/src/main/res/layout/activity_manage_setup_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_my.xml b/qihealonelibrary/src/main/res/layout/activity_my_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_my.xml
rename to qihealonelibrary/src/main/res/layout/activity_my_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_new_card.xml b/qihealonelibrary/src/main/res/layout/activity_new_card_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_new_card.xml
rename to qihealonelibrary/src/main/res/layout/activity_new_card_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_newcard_list.xml b/qihealonelibrary/src/main/res/layout/activity_newcard_list_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_newcard_list.xml
rename to qihealonelibrary/src/main/res/layout/activity_newcard_list_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_parameter.xml b/qihealonelibrary/src/main/res/layout/activity_parameter_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_parameter.xml
rename to qihealonelibrary/src/main/res/layout/activity_parameter_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_password_card.xml b/qihealonelibrary/src/main/res/layout/activity_password_card_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_password_card.xml
rename to qihealonelibrary/src/main/res/layout/activity_password_card_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_patch_list.xml b/qihealonelibrary/src/main/res/layout/activity_patch_list_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_patch_list.xml
rename to qihealonelibrary/src/main/res/layout/activity_patch_list_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_patch.xml b/qihealonelibrary/src/main/res/layout/activity_patch_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_patch.xml
rename to qihealonelibrary/src/main/res/layout/activity_patch_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_power.xml b/qihealonelibrary/src/main/res/layout/activity_power_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_power.xml
rename to qihealonelibrary/src/main/res/layout/activity_power_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_psw.xml b/qihealonelibrary/src/main/res/layout/activity_psw_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_psw.xml
rename to qihealonelibrary/src/main/res/layout/activity_psw_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_read_text.xml b/qihealonelibrary/src/main/res/layout/activity_read_text_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_read_text.xml
rename to qihealonelibrary/src/main/res/layout/activity_read_text_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_recharge_detail.xml b/qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_recharge_detail.xml
rename to qihealonelibrary/src/main/res/layout/activity_recharge_detail_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_recharge_ext.xml b/qihealonelibrary/src/main/res/layout/activity_recharge_ext_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_recharge_ext.xml
rename to qihealonelibrary/src/main/res/layout/activity_recharge_ext_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_recharge_list.xml b/qihealonelibrary/src/main/res/layout/activity_recharge_list_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_recharge_list.xml
rename to qihealonelibrary/src/main/res/layout/activity_recharge_list_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_recharge.xml b/qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_recharge.xml
rename to qihealonelibrary/src/main/res/layout/activity_recharge_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_red_card.xml b/qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_red_card.xml
rename to qihealonelibrary/src/main/res/layout/activity_red_card_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_region.xml b/qihealonelibrary/src/main/res/layout/activity_region_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_region.xml
rename to qihealonelibrary/src/main/res/layout/activity_region_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_replacement.xml b/qihealonelibrary/src/main/res/layout/activity_replacement_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_replacement.xml
rename to qihealonelibrary/src/main/res/layout/activity_replacement_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_test.xml b/qihealonelibrary/src/main/res/layout/activity_test.xml
deleted file mode 100644
index ab7ceba..0000000
--- a/qihealonelibrary/src/main/res/layout/activity_test.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical">
-
-
- <TextView
- android:id="@+id/testBtn"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="娴嬭瘯" />
-
- <ImageView
- android:id="@+id/img"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:scaleType="fitCenter" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/qihealonelibrary/src/main/res/layout/activity_water_meter.xml b/qihealonelibrary/src/main/res/layout/activity_water_meter_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_water_meter.xml
rename to qihealonelibrary/src/main/res/layout/activity_water_meter_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_water_num.xml b/qihealonelibrary/src/main/res/layout/activity_water_num_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_water_num.xml
rename to qihealonelibrary/src/main/res/layout/activity_water_num_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/activity_write_text.xml b/qihealonelibrary/src/main/res/layout/activity_write_text_qha.xml
similarity index 100%
rename from qihealonelibrary/src/main/res/layout/activity_write_text.xml
rename to qihealonelibrary/src/main/res/layout/activity_write_text_qha.xml
diff --git a/qihealonelibrary/src/main/res/layout/qihe_item_replacements.xml b/qihealonelibrary/src/main/res/layout/qihe_item_replacements.xml
index 72c0f55..99ee08c 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.ReplacementActivity" />
+ type="com.dayu.qihealonelibrary.activity.ReplacementActivityQHAlone" />
</data>
--
Gitblit v1.8.0