荣耀真机验证荣耀广告标识符SDK

gzu-liyujiang · Dec 6, 2023 · 80da36d · 80da36d
1 parent 036d318
commit 80da36d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/app/src/main/java/com/github/gzuliyujiang/fallback/DemoApp.java b/app/src/main/java/com/github/gzuliyujiang/fallback/DemoApp.java
@@ -30,18 +30,16 @@ public class DemoApp extends Application {
     private boolean privacyPolicyAgreed = false;
 
     static {
-        if (BuildConfig.DEBUG) {
-            // 开启日志打印，默认是关闭的，启动本应用会打印如下类似的日志：
-            // IMEI/MEID not allowed on Android 10+
-            // android.content.pm.PackageManager$NameNotFoundException: com.mdid.msa
-            // Google Play Service has been found: com.github.gzuliyujiang.oaid.impl.GmsImpl
-            // Service has been bound: Intent { act=com.google.android.gms.ads.identifier.service.START pkg=com.google.android.gms }
-            // Service has been connected: com.google.android.gms.ads.identifier.service.AdvertisingIdService
-            // OAID/AAID acquire success: 3f398576-c70a-455c-95ab-1fe35a9ae175
-            // Client id is OAID/AAID: 3f398576-c70a-455c-95ab-1fe35a9ae175
-            // Service has been unbound: com.google.android.gms.ads.identifier.service.AdvertisingIdService
-            OAIDLog.enable();
-        }
+        // 开启日志打印，默认是关闭的，启动本应用会打印如下类似的日志：
+        // IMEI/MEID not allowed on Android 10+
+        // android.content.pm.PackageManager$NameNotFoundException: com.mdid.msa
+        // Google Play Service has been found: com.github.gzuliyujiang.oaid.impl.GmsImpl
+        // Service has been bound: Intent { act=com.google.android.gms.ads.identifier.service.START pkg=com.google.android.gms }
+        // Service has been connected: com.google.android.gms.ads.identifier.service.AdvertisingIdService
+        // OAID/AAID acquire success: 3f398576-c70a-455c-95ab-1fe35a9ae175
+        // Client id is OAID/AAID: 3f398576-c70a-455c-95ab-1fe35a9ae175
+        // Service has been unbound: com.google.android.gms.ads.identifier.service.AdvertisingIdService
+        OAIDLog.enable();
     }
 
     @Override

diff --git a/demo.apk b/demo.apk
diff --git a/library/src/main/java/com/github/gzuliyujiang/oaid/DeviceID.java b/library/src/main/java/com/github/gzuliyujiang/oaid/DeviceID.java
@@ -218,7 +218,9 @@ public static String getOAID() {
      * @param getter  回调
      */
     public static void getOAID(Context context, IGetter getter) {
-        OAIDFactory.create(context).doGet(getter);
+        IOAID ioaid = OAIDFactory.create(context);
+        OAIDLog.print("OAID implements class: " + ioaid.getClass().getName());
+        ioaid.doGet(getter);
     }
 
     /**

diff --git a/library/src/main/java/com/github/gzuliyujiang/oaid/DeviceIdentifier.java b/library/src/main/java/com/github/gzuliyujiang/oaid/DeviceIdentifier.java
@@ -24,6 +24,7 @@
  *
  * @author 贵州山野羡民（1032694760@qq.com）
  * @since 2021/9/1 10:06
+ * @noinspection unused
  */
 public final class DeviceIdentifier {
     private static volatile boolean registered = false;

diff --git a/library/src/main/java/com/github/gzuliyujiang/oaid/OAIDLog.java b/library/src/main/java/com/github/gzuliyujiang/oaid/OAIDLog.java
@@ -48,7 +48,7 @@ public static void print(Object log) {
         if (log == null) {
             log = "<null>";
         }
-        Log.d(TAG, log.toString());
+        Log.i(TAG, log.toString());
     }
 
 }
diff --git a/library/src/main/java/com/github/gzuliyujiang/oaid/impl/OAIDFactory.java b/library/src/main/java/com/github/gzuliyujiang/oaid/impl/OAIDFactory.java
@@ -73,10 +73,10 @@ private static IOAID createManufacturerImpl(Context context) {
             return new AsusImpl(context);
         }
         if (OAIDRom.isHonor()) {
-            HonorImpl honorImpl = new HonorImpl(context);
-            if (honorImpl.supported()) {
+            HonorImpl honor = new HonorImpl(context);
+            if (honor.supported()) {
                 // 支持的话（Magic UI 4.0,5.0,6.0及MagicOS 7.0或以上）直接使用荣耀的实现，否则尝试华为的实现
-                return honorImpl;
+                return honor;
             }
         }
         if (OAIDRom.isHuawei() || OAIDRom.isEmui()) {
@@ -86,9 +86,8 @@ private static IOAID createManufacturerImpl(Context context) {
             OppoImpl oppo = new OppoImpl(context);
             if (oppo.supported()) {
                 return oppo;
-            } else {
-                return new OppoExtImpl(context);
             }
+            return new OppoExtImpl(context);
         }
         if (OAIDRom.isCoolpad(context)) {
             return new CoolpadImpl(context);

diff --git a/screenshot/oaid_honor.png b/screenshot/oaid_honor.png