From 69f1dee9b594b80c9629128c45e3901c29efb83b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 27 Oct 2021 19:53:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0Bugly=20App=20ID=E5=8F=8A?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://bugly.qq.com/v2/product/apps/ac71228f85?pid=1
Signed-off-by: 董宏宇 <martindhy@gmail.com>
---
 app/src/main/AndroidManifest.xml                  |  2 +-
 .../java/com/mogo/launcher/MogoApplication.java   | 15 ++++++++-------
 test/crashreport-bugly/build.gradle               |  4 ++--
 .../bugly/BuglyCrashReportProvider.java           |  6 +-----
 test/crashreport-upgrade/build.gradle             |  2 --
 .../upgrade/UpgradeReportProvider.java            |  2 +-
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5b98fa0262..be5478b0ab 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
         <!-- 配置APP ID -->
         <meta-data
             android:name="BUGLY_APPID"
-            android:value="f3f8b0b2f1" />
+            android:value="ac71228f85" />
         <!-- 配置APP渠道号 -->
         <meta-data
             android:name="BUGLY_APP_CHANNEL"
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index bc835850ee..3ae4b04aa0 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.os.Process;
 import android.util.Log;
 
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.auto.zhidao.logsdk.CrashSystem;
 import com.bytedance.boost_multidex.BoostMultiDex;
 import com.mogo.cloud.httpdns.MogoHttpDnsConfig;
@@ -33,8 +32,8 @@ import com.mogo.module.share.constant.ShareConstants;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.utils.ObuConfig;
 import com.mogo.service.IMogoServiceApis;
-import com.mogo.test.crashreport.ITestCrashReportProvider;
-import com.mogo.test.crashreport.upgrade.UpgradeReportProvider;
+import com.mogo.test.crashreport.CrashReportConstants;
+import com.mogo.test.crashreport.upgrade.UpgradeReportConstants;
 import com.mogo.utils.ProcessUtils;
 import com.mogo.utils.logger.LogLevel;
 import com.mogo.utils.logger.Logger;
@@ -262,6 +261,12 @@ public class MogoApplication extends AbsMogoApplication {
 
     private void initModules() {
         Logger.d(TAG, "initModules");
+
+        // 初始化 bugly 升级
+        MogoModulePaths.addBaseModule(new MogoModule(UpgradeReportConstants.PATH, UpgradeReportConstants.NAME));
+        // 初始化 bugly 日志采集
+        MogoModulePaths.addBaseModule(new MogoModule(CrashReportConstants.PATH, CrashReportConstants.NAME));
+
         if (DebugConfig.isLauncher()) {
             MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_BACK, MogoServicePaths.PATH_BACK));
         }
@@ -316,10 +321,6 @@ public class MogoApplication extends AbsMogoApplication {
 //            refWatcher = LeakCanary.install(this);
 //        }
 
-        // 初始化 bugly 升级
-        ARouter.getInstance().navigation(UpgradeReportProvider.class);
-        // 初始化 bugly 日志采集
-        ARouter.getInstance().navigation(ITestCrashReportProvider.class);
         Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms");
     }
 
diff --git a/test/crashreport-bugly/build.gradle b/test/crashreport-bugly/build.gradle
index 1b82597d08..4d474d64b0 100644
--- a/test/crashreport-bugly/build.gradle
+++ b/test/crashreport-bugly/build.gradle
@@ -49,11 +49,11 @@ dependencies {
     kapt rootProject.ext.dependencies.aroutercompiler
 
     if (Boolean.valueOf(RELEASE)) {
-        implementation rootProject.ext.dependencies.crashreport
+        api rootProject.ext.dependencies.crashreport
         implementation rootProject.ext.dependencies.mogoutils
         implementation rootProject.ext.dependencies.mogocommons
     } else {
-        implementation project(":test:crashreport")
+        api project(":test:crashreport")
         implementation project(":foudations:mogo-utils")
         implementation project(":foudations:mogo-commons")
     }
diff --git a/test/crashreport-bugly/src/main/java/com/mogo/test/crashreport/bugly/BuglyCrashReportProvider.java b/test/crashreport-bugly/src/main/java/com/mogo/test/crashreport/bugly/BuglyCrashReportProvider.java
index efad3e0065..363bd47e9a 100644
--- a/test/crashreport-bugly/src/main/java/com/mogo/test/crashreport/bugly/BuglyCrashReportProvider.java
+++ b/test/crashreport-bugly/src/main/java/com/mogo/test/crashreport/bugly/BuglyCrashReportProvider.java
@@ -1,11 +1,7 @@
 package com.mogo.test.crashreport.bugly;
 
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
@@ -43,7 +39,7 @@ class BuglyCrashReportProvider implements ITestCrashReportProvider {
 
         String productFlavor = DebugConfig.getProductFlavor();
         strategy.setAppChannel(productFlavor);
-        Bugly.init(context, "f3f8b0b2f1", true, strategy);
+        Bugly.init(context, "ac71228f85", true, strategy);
         Bugly.putUserData(context, "serial", MoGoAiCloudClientConfig.getInstance().getSn());
         String mapSDKVersion =  AppUtils.getCustomMapSDKVersion(context);
         Bugly.putUserData(context, "MAP_SDK_VERSION",mapSDKVersion);
diff --git a/test/crashreport-upgrade/build.gradle b/test/crashreport-upgrade/build.gradle
index 49344ebef8..6a6959e6e7 100644
--- a/test/crashreport-upgrade/build.gradle
+++ b/test/crashreport-upgrade/build.gradle
@@ -47,11 +47,9 @@ dependencies {
     kapt rootProject.ext.dependencies.aroutercompiler
 
     if (Boolean.valueOf(RELEASE)) {
-        api rootProject.ext.dependencies.crashreport
         implementation rootProject.ext.dependencies.mogoutils
         implementation rootProject.ext.dependencies.mogocommons
     } else {
-        api project(":test:crashreport")
         implementation project(":foudations:mogo-utils")
         implementation project(":foudations:mogo-commons")
     }
diff --git a/test/crashreport-upgrade/src/main/java/com/mogo/test/crashreport/upgrade/UpgradeReportProvider.java b/test/crashreport-upgrade/src/main/java/com/mogo/test/crashreport/upgrade/UpgradeReportProvider.java
index 3498da40f4..c61d5adfae 100644
--- a/test/crashreport-upgrade/src/main/java/com/mogo/test/crashreport/upgrade/UpgradeReportProvider.java
+++ b/test/crashreport-upgrade/src/main/java/com/mogo/test/crashreport/upgrade/UpgradeReportProvider.java
@@ -38,7 +38,7 @@ public class UpgradeReportProvider implements IProvider {
 
         String productFlavor = DebugConfig.getProductFlavor();
         strategy.setAppChannel(productFlavor);
-        Bugly.init(context, "f3f8b0b2f1", true, strategy);
+        Bugly.init(context, "ac71228f85", true, strategy);
         Bugly.putUserData(context, "serial", MoGoAiCloudClientConfig.getInstance().getSn());
         String mapSDKVersion = AppUtils.getCustomMapSDKVersion(context);
         Bugly.putUserData(context, "MAP_SDK_VERSION", mapSDKVersion);