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/NewCardActivity.java | 53 ++++-------------------------------------------------
1 files changed, 4 insertions(+), 49 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..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
--
Gitblit v1.8.0