diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 50b4a8f..a113ceb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> + \ No newline at end of file diff --git a/vastlib/src/main/java/com/example/vastlib/utils/AndroidIdManager.kt b/vastlib/src/main/java/com/example/vastlib/utils/AndroidIdManager.kt index 51cf892..68fc49b 100644 --- a/vastlib/src/main/java/com/example/vastlib/utils/AndroidIdManager.kt +++ b/vastlib/src/main/java/com/example/vastlib/utils/AndroidIdManager.kt @@ -51,7 +51,7 @@ object AndroidIdManager { } else { null } - id + id = if(id == null || id?.contains("00000000") == true) Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID) else id }catch (e:NameNotFoundException){ e.printStackTrace() id = Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID) @@ -59,8 +59,8 @@ object AndroidIdManager { } } -// LogUtils.info("get android Id ${Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)}") - return if(id == null || id?.contains("00000000") == true) Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID) else id!! + LogUtils.info("get android Id ${Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)}, $id") + return id!! } private class AdvertisingConnection : ServiceConnection {