diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ad82747b49..22d04a33fd 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index a45eb1ee0a..72b5b17ae2 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -106,6 +106,8 @@ public class MogoApplication extends AbsMogoApplication { // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle GPS_PROVIDER 0-Android系统,1-工控机,2-OBU FunctionBuildConfig.gpsProvider = BuildConfig.GPS_PROVIDER; + // 配置BuglyAppID + CrashReportConstants.buglyAppID = "f3f8b0b2f1"; } @Override diff --git a/gradle.properties b/gradle.properties index 5d4dce3495..f99b111671 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,7 +37,7 @@ kapt.include.compile.classpath=false android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -android.jetifier.blacklist=module-service-2.0.61.aar +android.jetifier.blacklist=module-service-2.0.62.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ @@ -88,113 +88,113 @@ applicationName=IntelligentPilot versionCode=80007 versionName=8.0.14 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_HMI_VERSION_VERSION=0.0.4 -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.4 -MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.4 -MOGO_CORE_FUNCTION_HMI_VERSION=0.0.4 -MOGO_CORE_FUNCTION_MAP_VERSION=0.0.4 -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.4 -MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.4 -MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.4 -MOGO_CORE_FUNCTION_SMP_VERSION=0.0.4 -MOGO_CORE_FUNCTION_V2X_VERSION=0.0.4 -MOGO_CORE_DATA_VERSION=0.0.4 -MOGO_CORE_FUNCTION_API_VERSION=0.0.4 -MOGO_CORE_FUNCTION_CALL_VERSION=0.0.4 -MOGO_CORE_RES_VERSION=0.0.4 -MOGO_CORE_UTILS_VERSION=0.0.4 -MOGO_CORE_NETWORK_VERSION=0.0.4 +MOGO_CORE_FUNCTION_HMI_VERSION_VERSION=0.0.5 +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.5 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.5 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.5 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.5 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.5 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.5 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.5 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.5 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.5 +MOGO_CORE_DATA_VERSION=0.0.5 +MOGO_CORE_FUNCTION_API_VERSION=0.0.5 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.5 +MOGO_CORE_RES_VERSION=0.0.5 +MOGO_CORE_UTILS_VERSION=0.0.5 +MOGO_CORE_NETWORK_VERSION=0.0.5 ################# 旧版本架构模块版本 ################# ## 工程内模块 -MOGO_COMMONS_VERSION=2.0.61 -MOGO_UTILS_VERSION=2.0.61 -MAP_AMAP_VERSION=2.0.61 -MAP_AUTONAVI_VERSION=2.0.61 -MOGO_MAP_VERSION=2.0.61 -MOGO_MAP_API_VERSION=2.0.61 -MOGO_SERVICE_VERSION=2.0.61 -MOGO_SERVICE_API_VERSION=2.0.61 -MOGO_CONNECTION_VERSION=2.0.61 -MOGO_MODULE_APPS_VERSION=2.0.61 -MOGO_MODULE_NAVI_VERSION=2.0.61 -MOGO_MODULE_SHARE_VERSION=2.0.61 -MOGO_MODULE_COMMON_VERSION=2.0.61 -MOGO_MODULE_MAIN_VERSION=2.0.61 -MOGO_MODULE_MAP_VERSION=2.0.61 -MOGO_MODULE_SERVICE_VERSION=2.0.61 -MOGO_MODULE_DATA_VERSION=2.0.61 -MOGO_MODULE_EXTENSIONS_VERSION=2.0.61 -MOGO_MODULE_SEARCH_VERSION=2.0.61 -MOGO_MODULE_BACK_VERSION=2.0.61 -MOGO_MODULE_AUTHORIZE_VERSION=2.0.61 -MOGO_MODULE_GUIDE_VERSION=2.0.61 -MOGO_MODULE_MEDIA_VERSION=2.0.61 -MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.61 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.61 -MOGO_MODULE_V2X_VERSION=2.0.61 +MOGO_COMMONS_VERSION=2.0.62 +MOGO_UTILS_VERSION=2.0.62 +MAP_AMAP_VERSION=2.0.62 +MAP_AUTONAVI_VERSION=2.0.62 +MOGO_MAP_VERSION=2.0.62 +MOGO_MAP_API_VERSION=2.0.62 +MOGO_SERVICE_VERSION=2.0.62 +MOGO_SERVICE_API_VERSION=2.0.62 +MOGO_CONNECTION_VERSION=2.0.62 +MOGO_MODULE_APPS_VERSION=2.0.62 +MOGO_MODULE_NAVI_VERSION=2.0.62 +MOGO_MODULE_SHARE_VERSION=2.0.62 +MOGO_MODULE_COMMON_VERSION=2.0.62 +MOGO_MODULE_MAIN_VERSION=2.0.62 +MOGO_MODULE_MAP_VERSION=2.0.62 +MOGO_MODULE_SERVICE_VERSION=2.0.62 +MOGO_MODULE_DATA_VERSION=2.0.62 +MOGO_MODULE_EXTENSIONS_VERSION=2.0.62 +MOGO_MODULE_SEARCH_VERSION=2.0.62 +MOGO_MODULE_BACK_VERSION=2.0.62 +MOGO_MODULE_AUTHORIZE_VERSION=2.0.62 +MOGO_MODULE_GUIDE_VERSION=2.0.62 +MOGO_MODULE_MEDIA_VERSION=2.0.62 +MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.62 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.62 +MOGO_MODULE_V2X_VERSION=2.0.62 # 探路 -MOGO_MODULE_TANLU_VERSION=2.0.61 +MOGO_MODULE_TANLU_VERSION=2.0.62 # 视频引导 -MOGO_MODULE_GUIDESHOW_VERSION=2.0.61 +MOGO_MODULE_GUIDESHOW_VERSION=2.0.62 # 推送 -MOGO_MODULE_PUSH_VERSION=2.0.61 -MOGO_MODULE_PUSH_BASE_VERSION=2.0.61 -MOGO_MODULE_PUSH_NOOP_VERSION=2.0.61 +MOGO_MODULE_PUSH_VERSION=2.0.62 +MOGO_MODULE_PUSH_BASE_VERSION=2.0.62 +MOGO_MODULE_PUSH_NOOP_VERSION=2.0.62 # 探路上报和分享模块 -TANLULIB_VERSION=2.0.61 -MOGO_TANLU_API_VERSION=2.0.61 +TANLULIB_VERSION=2.0.62 +MOGO_TANLU_API_VERSION=2.0.62 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.0.61 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.61 +MOGO_MODULE_LEFT_PANEL_VERSION=2.0.62 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.62 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.0.61 +MOGO_MODULE_WIDGETS_VERSION=2.0.62 # obu -MOGO_MODULE_OBU_VERSION=2.0.61 -MOGO_MODULE_OBU_MOGO_VERSION=2.0.61 +MOGO_MODULE_OBU_VERSION=2.0.62 +MOGO_MODULE_OBU_MOGO_VERSION=2.0.62 # monitor -MOGO_MODULE_MONITOR_VERSION=2.0.61 +MOGO_MODULE_MONITOR_VERSION=2.0.62 # bugly -CRASHREPORT_VERSION=2.0.61 -CRASHREPORT_BUGLY_VERSION=2.0.61 -CRASHREPORT_NOOP_VERSION=2.0.61 -CRASHREPORT_UPGRADE_VERSION=2.0.61 +CRASHREPORT_VERSION=2.0.62 +CRASHREPORT_BUGLY_VERSION=2.0.62 +CRASHREPORT_NOOP_VERSION=2.0.62 +CRASHREPORT_UPGRADE_VERSION=2.0.62 ## tts -TTS_BASE_VERSION=2.0.61 -TTS_DI_VERSION=2.0.61 -TTS_ZHI_VERSION=2.0.61 -TTS_PAD_VERSION=2.0.61 -TTS_NOOP_VERSION=2.0.61 +TTS_BASE_VERSION=2.0.62 +TTS_DI_VERSION=2.0.62 +TTS_ZHI_VERSION=2.0.62 +TTS_PAD_VERSION=2.0.62 +TTS_NOOP_VERSION=2.0.62 # 自研地图 -MAP_CUSTOM_VERSION=2.0.61 -MOGO_MODULE_ADAS_VERSION=2.0.61 +MAP_CUSTOM_VERSION=2.0.62 +MOGO_MODULE_ADAS_VERSION=2.0.62 # 基础服务实现:passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.61 -MOGO_BASE_SERVICES_APK_VERSION=2.0.61 -MOGO_BASE_SERVICES_SDK_VERSION=2.0.61 -MOGO_MODULE_CHAT_VERSION=2.0.61 +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.62 +MOGO_BASE_SERVICES_APK_VERSION=2.0.62 +MOGO_BASE_SERVICES_SDK_VERSION=2.0.62 +MOGO_MODULE_CHAT_VERSION=2.0.62 # 车聊聊 -MOGO_MODULE_CARCHATTING_VERSION=2.0.61 +MOGO_MODULE_CARCHATTING_VERSION=2.0.62 # 车聊聊接口 -MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.0.61 +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.0.62 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.0.61 -MOGO_SKIN_LIGHT_VERSION=2.0.61 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.61 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.61 -SKIN_SUPPORT_VERSION=2.0.61 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.61 -SKIN_SUPPORT_CARDVIEW_VERSION=2.0.61 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.61 -SKIN_SUPPORT_DESIGN_VERSION=2.0.61 +MOGO_SKIN_SUPPORT_VERSION=2.0.62 +MOGO_SKIN_LIGHT_VERSION=2.0.62 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.62 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.62 +SKIN_SUPPORT_VERSION=2.0.62 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.62 +SKIN_SUPPORT_CARDVIEW_VERSION=2.0.62 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.62 +SKIN_SUPPORT_DESIGN_VERSION=2.0.62 # 闪屏页 -MOGO_MODULE_SPLASH_VERSION=2.0.61 -MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.61 +MOGO_MODULE_SPLASH_VERSION=2.0.62 +MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.62 # OCH -MOGO_OCH_VERSION=2.0.61 -MOGO_OCH_BUS_VERSION=2.0.61 -MOGO_OCH_NOOP_VERSION=2.0.61 -MOGO_OCH_TAXI_VERSION=2.0.61 +MOGO_OCH_VERSION=2.0.62 +MOGO_OCH_BUS_VERSION=2.0.62 +MOGO_OCH_NOOP_VERSION=2.0.62 +MOGO_OCH_TAXI_VERSION=2.0.62 # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.61 +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.62 ################# 旧版本架构模块版本 ################# 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 363bd47e9a..2b0b914110 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 @@ -17,32 +17,32 @@ import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; -public + /** * @author congtaowang * @since 2020/9/9 * * 描述 */ -@Route( path = CrashReportConstants.PATH ) -class BuglyCrashReportProvider implements ITestCrashReportProvider { +@Route(path = CrashReportConstants.PATH) +public class BuglyCrashReportProvider implements ITestCrashReportProvider { private static final String TAG = "BuglyCrashReportProvider"; @Override - public void init(Context context ) { + public void init(Context context) { Logger.d(TAG, "init"); String packageName = context.getPackageName(); - String processName = getProcessName( android.os.Process.myPid() ); - CrashReport.UserStrategy strategy = new CrashReport.UserStrategy( context ); - strategy.setUploadProcess( processName == null || processName.equals( packageName ) ); + String processName = getProcessName(android.os.Process.myPid()); + CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(context); + strategy.setUploadProcess(processName == null || processName.equals(packageName)); String productFlavor = DebugConfig.getProductFlavor(); strategy.setAppChannel(productFlavor); - Bugly.init(context, "ac71228f85", true, strategy); + Bugly.init(context, CrashReportConstants.buglyAppID, true, strategy); Bugly.putUserData(context, "serial", MoGoAiCloudClientConfig.getInstance().getSn()); - String mapSDKVersion = AppUtils.getCustomMapSDKVersion(context); - Bugly.putUserData(context, "MAP_SDK_VERSION",mapSDKVersion); + String mapSDKVersion = AppUtils.getCustomMapSDKVersion(context); + Bugly.putUserData(context, "MAP_SDK_VERSION", mapSDKVersion); } /** @@ -51,23 +51,23 @@ class BuglyCrashReportProvider implements ITestCrashReportProvider { * @param pid 进程号 * @return 进程名 */ - private static String getProcessName( int pid ) { + private static String getProcessName(int pid) { BufferedReader reader = null; try { - reader = new BufferedReader( new FileReader( "/proc/" + pid + "/cmdline" ) ); + reader = new BufferedReader(new FileReader("/proc/" + pid + "/cmdline")); String processName = reader.readLine(); - if ( !TextUtils.isEmpty( processName ) ) { + if (!TextUtils.isEmpty(processName)) { processName = processName.trim(); } return processName; - } catch ( Throwable throwable ) { + } catch (Throwable throwable) { throwable.printStackTrace(); } finally { try { - if ( reader != null ) { + if (reader != null) { reader.close(); } - } catch ( IOException exception ) { + } catch (IOException exception) { exception.printStackTrace(); } } diff --git a/test/crashreport-upgrade/build.gradle b/test/crashreport-upgrade/build.gradle index 6a6959e6e7..49344ebef8 100644 --- a/test/crashreport-upgrade/build.gradle +++ b/test/crashreport-upgrade/build.gradle @@ -47,9 +47,11 @@ 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 c61d5adfae..5cf397d407 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 @@ -7,6 +7,7 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.template.IProvider; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.debug.DebugConfig; +import com.mogo.test.crashreport.CrashReportConstants; import com.mogo.utils.AppUtils; import com.mogo.utils.logger.Logger; import com.tencent.bugly.Bugly; @@ -38,7 +39,7 @@ public class UpgradeReportProvider implements IProvider { String productFlavor = DebugConfig.getProductFlavor(); strategy.setAppChannel(productFlavor); - Bugly.init(context, "ac71228f85", true, strategy); + Bugly.init(context, CrashReportConstants.buglyAppID, 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/src/main/java/com/mogo/test/crashreport/CrashReportConstants.java b/test/crashreport/src/main/java/com/mogo/test/crashreport/CrashReportConstants.java index a2a1057fae..0f3f7e5521 100644 --- a/test/crashreport/src/main/java/com/mogo/test/crashreport/CrashReportConstants.java +++ b/test/crashreport/src/main/java/com/mogo/test/crashreport/CrashReportConstants.java @@ -1,15 +1,21 @@ package com.mogo.test.crashreport; -public /** * @author congtaowang * @since 2020/9/9 *

* 描述 */ -class CrashReportConstants { +public class CrashReportConstants { public static final String PATH = "/crashreport/api"; - public static final String NAME = "CrashReportApi"; + + + /** + * https://bugly.qq.com/ + * 在线日统计平台 App ID + */ + public static String buglyAppID = ""; + } diff --git a/test/crashreport/src/main/java/com/mogo/test/crashreport/ITestCrashReportProvider.java b/test/crashreport/src/main/java/com/mogo/test/crashreport/ITestCrashReportProvider.java index 82c27f8f79..b07f21ebdc 100644 --- a/test/crashreport/src/main/java/com/mogo/test/crashreport/ITestCrashReportProvider.java +++ b/test/crashreport/src/main/java/com/mogo/test/crashreport/ITestCrashReportProvider.java @@ -2,13 +2,12 @@ package com.mogo.test.crashreport; import com.alibaba.android.arouter.facade.template.IProvider; -public /** * @author congtaowang * @since 2020/9/9 * * 描述 */ -interface ITestCrashReportProvider extends IProvider { +public interface ITestCrashReportProvider extends IProvider { }