hch
2023-12-04 87c30b3995c5ccbad64eb965181af9ee4ec16420
0312 去除获取设备标识符等疑似接口
4个文件已修改
69 ■■■■■ 已修改文件
Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdInit.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/src/main/java/com/secondworld/sdk/utils/DeviceUtil.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/mlgtgame/debug/libs/library-debug-mlgtgame.aar
Binary files differ
Channel/Android/mlgtgame/release/libs/library-release-mlgtgame.aar
Binary files differ
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);
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();
        //自己生成的uid
        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;
    }
}