From 765d5165b18938eaefbd5b3af00e8775bfb1a91f Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 28 二月 2025 09:43:35 +0800
Subject: [PATCH] 1.优化代码将http通信通用模块放在baselibrary内 2.创建通用版本的library
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardActivity.java | 61 ++++--------------------------
1 files changed, 9 insertions(+), 52 deletions(-)
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..c784129 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;
@@ -13,16 +11,17 @@
import androidx.annotation.NonNull;
+import com.dayu.baselibrary.activity.BaseActivity;
+import com.dayu.baselibrary.activity.BaseNfcActivity;
import com.dayu.baselibrary.tools.BcdUtil;
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.card.UserCardHN;
+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 +30,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;
@@ -54,12 +54,12 @@
* Date: 2023-11-10 19:52
* Description: 鏂板崱娉ㄥ唽
*/
-public class NewCardActivity extends BaseNfcActivity {
+public class NewCardActivity extends HNBaseActivity {
public static final int SCAN_IDCARD_REQUEST = 1;
UserCardBean userCardBean;
- ActivityNewCardBinding newCardBinding;
+ ActivityNewCardHnBinding newCardBinding;
AdminDataBean adminData;
static NewCardActivity newCardActivity;
@@ -68,7 +68,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 +78,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 -> {
@@ -222,41 +214,6 @@
}
- 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) {
@@ -347,7 +304,7 @@
String initPeasantCode = HexUtil.bytesToHex(Arrays.copyOfRange(readData.getBodyBytes(), 10, 26));
String serial = baseDao.adminDao().findFirst().getSerial();
- UserCard userCard = new UserCard();
+ UserCardHN userCard = new UserCardHN();
userCard.setRechargeTimes(0);
ElectricPriceBean electricPriceBean = baseDao.electricPriceDao().findFirst();
--
Gitblit v1.8.0