From db535cf2813c4304db1348548ec81b3f0b8382b7 Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Wed, 21 Jun 2023 11:20:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A8=A1=E6=8B=9F?=
 =?UTF-8?q?=E5=99=A8=E4=B8=8A=20OAID=20SDK=20=E9=97=AA=E9=80=80=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=9C=A8=E6=89=80=E6=9C=89=20postIn?=
 =?UTF-8?q?it=20=E6=93=8D=E4=BD=9C=E5=89=8D=E5=88=9D=E5=A7=8B=E5=8C=96=20s?=
 =?UTF-8?q?entry?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/gh/common/util/DataUtils.java    |  3 +--
 app/src/main/java/com/halo/assistant/HaloApp.java      |  9 +++------
 .../java/com/gh/gamecenter/oaid/OAIDProviderImpl.kt    | 10 +++++++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/gh/common/util/DataUtils.java b/app/src/main/java/com/gh/common/util/DataUtils.java
index b228171c8d..713408d7a7 100644
--- a/app/src/main/java/com/gh/common/util/DataUtils.java
+++ b/app/src/main/java/com/gh/common/util/DataUtils.java
@@ -57,8 +57,7 @@ public class DataUtils {
             return;
         }
 
-        // 初始化 Sentry 约占用 90ms，这里切换到子线程初始化
-        AppExecutor.getIoExecutor().execute(() -> initSentry(context, channel));
+        initSentry(context, channel);
     }
 
     private static void initSentry(Context context, String channel) {
diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java
index 3fbd7a0f38..ebe6c14499 100644
--- a/app/src/main/java/com/halo/assistant/HaloApp.java
+++ b/app/src/main/java/com/halo/assistant/HaloApp.java
@@ -289,6 +289,9 @@ public class HaloApp extends MultiDexApplication {
     }
 
     private void postInit(long delay) {
+        // 初始化 sentry
+        DataUtils.init(this, mChannel);
+
         // 获取/更新 GID 和 读 SP 的操作不需要 delay
         DataUtils.getGid();
 
@@ -313,8 +316,6 @@ public class HaloApp extends MultiDexApplication {
         MainWrapperRepository.Companion.getInstance().getHomeNavBar();
 
         AppExecutor.getUiExecutor().executeWithDelay(() -> {
-            initThirdPartySdk();
-
             FixedRateJobHelper.begin();
 
             RegionSettingHelper.getRegionSetting();
@@ -382,10 +383,6 @@ public class HaloApp extends MultiDexApplication {
         });
     }
 
-    private void initThirdPartySdk() {
-        DataUtils.init(this, mChannel);
-    }
-
     private void initDataHelper() {
         VideoRecordUtils.init(this, AppExecutor.getLogExecutor());
     }
diff --git a/feature/oaid/src/main/java/com/gh/gamecenter/oaid/OAIDProviderImpl.kt b/feature/oaid/src/main/java/com/gh/gamecenter/oaid/OAIDProviderImpl.kt
index 289ff06ff6..d9b38c69a8 100644
--- a/feature/oaid/src/main/java/com/gh/gamecenter/oaid/OAIDProviderImpl.kt
+++ b/feature/oaid/src/main/java/com/gh/gamecenter/oaid/OAIDProviderImpl.kt
@@ -59,7 +59,15 @@ class OAIDProviderImpl : IOAIDProvider {
                 override fun onSuccess(data: CertEntity) {
                     Utils.log(TAG, "获取到的证书为 ${data.cert}")
 
-                    val result = MdidSdkHelper.InitCert(context, data.cert)
+                    var result = false
+                    try {
+                        result = MdidSdkHelper.InitCert(context, data.cert)
+                    } catch (e: Throwable) {
+                        e.printStackTrace()
+
+                        Utils.log(TAG, "初始化证书异常 ${e.localizedMessage}")
+                    }
+
                     SPUtils.setString(SP_OAID_CERT, data.cert)
 
                     Utils.log(TAG, "初始化证书结果 $result")