From b5b0bd260898f816f171aec59f20098fe67eaffe Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 27 三月 2024 15:46:46 +0800
Subject: [PATCH] IP设置界面调整
---
app/src/main/java/com/dayu/recharge/activity/LoginActivity.java | 72 +++++++++++++++++++++++++-----------
1 files changed, 50 insertions(+), 22 deletions(-)
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 664b632..8d0138b 100644
--- a/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/LoginActivity.java
@@ -8,6 +8,7 @@
import android.view.View;
import android.widget.Toast;
+import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import com.dayu.recharge.MyApplication;
@@ -16,9 +17,12 @@
import com.dayu.recharge.dbBean.PassWordBean;
import com.dayu.recharge.utils.TipUtil;
import com.dayu.recharge.utils.WSMD5;
-import com.permissionx.guolindev.PermissionX;
+import com.hjq.permissions.OnPermissionCallback;
+import com.hjq.permissions.Permission;
+import com.hjq.permissions.XXPermissions;
import java.io.File;
+import java.util.List;
/**
@@ -27,7 +31,7 @@
* Date: 2023-11-10 19:52
* Description: 鐧诲綍鐣岄潰
*/
-public class LoginActivity extends AppCompatActivity {
+public class LoginActivity extends BaseActivity {
ActivityLoginBinding binding;
PassWordBean passWordBean;
@@ -51,7 +55,7 @@
return;
}
if ((passWordBean == null && psStr.equals("123456"))
- || passWordBean != null && passWordBean.getPassWord().equals(psStr)) {
+ || passWordBean != null && passWordBean.getPassWord().equalsIgnoreCase(WSMD5.getMD5Str(psStr))) {
startActivity(new Intent(LoginActivity.this, HomeActivity.class));
LoginActivity.this.finish();
} else {
@@ -62,27 +66,51 @@
}
private void getPermission() {
- PermissionX.init(LoginActivity.this).permissions(Manifest.permission.READ_PHONE_STATE,
- Manifest.permission.READ_EXTERNAL_STORAGE,
- Manifest.permission.WRITE_EXTERNAL_STORAGE)
- .onExplainRequestReason((scope, deniedList) -> {
- })
- .request((allGranted, grantedList, deniedList) -> {
- if (allGranted) {//鎵�鏈夌敵璇风殑鏉冮檺閮藉凡閫氳繃
- MyApplication.myApplication.initEasySocket(false, null);
- try {
- File file = new File(BaseDaoSingleton.SqlitePath);
- if (!file.exists()) {
- file.mkdirs();
+ try {
+
+
+ XXPermissions.with(this)
+ // 鐢宠鍗曚釜鏉冮檺
+// .permission(Permission.RECORD_AUDIO)
+ // 鐢宠澶氫釜鏉冮檺
+ .permission(Permission.READ_PHONE_STATE,
+ Permission.READ_EXTERNAL_STORAGE,
+ Permission.WRITE_EXTERNAL_STORAGE)
+ // 璁剧疆鏉冮檺璇锋眰鎷︽埅鍣紙灞�閮ㄨ缃級
+ //.interceptor(new PermissionInterceptor())
+ // 璁剧疆涓嶈Е鍙戦敊璇娴嬫満鍒讹紙灞�閮ㄨ缃級
+ //.unchecked()
+ .request(new OnPermissionCallback() {
+
+ @Override
+ public void onGranted(@NonNull List<String> permissions, boolean allGranted) {
+ if (allGranted) {
+ if (allGranted) {//鎵�鏈夌敵璇风殑鏉冮檺閮藉凡閫氳繃
+ MyApplication.myApplication.initEasySocket(false, null);
+ try {
+ File file = new File(BaseDaoSingleton.SqlitePath);
+ if (!file.exists()) {
+ file.mkdirs();
+ }
+ passWordBean = BaseDaoSingleton.getInstance(LoginActivity.this).loginPsDao().findFirst();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
- passWordBean = BaseDaoSingleton.getInstance(this).loginPsDao().findFirst();
- } catch (Exception e) {
- e.printStackTrace();
}
- } else {//鎮ㄦ嫆缁濅簡濡備笅鏉冮檺锛�$deniedList
-
- }
- });
+ @Override
+ public void onDenied(@NonNull List<String> permissions, boolean doNotAskAgain) {
+ if (doNotAskAgain) {
+ // 濡傛灉鏄姘镐箙鎷掔粷灏辫烦杞埌搴旂敤鏉冮檺绯荤粺璁剧疆椤甸潰
+ } else {
+// toast("鑾峰彇褰曢煶鍜屾棩鍘嗘潈闄愬け璐�");
+ }
+ }
+ });
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
}
}
--
Gitblit v1.8.0