From 87c30b3995c5ccbad64eb965181af9ee4ec16420 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 04 十二月 2023 11:33:04 +0800
Subject: [PATCH] 0312 去除获取设备标识符等疑似接口
---
Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar | 0
Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar | 0
SdkProject/library/src/main/java/com/secondworld/sdk/utils/DeviceUtil.java | 65 --------------------------------
SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdInit.java | 4 +-
4 files changed, 2 insertions(+), 67 deletions(-)
diff --git a/Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar b/Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar
index b09359b..38bed74 100644
--- a/Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar
+++ b/Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar
Binary files differ
diff --git a/Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar b/Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar
index 100a9da..929156c 100644
--- a/Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar
+++ b/Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar
Binary files differ
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdInit.java b/SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdInit.java
index 64979a2..7e4aac7 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdInit.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdInit.java
@@ -52,9 +52,9 @@
//鍙戦�佽澶囦俊鎭�
Map<String, Object> _msgStruct = new HashMap<>();
_msgStruct.put("userAgent", System.getProperty("http.agent"));
- _msgStruct.put("mac", DeviceUtil.getLocalMac());
+ _msgStruct.put("mac", DeviceUtil.getUniqueID());
_msgStruct.put("imei", "");
- _msgStruct.put("android_id", DeviceUtil.getAndroidId());
+ _msgStruct.put("android_id", DeviceUtil.getUniqueID());
_msgStruct.put("unique_id", DeviceUtil.getUniqueID());
_msgStruct.put("memoryTotal", size);
UnityMsgHandler.sendMessageToUnity(CodeA2U.DeviceInfo,_msgStruct);
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/utils/DeviceUtil.java b/SdkProject/library/src/main/java/com/secondworld/sdk/utils/DeviceUtil.java
index 81ac489..66812a4 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/utils/DeviceUtil.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/utils/DeviceUtil.java
@@ -66,12 +66,6 @@
return info.totalMem;
}
- public static String getAndroidId() {
- String ANDROID_ID = Settings.System.getString(GameAppProxy.app.getContentResolver(), Settings.System.ANDROID_ID);
- if (ANDROID_ID == null || ANDROID_ID.equals("9774d56d682e549c"))
- return "";
- return ANDROID_ID;
- }
/**
* 鍞竴鏍囪瘑
@@ -82,7 +76,6 @@
String uniqueID = SPUtils.get().getString(SPUtils.UNIQUE_ID, "");
if (!uniqueID.trim().isEmpty())
return uniqueID;
- uniqueID = getAndroidId() + getLocalMac();
//鑷繁鐢熸垚鐨剈id
if (uniqueID.trim().isEmpty())
uniqueID = UUID.randomUUID().toString();
@@ -96,63 +89,5 @@
return uniqueID;
}
-
- /**
- * mac 鍦板潃
- *
- * @return
- */
- public static String getLocalMac() {
- String mac = SPUtils.get().getString(SPUtils.MAC, "");
- if (!mac.trim().isEmpty())
- return mac;
- try {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
- String interfaceName = "wlan0";
- Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
- NetworkInterface intf = null;
- while (interfaces.hasMoreElements()) {
- intf = interfaces.nextElement();
- if (!intf.getName().equalsIgnoreCase(interfaceName))
- continue;
- byte[] addresses = intf.getHardwareAddress();
- if (mac != null) {
- StringBuilder buf = new StringBuilder();
- for (byte aMac : addresses) {
- buf.append(String.format("%02X:", aMac));
- }
- if (buf.length() > 0) {
- buf.deleteCharAt(buf.length() - 1);
- }
- mac = buf.toString();
- }
- break;
- }
- } else {
- WifiManager wifi = (WifiManager) GameAppProxy.app.getSystemService(Context.WIFI_SERVICE);
- if (wifi != null) {
- WifiInfo wifiInfo = wifi.getConnectionInfo();
- if (wifiInfo != null) {
- mac = wifiInfo.getMacAddress();
- }
- }
- }
- } catch (Throwable e) {
- e.printStackTrace();
- }
-
- mac = mac.toUpperCase(Locale.ENGLISH);
-
- if (mac.equals(FAKE_MAC))
- mac = "";
-
- SPUtils.get()
- .edit()
- .putString(SPUtils.MAC, mac.trim())
- .apply();
-
- return mac;
- }
-
}
--
Gitblit v1.8.0