From a00db87bf7b73761d965152c8faa88f2f95599fe Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 23 五月 2024 16:19:26 +0800
Subject: [PATCH] 1.修复登录功能bug
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java | 8 +
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PassWordActivity.java | 6
baselibrary/src/main/res/layout/text_dialog.xml | 2
henanlibrary/src/main/java/com/dayu/henanlibrary/dao/AppDatabase.java | 5
baselibrary/src/main/java/com/dayu/baselibrary/view/TipDialog.java | 6 +
baselibrary/src/main/java/com/dayu/baselibrary/dbbean/PassWordBean.java | 3
baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseActivity.java | 7 +
/dev/null | 32 --------
app/src/main/java/com/dayu/recharge/activity/LoginActivity.java | 15 ++-
baselibrary/src/main/java/com/dayu/baselibrary/dao/AppDatabase.java | 5 +
baselibrary/src/main/res/layout/confirm_dialog.xml | 2
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/BaseNfcActivity.java | 9 +
baselibrary/src/main/res/layout/library_dialog.xml | 2
local.properties | 5
baselibrary/src/main/res/layout/password_dialog.xml | 2
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivity.java | 6
baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java | 71 +++++++++--------
baselibrary/src/main/java/com/dayu/baselibrary/dao/LoginPsDao.java | 5
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/QHAloneAppDatabase.java | 5
app/build.gradle | 6
20 files changed, 98 insertions(+), 104 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index ec755fd..9e070ee 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,9 +20,9 @@
versionName "2.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- ndk {
- abiFilters 'armeabi-v7a'
- }
+// ndk {
+// abiFilters 'armeabi-v7a'
+// }
signingConfig signingConfigs.debug
}
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 b79405b..3ab6edb 100644
--- a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
@@ -11,14 +11,14 @@
import androidx.annotation.NonNull;
import com.dayu.baselibrary.activity.BaseActivity;
+import com.dayu.baselibrary.dao.BaseDaoSingleton;
+import com.dayu.baselibrary.dbbean.PassWordBean;
import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.utils.WSMD5;
import com.dayu.baselibrary.view.LibraryDialog;
import com.dayu.henanlibrary.HeNanApplication;
import com.dayu.henanlibrary.dao.HNBaseDaoSingleton;
-
-import com.dayu.henanlibrary.dbBean.PassWordBean;
import com.dayu.qihealonelibrary.activity.HomeActivity;
import com.dayu.recharge.MyApplication;
@@ -41,6 +41,7 @@
ActivityLoginBinding binding;
PassWordBean passWordBean;
+// com.dayu.qihealonelibrary.dbBean.PassWordBean
int clickNumber;
@Override
@@ -48,7 +49,7 @@
super.onCreate(savedInstanceState);
binding = ActivityLoginBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
-
+ getPermission();
initView();
}
@@ -95,7 +96,7 @@
if (type == BaseCommon.HeNanLibrary) {
getHNPermission();
} else if (type == BaseCommon.QHAloneLibrary) {
- getQHAlonePermission();
+
}
MyApplication.myApplication.initApplication();
startToHomeActivity();
@@ -143,7 +144,7 @@
if (!file.exists()) {
file.mkdirs();
}
- passWordBean = HNBaseDaoSingleton.getInstance(LoginActivity.this).loginPsDao().findFirst();
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -165,7 +166,7 @@
}
}
- private void getQHAlonePermission() {
+ private void getPermission() {
try {
XXPermissions.with(this)
.permission(
@@ -182,7 +183,7 @@
if (!file.exists()) {
file.mkdirs();
}
- passWordBean = HNBaseDaoSingleton.getInstance(LoginActivity.this).loginPsDao().findFirst();
+ passWordBean = BaseDaoSingleton.getInstance(LoginActivity.this).loginPsDao().findFirst();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseActivity.java b/baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseActivity.java
index 73deb60..95b5e0d 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseActivity.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseActivity.java
@@ -8,6 +8,9 @@
import androidx.appcompat.app.AppCompatActivity;
+import com.dayu.baselibrary.dao.AppDatabase;
+import com.dayu.baselibrary.dao.BaseDaoSingleton;
+
/**
* Created by zuoxiao on 2018/12/20.
*/
@@ -17,6 +20,8 @@
public final String SIGN = "308202b8308201a0020101300d06092a864886f70d01010b05003022310f300d06035504030c06e5a4a7e7a6b9310f300d06035504070c06e5a4a9e6b4a5301e170d3233313132303035333131325a170d3438313131333035333131325a3022310f300d06035504030c06e5a4a7e7a6b9310f300d06035504070c06e5a4a9e6b4a530820122300d06092a864886f70d01010105000382010f003082010a0282010100a0924f3d618e4a622def691e16e54ce5bdfd035bd73e7cb947d2bf3bd0c00afa26e52963e0299fc06d76d153be696c5285d630577e1dcb2b740a72b6d904482217de308fb91c8435441ed05e844ced1e5c3446d82cb8f38751049df26a42adcfc33f1f12c2ce03f676e5d148aad800ace89670b87835e2c02a8570a0b6740d9c0669d4cb3c597d0b2dd49fc0904e885773b6d3a87d9f1e73eb526e0d1a9e9e3c48d986938286cd824151b5a6214faf89d3e699524511b23c86d3b110a7f0bb56a6d2436f69816538a62a38cb1fee6eb685d267cc200df8af51b936bd280beaa2023f75678d77a11ac6de734b30af63d394c8b63bccf2115a47ea15c9212c740d0203010001300d06092a864886f70d01010b05000382010100307cafa9b14be91ba6424cfcc6aed75b069a1c4d6eb646eab0de93f372f236f5f0a6097499df99391075d6ced18d419a2b15adb041890e2b56a3bfbd6be40efee99c5c713ba8ea1d45da09b67916106116e96eb735271c4d53e0739f753145cbc42e149ad3d9507d422ec1c6f1a7f792a4542f9a64f0de3d4f4af69f0fb3390ef3577dcf8844cf744426d173b0934d879148062c5ca64022dc99af370dbfeaf2b5d4a279b20c54a361bca12c25bf185c2885519bbbc36e46ddb083080f0cc5b1f2eafe964ebce5071b0ae7d92a34a9193861b996d2c0299b1993f41063a27038199365a6e3cb27a02ffa9facdc48a63713eb5fbf90e9fd73056aba16b28e5fee";
+ public AppDatabase baseBaseDao;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -25,6 +30,8 @@
Log.i(TAG, "isMyApp");
this.finish();
}
+ baseBaseDao = BaseDaoSingleton.getInstance(this);
+
}
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/dao/AppDatabase.java b/baselibrary/src/main/java/com/dayu/baselibrary/dao/AppDatabase.java
index 3f0ef85..1b7d96d 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/dao/AppDatabase.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/dao/AppDatabase.java
@@ -4,6 +4,7 @@
import androidx.room.RoomDatabase;
import com.dayu.baselibrary.dbbean.LibraryBean;
+import com.dayu.baselibrary.dbbean.PassWordBean;
/**
@@ -12,7 +13,7 @@
* Date: 2023-11-05 16:23
* Description:
*/
-@Database(entities = {LibraryBean.class}, version = AppDatabase.version, exportSchema = false)
+@Database(entities = {LibraryBean.class, PassWordBean.class}, version = AppDatabase.version, exportSchema = false)
public abstract class AppDatabase extends RoomDatabase {
public final static int version = 3;
@@ -20,5 +21,7 @@
public abstract LibraryDao libraryDao();
+ public abstract LoginPsDao loginPsDao();
+
}
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/dao/LoginPsDao.java b/baselibrary/src/main/java/com/dayu/baselibrary/dao/LoginPsDao.java
similarity index 87%
rename from henanlibrary/src/main/java/com/dayu/henanlibrary/dao/LoginPsDao.java
rename to baselibrary/src/main/java/com/dayu/baselibrary/dao/LoginPsDao.java
index 23431ce..d4c004e 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/dao/LoginPsDao.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/dao/LoginPsDao.java
@@ -1,4 +1,4 @@
-package com.dayu.henanlibrary.dao;
+package com.dayu.baselibrary.dao;
import androidx.room.Dao;
import androidx.room.Delete;
@@ -7,7 +7,8 @@
import androidx.room.Query;
import androidx.room.Update;
-import com.dayu.henanlibrary.dbBean.PassWordBean;
+import com.dayu.baselibrary.dbbean.PassWordBean;
+
/**
* Copyright (C), 2023,
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/dbBean/PassWordBean.java b/baselibrary/src/main/java/com/dayu/baselibrary/dbbean/PassWordBean.java
similarity index 91%
rename from henanlibrary/src/main/java/com/dayu/henanlibrary/dbBean/PassWordBean.java
rename to baselibrary/src/main/java/com/dayu/baselibrary/dbbean/PassWordBean.java
index 219c818..46a5ab5 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/dbBean/PassWordBean.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/dbbean/PassWordBean.java
@@ -1,7 +1,8 @@
-package com.dayu.henanlibrary.dbBean;
+package com.dayu.baselibrary.dbbean;
import androidx.room.Entity;
import androidx.room.PrimaryKey;
+
@Entity
public class PassWordBean {
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 48301b1..d593f50 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java
@@ -48,41 +48,44 @@
setCanceledOnTouchOutside(false);
RadioGroup radioGroup = findViewById(R.id.radioLibrary);
libraryDao = BaseDaoSingleton.getInstance(mContext).libraryDao();
- libraryBean = libraryDao.findFirst();
- if (libraryBean == null) {
- libraryBean = new LibraryBean();
+ if (libraryDao != null) {
+ libraryBean = libraryDao.findFirst();
+ if (libraryBean == null) {
+ libraryBean = new LibraryBean();
+ }
+
+ radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
+ ischose = true;
+ // 褰撻�変腑鐨凴adioButton鍙戠敓鍙樺寲鏃惰皟鐢�
+ 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) {
+ //浜屾纭
+ confirmDialog = new ConfirmDialog(mContext, data, new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ libraryDao.insert(libraryBean);
+ mLibraryBack.listener(type);
+ LibraryDialog.this.dismiss();
+ confirmDialog.dismiss();
+ }
+ });
+ confirmDialog.show();
+
+ }
+ });
+
}
-
- radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
- ischose = true;
- // 褰撻�変腑鐨凴adioButton鍙戠敓鍙樺寲鏃惰皟鐢�
- 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) {
- //浜屾纭
- confirmDialog = new ConfirmDialog(mContext, data, new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- libraryDao.insert(libraryBean);
- mLibraryBack.listener(type);
- LibraryDialog.this.dismiss();
- confirmDialog.dismiss();
- }
- });
- confirmDialog.show();
-
- }
- });
}
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/view/TipDialog.java b/baselibrary/src/main/java/com/dayu/baselibrary/view/TipDialog.java
index df7a21b..770ceae 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/view/TipDialog.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/view/TipDialog.java
@@ -48,7 +48,11 @@
mDialogBack = dialogBack;
initView();
}
-
+ @Override
+ public void onBackPressed() {
+ // 鎷︽埅杩斿洖閿簨浠讹紝涓嶆墽琛岄粯璁ょ殑鎿嶄綔
+ // 濡傛灉鎯宠瀵硅瘽妗嗘秷澶憋紝鍙互鍦ㄦ澶勮皟鐢� super.onBackPressed();
+ }
private void initView() {
getWindow().setGravity(Gravity.CENTER);
setContentView(R.layout.text_dialog);
diff --git a/baselibrary/src/main/res/layout/confirm_dialog.xml b/baselibrary/src/main/res/layout/confirm_dialog.xml
index eb1bbf4..58ae784 100644
--- a/baselibrary/src/main/res/layout/confirm_dialog.xml
+++ b/baselibrary/src/main/res/layout/confirm_dialog.xml
@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#00ffffff"
+ android:background="#40000000"
android:gravity="center"
android:orientation="vertical">
diff --git a/baselibrary/src/main/res/layout/library_dialog.xml b/baselibrary/src/main/res/layout/library_dialog.xml
index 045f51d..8b86cc5 100644
--- a/baselibrary/src/main/res/layout/library_dialog.xml
+++ b/baselibrary/src/main/res/layout/library_dialog.xml
@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#00ffffff"
+ android:background="#40000000"
android:gravity="center"
android:orientation="vertical">
diff --git a/baselibrary/src/main/res/layout/password_dialog.xml b/baselibrary/src/main/res/layout/password_dialog.xml
index 1e0163c..c58bef0 100644
--- a/baselibrary/src/main/res/layout/password_dialog.xml
+++ b/baselibrary/src/main/res/layout/password_dialog.xml
@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#00ffffff"
+ android:background="#40000000"
android:gravity="center"
android:orientation="vertical">
diff --git a/baselibrary/src/main/res/layout/text_dialog.xml b/baselibrary/src/main/res/layout/text_dialog.xml
index a3caf38..4b4b1cb 100644
--- a/baselibrary/src/main/res/layout/text_dialog.xml
+++ b/baselibrary/src/main/res/layout/text_dialog.xml
@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#00ffffff"
+ android:background="#40000000"
android:gravity="center"
android:orientation="vertical">
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/BaseNfcActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/BaseNfcActivity.java
index 7b55542..bfa2776 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/BaseNfcActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/BaseNfcActivity.java
@@ -83,7 +83,7 @@
public void onResume() {
super.onResume();
if (!ifNFCUse(this)) {
- this.finish();
+
}
//璁剧疆澶勭悊浼樹簬鎵�鏈夊叾浠朜FC鐨勫鐞�
if (mNfcAdapter != null)
@@ -117,7 +117,12 @@
*/
protected Boolean ifNFCUse(Activity context) {
if (mNfcAdapter == null) {
- TipUtil.show(context, "璁惧涓嶆敮鎸丯FC锛�");
+ TipUtil.show(context, "璁惧涓嶆敮鎸丯FC锛�", new TipUtil.TipListener() {
+ @Override
+ public void onCancle() {
+ BaseNfcActivity.this.finish();
+ }
+ });
return false;
}
if (mNfcAdapter != null && !mNfcAdapter.isEnabled()) {
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 700717b..b19c539 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PassWordActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/PassWordActivity.java
@@ -4,10 +4,10 @@
import android.text.TextUtils;
import android.view.LayoutInflater;
+import com.dayu.baselibrary.dbbean.PassWordBean;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.utils.WSMD5;
import com.dayu.henanlibrary.databinding.ActivityPswHnBinding;
-import com.dayu.henanlibrary.dbBean.PassWordBean;
/**
* Copyright (C), 2023,
@@ -28,7 +28,7 @@
setContentView(pswBinding.getRoot());
pswBinding.waterOk.setOnClickListener(v -> {
try {
- passWordBean = baseDao.loginPsDao().findFirst();
+ passWordBean = baseBaseDao.loginPsDao().findFirst();
if (!TextUtils.isEmpty(pswBinding.pswNew.getText().toString()) && !TextUtils.isEmpty(pswBinding.pswOld.getText().toString()) && !TextUtils.isEmpty(pswBinding.pswNewAgin.getText().toString())) {
if ((passWordBean != null
@@ -40,7 +40,7 @@
if (pswBinding.pswNew.getText().toString().equals(pswBinding.pswNewAgin.getText().toString())) {
String passWord = WSMD5.getMD5Str(pswBinding.pswNewAgin.getText().toString());
passWordBean.setPassWord(passWord);
- baseDao.loginPsDao().insert(passWordBean);
+ baseBaseDao.loginPsDao().insert(passWordBean);
TipUtil.show(PassWordActivity.this, "瀵嗙爜淇敼瀹屾垚", () -> {
PassWordActivity.this.finish();
});
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/dao/AppDatabase.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/dao/AppDatabase.java
index e1dc339..7fae578 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/dao/AppDatabase.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/dao/AppDatabase.java
@@ -10,7 +10,6 @@
import com.dayu.henanlibrary.dbBean.ElectricPriceBean;
import com.dayu.henanlibrary.dbBean.IdentityBean;
import com.dayu.henanlibrary.dbBean.IpBean;
-import com.dayu.henanlibrary.dbBean.PassWordBean;
import com.dayu.henanlibrary.dbBean.PowerBean;
import com.dayu.henanlibrary.dbBean.RechargeBean;
import com.dayu.henanlibrary.dbBean.UserCardBean;
@@ -21,13 +20,13 @@
* Date: 2023-11-05 16:23
* Description:
*/
-@Database(entities = {CardData.class, DeviceNumber.class, IdentityBean.class, DomainBean.class, ElectricPriceBean.class, IpBean.class, AdminDataBean.class, PassWordBean.class, UserCardBean.class, RechargeBean.class, PowerBean.class}, version = com.dayu.baselibrary.dao.AppDatabase.version, exportSchema = false)
+@Database(entities = {CardData.class, DeviceNumber.class, IdentityBean.class, DomainBean.class, ElectricPriceBean.class, IpBean.class, AdminDataBean.class, UserCardBean.class, RechargeBean.class, PowerBean.class}, version = com.dayu.baselibrary.dao.AppDatabase.version, exportSchema = false)
public abstract class AppDatabase extends RoomDatabase {
public abstract AdminDataDao adminDao();
- public abstract LoginPsDao loginPsDao();
+
public abstract UserCardDao userCardDao();
diff --git a/local.properties b/local.properties
index 36d8ed3..efd65e3 100644
--- a/local.properties
+++ b/local.properties
@@ -4,6 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Mon May 13 11:15:58 CST 2024
-#ndk.dir=D\:\\android\\sdk\\ndk\\android-ndk-r21
-sdk.dir=D\:\\AndroidStudio\\sdk
+#Fri May 17 09:12:28 CST 2024
+sdk.dir=D\:\\android\\sdk
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java
index 00a9e59..abdffbc 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java
@@ -60,7 +60,6 @@
public void onResume() {
super.onResume();
if (!ifNFCUse(this)) {
- this.finish();
}
//璁剧疆澶勭悊浼樹簬鎵�鏈夊叾浠朜FC鐨勫鐞�
if (mNfcAdapter != null)
@@ -89,7 +88,12 @@
*/
protected Boolean ifNFCUse(Activity context) {
if (mNfcAdapter == null) {
- TipUtil.show(context, "璁惧涓嶆敮鎸丯FC锛�");
+ TipUtil.show(context, "璁惧涓嶆敮鎸丯FC锛�", new TipUtil.TipListener() {
+ @Override
+ public void onCancle() {
+ BaseNfcActivity.this.finish();
+ }
+ });
return false;
}
if (mNfcAdapter != null && !mNfcAdapter.isEnabled()) {
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivity.java
index cbce68f..35f4e50 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/PassWordActivity.java
@@ -5,10 +5,10 @@
import android.view.LayoutInflater;
import android.view.View;
+import com.dayu.baselibrary.dbbean.PassWordBean;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.utils.WSMD5;
import com.dayu.qihealonelibrary.databinding.ActivityPswQhaBinding;
-import com.dayu.qihealonelibrary.dbBean.PassWordBean;
/**
@@ -32,7 +32,7 @@
@Override
public void onClick(View v) {
try {
- passWordBean = baseDao.loginPsDao().findFirst();
+ passWordBean = baseBaseDao.loginPsDao().findFirst();
if (!TextUtils.isEmpty(pswBinding.pswNew.getText().toString()) && !TextUtils.isEmpty(pswBinding.pswOld.getText().toString()) && !TextUtils.isEmpty(pswBinding.pswNewAgin.getText().toString())) {
if ((passWordBean != null
@@ -43,7 +43,7 @@
}
if (pswBinding.pswNew.getText().toString().equals(pswBinding.pswNewAgin.getText().toString())) {
passWordBean.setPassWord(pswBinding.pswNewAgin.getText().toString());
- baseDao.loginPsDao().insert(passWordBean);
+ baseBaseDao.loginPsDao().insert(passWordBean);
TipUtil.show(PassWordActivity.this, "瀵嗙爜淇敼瀹屾垚", () -> {
PassWordActivity.this.finish();
});
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/LoginPsDao.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/LoginPsDao.java
deleted file mode 100644
index 89b5e82..0000000
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/LoginPsDao.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.dayu.qihealonelibrary.dao;
-
-import androidx.room.Dao;
-import androidx.room.Delete;
-import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
-import androidx.room.Query;
-import androidx.room.Update;
-
-import com.dayu.qihealonelibrary.dbBean.PassWordBean;
-
-/**
- * Copyright (C), 2023,
- * Author: zuo
- * Date: 2023-11-06 20:27
- * Description: 鐧诲綍瀵嗙爜淇濆瓨
- */
-@Dao
-public interface LoginPsDao {
- @Insert(onConflict = OnConflictStrategy.REPLACE)
- void insert(PassWordBean passWordBean);
-
- @Update
- void update(PassWordBean passWordBean);
-
- @Delete
- void delete(PassWordBean passWordBean);
-
- @Query("select * from PassWordBean limit 1")
- PassWordBean findFirst();
-}
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/QHAloneAppDatabase.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/QHAloneAppDatabase.java
index 57c5699..886e787 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/QHAloneAppDatabase.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/QHAloneAppDatabase.java
@@ -13,7 +13,6 @@
import com.dayu.qihealonelibrary.dbBean.ElectricPriceBean;
import com.dayu.qihealonelibrary.dbBean.IdentityBean;
import com.dayu.qihealonelibrary.dbBean.IpBean;
-import com.dayu.qihealonelibrary.dbBean.PassWordBean;
import com.dayu.qihealonelibrary.dbBean.PassWordCardBean;
import com.dayu.qihealonelibrary.dbBean.PowerBean;
import com.dayu.qihealonelibrary.dbBean.RechargeBean;
@@ -27,13 +26,13 @@
* Date: 2023-11-05 16:23
* Description:
*/
-@Database(entities = {RegionBean.class, PassWordCardBean.class, CardData.class, DeviceNumber.class, IdentityBean.class, DomainBean.class, ElectricPriceBean.class, IpBean.class, AdminDataBean.class, PassWordBean.class, UserCardBean.class, RechargeBean.class, PowerBean.class}, version = com.dayu.baselibrary.dao.AppDatabase.version, exportSchema = false)
+@Database(entities = {RegionBean.class, PassWordCardBean.class, CardData.class, DeviceNumber.class, IdentityBean.class, DomainBean.class, ElectricPriceBean.class, IpBean.class, AdminDataBean.class, UserCardBean.class, RechargeBean.class, PowerBean.class}, version = com.dayu.baselibrary.dao.AppDatabase.version, exportSchema = false)
public abstract class QHAloneAppDatabase extends RoomDatabase {
public abstract AdminDataDao adminDao();
- public abstract LoginPsDao loginPsDao();
+
public abstract UserCardDao userCardDao();
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/PassWordBean.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/PassWordBean.java
deleted file mode 100644
index 95b2fe1..0000000
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dbBean/PassWordBean.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.dayu.qihealonelibrary.dbBean;
-
-import androidx.room.Entity;
-import androidx.room.PrimaryKey;
-
-
-/**
- * 鐢ㄦ埛鐧诲綍瀵嗙爜
- */
-@Entity
-public class PassWordBean {
-
- @PrimaryKey(autoGenerate = true)
- public long id;
- private String passWord = "";
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getPassWord() {
- return passWord;
- }
-
- public void setPassWord(String passWord) {
- this.passWord = passWord;
- }
-}
--
Gitblit v1.8.0