From 88c82455871cd03e0a0b6f32591f9bee74a2dc34 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 05 三月 2024 14:52:22 +0800
Subject: [PATCH] 1.修改卡标识的bug 2.优化卡结构的代码
---
app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java b/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
index f552940..1c3029e 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/NewCardActivity.java
@@ -1,6 +1,5 @@
package com.dayu.recharge.activity;
-import android.Manifest;
import android.app.Dialog;
import android.content.Intent;
import android.os.Bundle;
@@ -10,8 +9,7 @@
import android.view.LayoutInflater;
import android.view.View;
-import com.dayu.recharge.utils.DeviceNumberUtils;
-import com.dayu.recharge.view.ProgressDialog;
+import androidx.annotation.NonNull;
import com.dayu.recharge.MyApplication;
import com.dayu.recharge.card.UserCard;
@@ -28,14 +26,19 @@
import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.tools.Utils;
import com.dayu.recharge.utils.CRC8;
+import com.dayu.recharge.utils.DeviceNumberUtils;
import com.dayu.recharge.utils.SocketUtil;
import com.dayu.recharge.utils.TipUtil;
-import com.permissionx.guolindev.PermissionX;
+import com.dayu.recharge.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;
@@ -75,7 +78,7 @@
@Override
public void onClick(View v) {
- rxPermission();
+ getPermission();
}
});
@@ -154,22 +157,40 @@
}
- private void rxPermission() {
- PermissionX.init(NewCardActivity.this).permissions(Manifest.permission.CAMERA)
- .onExplainRequestReason((scope, deniedList) -> {
+ private void getPermission() {
+ try {
+ XXPermissions.with(this)
+ // 鐢宠鍗曚釜鏉冮檺
+// .permission(Permission.RECORD_AUDIO)
+ // 鐢宠澶氫釜鏉冮檺
+ .permission(Permission.CAMERA)
+ // 璁剧疆鏉冮檺璇锋眰鎷︽埅鍣紙灞�閮ㄨ缃級
+ //.interceptor(new PermissionInterceptor())
+ // 璁剧疆涓嶈Е鍙戦敊璇娴嬫満鍒讹紙灞�閮ㄨ缃級
+ //.unchecked()
+ .request(new OnPermissionCallback() {
-// val message = "PermissionX闇�瑕佹偍鍚屾剰浠ヤ笅鏉冮檺鎵嶈兘姝ｅ父浣跨敤"
- })
- .request((allGranted, grantedList, deniedList) -> {
- if (allGranted) {//鎵�鏈夌敵璇风殑鏉冮檺閮藉凡閫氳繃
-// startCamera();
- } else {//鎮ㄦ嫆缁濅簡濡備笅鏉冮檺锛�$deniedList
+ @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
@@ -349,6 +370,7 @@
// 姹夊瓧鐨刄nicode鑼冨洿鏄細0x4e00 - 0x9fa5
return (c >= 0x4e00 && c <= 0x9fa5);
}
+
}
@Override
--
Gitblit v1.8.0