From 733c4d3f3d52ec781f924763ab9e738a8f244675 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 21 Dec 2022 18:09:56 +0800 Subject: [PATCH] =?UTF-8?q?[opt3.0]=E8=B0=83=E6=95=B4=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E5=88=9D=E5=A7=8B=E5=8C=96=E7=9A=84=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/mogo/launcher/stageone/APMStartup.kt | 4 +--- .../main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt | 3 +-- app_mogo_magic_ring/build.gradle | 4 ++-- .../mogo/test/crashreport/apm/ApmCrashReportProvider.java | 6 +++--- .../test/crashreport/upgrade/UpgradeReportProvider.java | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/stageone/APMStartup.kt b/app/src/main/java/com/mogo/launcher/stageone/APMStartup.kt index b593f616ba..00d7da6b9e 100644 --- a/app/src/main/java/com/mogo/launcher/stageone/APMStartup.kt +++ b/app/src/main/java/com/mogo/launcher/stageone/APMStartup.kt @@ -8,8 +8,6 @@ import com.mogo.test.crashreport.CrashReportConstants class APMStartup : AndroidStartup() { override fun create(context: Context): Boolean? { - // bugly - ARouter.getInstance().build(UpgradeReportConstants.PATH).navigation() // apm ARouter.getInstance().build(CrashReportConstants.PATH).navigation() return true @@ -24,6 +22,6 @@ class APMStartup : AndroidStartup() { } override fun dependenciesByName(): List { - return listOf("com.mogo.launcher.stageone.ARouterStartUp") + return listOf("com.mogo.launcher.stageone.ARouterStartUp", "com.mogo.launcher.stageone.ConfigStartUp") } } \ No newline at end of file diff --git a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt index 0bb6ac1b12..719da73372 100644 --- a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt @@ -70,8 +70,7 @@ class HttpDnsStartUp : AndroidStartup() { override fun dependenciesByName(): List { return listOf( - "com.mogo.launcher.stageone.APMStartup", - "com.mogo.launcher.stageone.ConfigStartUp" + "com.mogo.launcher.stageone.APMStartup" ) } diff --git a/app_mogo_magic_ring/build.gradle b/app_mogo_magic_ring/build.gradle index 6c12e45f67..44f73d10b3 100644 --- a/app_mogo_magic_ring/build.gradle +++ b/app_mogo_magic_ring/build.gradle @@ -6,8 +6,8 @@ android { compileSdkVersion rootProject.ext.android.compileSdkVersion defaultConfig { applicationId "com.zhidao.adas.magic" - minSdkVersion 21 - targetSdkVersion 25 + minSdkVersion 27 + targetSdkVersion 27 multiDexEnabled true versionCode 1 versionName "1.0" diff --git a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java index 3ccd681638..5889ca5b73 100644 --- a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java +++ b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java @@ -70,7 +70,7 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider { mLogt = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LONGITUDE); // Log.d("liyz", "cityCode = " + mCityCode + " --lat = " +mLat + " --logt = " + mLogt); //地图版本 - String mapSDKVersion = AppUtils.getCustomMapSDKVersion(context); + String mapSDKVersion = DebugConfig.getMapVersion(); map.put("MAP_SDK_VERSION", mapSDKVersion); map.put("CITYCODE", mCityCode); map.put("LATITUDE", mLat); @@ -85,8 +85,8 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider { return map; } }); - String mapSDKVersion = AppUtils.getCustomMapSDKVersion(context); - crash.config().setChannel("MAP_SDK_VERSION:"+mapSDKVersion); + String mapSDKVersion = DebugConfig.getMapVersion(); + crash.config().setChannel("MAP_SDK_VERSION:" + mapSDKVersion); //可选，可以设置自定义did,不设置会使用内部默认的 String sn = SharedPrefsMgr.getInstance(context).getString("sn"); if (sn != null && !sn.isEmpty()) { 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 4dc27958a7..aeb73c0be8 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 @@ -42,7 +42,7 @@ public class UpgradeReportProvider implements IProvider { if (sn != null && !sn.isEmpty()) { Bugly.putUserData(context, "serial", sn); } - String mapSDKVersion = AppUtils.getCustomMapSDKVersion(context); + String mapSDKVersion = DebugConfig.getMapVersion(); Bugly.putUserData(context, "MAP_SDK_VERSION", mapSDKVersion); }