From c740f3b8e9ede62b5fbcd2a8b03b834dd35fdec5 Mon Sep 17 00:00:00 2001
From: Runt <qingingrunt2010@qq.com>
Date: Thu, 28 Aug 2025 15:19:21 +0000
Subject: [PATCH] 弹框bug修复，部分优化
---
libmvi/src/main/java/com/runt/open/mvi/utils/DeviceIdUtils.java | 82 -----------------------------------------
1 files changed, 0 insertions(+), 82 deletions(-)
diff --git a/libmvi/src/main/java/com/runt/open/mvi/utils/DeviceIdUtils.java b/libmvi/src/main/java/com/runt/open/mvi/utils/DeviceIdUtils.java
index e9bea59..182ab37 100644
--- a/libmvi/src/main/java/com/runt/open/mvi/utils/DeviceIdUtils.java
+++ b/libmvi/src/main/java/com/runt/open/mvi/utils/DeviceIdUtils.java
@@ -1,71 +1,19 @@
package com.runt.open.mvi.utils;
-import android.annotation.SuppressLint;
import android.content.Context;
import android.provider.Settings;
-import android.telephony.TelephonyManager;
import android.text.TextUtils;
-
import com.github.gzuliyujiang.oaid.DeviceID;
import com.github.gzuliyujiang.oaid.DeviceIdentifier;
import org.json.JSONObject;
-import java.lang.reflect.Method;
-import java.util.HashSet;
-
/**
* copy from: http://docs.aiduoyou.com/web/#/100/1495
*/
public class DeviceIdUtils {
-
- public static String getDeviceId(Context context, int slotId) {
- try {
- //实例化TelephonyManager对象
- TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
- Method method = telephonyManager.getClass().getMethod("getDeviceId", int.class);
- return (String) method.invoke(telephonyManager, slotId);
- } catch (Exception e) {
- //e.printStackTrace();
- }
- return "";
- }
-
- public static String getImei(Context context, int slotId) {
- try {
- //实例化TelephonyManager对象
- TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
- Method method = telephonyManager.getClass().getMethod("getImei", int.class);
- return (String) method.invoke(telephonyManager, slotId);
- } catch (Exception e) {
- //e.printStackTrace();
- }
- return "";
- }
-
- @SuppressLint("MissingPermission")
- public static String getDeviceId(Context context) {
- try {
- TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
- return tm.getDeviceId();
- } catch (Exception e) {
- e.printStackTrace();
- }
- return "";
- }
- public static String getImei(Context context) {
- try {
- //实例化TelephonyManager对象
- TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
- Method method = telephonyManager.getClass().getMethod("getImei");
- return (String) method.invoke(telephonyManager);
- } catch (Exception e) {
- //e.printStackTrace();
- }
- return "";
- }
public static String getAndroidId(Context context) {
try {
@@ -79,37 +27,7 @@
public static JSONObject getDeviceIds(Context context) {
try {
- String imei1 = getDeviceId(context, 0);
- String imei2 = getDeviceId(context, 1);
- String imei3 = getImei(context, 0);
- String imei4 = getImei(context, 1);
- String imei5 = getDeviceId(context);
- String imei6 = getImei(context);
- HashSet<String> hashSet = new HashSet();
- if (!TextUtils.isEmpty(imei1)) {
- hashSet.add(imei1);
- }
- if (!TextUtils.isEmpty(imei2)) {
- hashSet.add(imei2);
- }
- if (!TextUtils.isEmpty(imei3)) {
- hashSet.add(imei3);
- }
- if (!TextUtils.isEmpty(imei4)) {
- hashSet.add(imei4);
- }
- if (!TextUtils.isEmpty(imei5)) {
- hashSet.add(imei5);
- }
- if (!TextUtils.isEmpty(imei6)) {
- hashSet.add(imei6);
- }
JSONObject jsonObject = new JSONObject();
- int i = 0;
- for (String value : hashSet) {
- i ++;
- jsonObject.put(String.valueOf(i), value);
- }
String androidId = getAndroidId(context);
if (!TextUtils.isEmpty(androidId)) {
--
Gitblit v1.9.1