0312 取消电话权限

hch

2022-07-25 debe09abdced7f6047e98a67d8a53393c3f8c6c2

0312 取消电话权限

 Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar

Binary files differ

 Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar

Binary files differ

 SdkProject/channel/x7bt5/AndroidManifest.xml

@@ -7,7 +7,6 @@
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="merge"/>
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
    <uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="merge"/>
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />

 SdkProject/library/src/main/java/com/secondworld/sdk/utils/DeviceUtil.java

@@ -67,10 +67,11 @@
    }

    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;
//        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;
        return  "";
    }

    /**
@@ -103,55 +104,56 @@
     * @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;
        return "";
//        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;
    }