feat: 适配oaid1.0.27版本

growingio · Sep 23, 2021 · b216efa · b216efa
1 parent 6a58e3d
commit b216efa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/growingio-tools/oaid/libs/msa_helper.jar b/growingio-tools/oaid/libs/msa_helper.jar
diff --git a/growingio-tools/oaid/resources/OaidHelper1026.java b/growingio-tools/oaid/resources/OaidHelper1026.java
@@ -82,6 +82,7 @@ public void preloadOaid(Context context) {
                         Logger.w(TAG, "getDeviceIds: cert init failed");
                     }
                 }
+
                 int initCode = MdidSdkHelper.InitSdk(context, true, mListener);
                 switch (initCode) {
                     case InfoCode.INIT_INFO_RESULT_DELAY:
@@ -128,9 +129,17 @@ public String getOaid() {
     }
 
     private static void initSDKLibrary() {
+        // 不能通过MdidSdkHelper判断版本加载不同so，获取版本号为native方法
+        // 适配1.0.27的oaid_sdk
+        loadLibrary("nllvm1630571663641560568");
+        // 适配1.0.26的oaid_sdk
+        loadLibrary("nllvm1623827671");
+    }
+
+    private static void loadLibrary(String libName) {
         try {
-            System.loadLibrary("nllvm1623827671");
-        } catch (Throwable var1) {
+            System.loadLibrary(libName);
+        } catch (Throwable ignored) {
         }
     }