diff --git a/.idea/misc.xml b/.idea/misc.xml index 2ea71aea8b..2db9aab721 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,11 +1,9 @@ - - + + + + diff --git a/app/build.gradle b/app/build.gradle index 9ec67a2001..cd753934aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,8 @@ -import java.text.SimpleDateFormat - apply plugin: 'com.android.application' +apply plugin: 'com.alibaba.arouter' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +import java.text.SimpleDateFormat android { compileSdkVersion rootProject.ext.android.compileSdkVersion @@ -25,7 +25,7 @@ android { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters 'armeabi-v7a' + abiFilters 'armeabi-v7a','x86' } } } @@ -98,18 +98,21 @@ android { dimension "product" // 使用思必驰语音 buildConfigField 'int', 'AIType','2' + buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' } // e系列 e8xx { dimension "product" // 使用思必驰语音 buildConfigField 'int', 'AIType','2' + buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' } // d系列 d8xx { dimension "product" // 使用同行者语音 buildConfigField 'int', 'AIType','1' + buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' } qa { dimension "env" @@ -175,7 +178,7 @@ dependencies { implementation rootProject.ext.dependencies.crashSdk implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.arouter - implementation rootProject.ext.dependencies.androidxmultidex + implementation rootProject.ext.dependencies.boostmultidex debugImplementation rootProject.ext.dependencies.leakcanary testImplementation rootProject.ext.dependencies.leakcanary releaseImplementation rootProject.ext.dependencies.leakcanarynoop @@ -281,3 +284,5 @@ def getGitCommit() { assert !gitCommit.isEmpty() gitCommit } + +//apply plugin: 'arouterhook' \ No newline at end of file diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index d50f474f69..ca92b2cb80 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -4,10 +4,9 @@ import android.content.Context; import android.content.Intent; import android.util.Log; -import androidx.multidex.MultiDex; - import com.alibaba.android.arouter.launcher.ARouter; import com.auto.zhidao.logsdk.CrashSystem; +import com.bytedance.boost_multidex.BoostMultiDex; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.module.adcard.AdCardConstants; @@ -38,61 +37,66 @@ public class MogoApplication extends AbsMogoApplication { @Override public void onCreate() { - DebugConfig.setNetMode( BuildConfig.NET_ENV ); - DebugConfig.setDebug( BuildConfig.DEBUG ); - DebugConfig.setAIType( BuildConfig.AIType ); - DebugConfig.setLaunchLocationService( BuildConfig.LAUNCH_LOCATION_SERVICE ); - DebugConfig.setUseCustomNavi( BuildConfig.USE_CUSTOM_NAVI ); - DebugConfig.setLauncher( BuildConfig.IS_LAUNCHER ); + initDebugConfig(); super.onCreate(); // Crash 日志收集 final long start = System.currentTimeMillis(); - CrashSystem crashSystem = CrashSystem.getInstance( this ); + CrashSystem crashSystem = CrashSystem.getInstance(this); crashSystem.init(); //设置debug模式，日志不上传 - crashSystem.setDebug( BuildConfig.DEBUG ); - Logger.init( BuildConfig.DEBUG ? LogLevel.DEBUG : LogLevel.OFF ); + crashSystem.setDebug(BuildConfig.DEBUG); + Logger.init(BuildConfig.DEBUG ? LogLevel.DEBUG : LogLevel.OFF); // MogoModulePaths.addModule(new MogoModule(PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME)); - MogoModulePaths.addModule( new MogoModule( AuthorizeConstant.PATH_AGREEMENT_FRAGMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME ) ); + MogoModulePaths.addModule(new MogoModule(AuthorizeConstant.PATH_AGREEMENT_FRAGMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME)); //运营位卡片，需要默认显示，放在第一个加载 - MogoModulePaths.addModule( new MogoModule( AdCardConstants.TAG, AdCardConstants.MODULE_NAME ) ); - if ( DebugConfig.isLauncher() ) { - MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) ); + MogoModulePaths.addModule(new MogoModule(AdCardConstants.TAG, AdCardConstants.MODULE_NAME)); + if (DebugConfig.isLauncher()) { + MogoModulePaths.addModule(new MogoModule(MediaConstants.TAG, MediaConstants.MODULE_TYPE)); } - MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) ); - MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, TanluConstants.MODEL_NAME ) ); - MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_SHARE, "ShareControl" ) ); + MogoModulePaths.addModule(new MogoModule(CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME)); + MogoModulePaths.addModule(new MogoModule(TanluConstants.TAG, TanluConstants.MODEL_NAME)); + MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_SHARE, "ShareControl")); - MogoModulePaths.addBaseModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) ); - MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI ) ); + MogoModulePaths.addBaseModule(new MogoModule(ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY)); + MogoModulePaths.addBaseModule(new MogoModule(V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI)); // 暂时去掉推送 // MogoModulePaths.addModule(new MogoModule(PushUIConstants.TAG, PushUIConstants.TAG)); if (!DebugConfig.isLauncher()) { PersistentManager.getInstance().initManager(this); - Intent intent = new Intent( this, MogoMainService.class ); - startService( intent ); + Intent intent = new Intent(this, MogoMainService.class); + startService(intent); } - Log.i( "timer", "cost " + ( System.currentTimeMillis() - start ) + "ms" ); + Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms"); + } + + private void initDebugConfig(){ + DebugConfig.setNetMode(BuildConfig.NET_ENV); + DebugConfig.setDebug(BuildConfig.DEBUG); + DebugConfig.setAIType(BuildConfig.AIType); + DebugConfig.setLaunchLocationService(BuildConfig.LAUNCH_LOCATION_SERVICE); + DebugConfig.setUseCustomNavi(BuildConfig.USE_CUSTOM_NAVI); + DebugConfig.setLauncher(BuildConfig.IS_LAUNCHER); + DebugConfig.setActiveAIAssistFlag( BuildConfig.AI_ASSIST_ACTIVE_STAUTS ); } @Override protected void init() { super.init(); - IMogoSocketManager mMogoSocketManager = ARouter.getInstance().navigation( IMogoSocketManager.class ); - if ( mMogoSocketManager != null ) { - mMogoSocketManager.init( getApplicationContext(), "com.mogo.launcher" ); + IMogoSocketManager mMogoSocketManager = ARouter.getInstance().navigation(IMogoSocketManager.class); + if (mMogoSocketManager != null) { + mMogoSocketManager.init(getApplicationContext(), "com.mogo.launcher"); } else { - Logger.e( TAG, "init socket server error." ); + Logger.e(TAG, "init socket server error."); } } @Override - protected void attachBaseContext( Context base ) { - super.attachBaseContext( base ); - MultiDex.install( base ); + protected void attachBaseContext(Context base) { + super.attachBaseContext(base); + BoostMultiDex.install(base); } } diff --git a/build.gradle b/build.gradle index 32a0f5815c..2ff4df7631 100644 --- a/build.gradle +++ b/build.gradle @@ -22,6 +22,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.alibaba:arouter-register:1.0.2" classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.4' +// classpath "com.mogo.module.pluginhook:module-pluginhook:${HOOKPLUGIN_VERSION}" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/config.gradle b/config.gradle index bf144b2c7a..2eb4156973 100644 --- a/config.gradle +++ b/config.gradle @@ -17,7 +17,7 @@ ext { androidxappcompat : "androidx.appcompat:appcompat:1.0.2", androidxccorektx : "androidx.core:core-ktx:1.2.0", androidxconstraintlayout : "androidx.constraintlayout:constraintlayout:1.1.3", - androidxmultidex : "androidx.multidex:multidex:2.0.1", + boostmultidex : "com.bytedance.boost_multidex:boost_multidex:1.0.1", androidxviewpager2 : "androidx.viewpager2:viewpager2:1.0.0", androidxrecyclerview : "androidx.recyclerview:recyclerview:1.1.0", androidxcardview : "androidx.cardview:cardview:1.0.0", diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index 9ae726e19d..7ee9d3e79d 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -161,4 +161,16 @@ public class DebugConfig { public static void setUseCustomMap( boolean sUseCustomMap ) { DebugConfig.sUseCustomMap = sUseCustomMap; } + /** + * 是否支持临时激活小智 + */ + private static boolean sActiveAIAssistFlag = true; + + public static boolean isActiveAIAssistFlag() { + return sActiveAIAssistFlag; + } + + public static void setActiveAIAssistFlag( boolean sActiveAIAssistFlag ) { + DebugConfig.sActiveAIAssistFlag = sActiveAIAssistFlag; + } } diff --git a/gradle.properties b/gradle.properties index b7c5b6592c..c0166e672c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -72,7 +72,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.34 +MOGO_MODULE_V2X_VERSION=1.1.36 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 @@ -81,6 +81,11 @@ MOGO_MODULE_AD_CARD_VERSION=1.0.1 TANLULIB_VERSION=1.2.1.7 +# Boost分包 +BOOST_MULTIDEX_VERSION=1.0.0 +# hook ARouter分包实现 +HOOKPLUGIN_VERSION=1.0.0 + ## 产品库必备配置 applicationId=com.mogo.launcer applicationName=IntelligentPilot diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/OnAiAssistClickListener.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/OnAiAssistClickListener.java index 393f3d9a6f..8be87989e0 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/OnAiAssistClickListener.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/OnAiAssistClickListener.java @@ -30,7 +30,7 @@ class OnAiAssistClickListener implements View.OnClickListener { @Override public void onClick( View v ) { - if ( Devices.isBind() ) { + if ( Devices.isBind() || !DebugConfig.isActiveAIAssistFlag() ) { AIAssist.startAssistant( v.getContext() ); trackNavigatorClickEvent( 5 ); } else { diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java index e8675cdfc9..71bcd12274 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java @@ -1,5 +1,7 @@ package com.mogo.module.common.utils; +import android.text.TextUtils; + import java.lang.reflect.Method; /** @@ -21,6 +23,7 @@ public class CarSeries { public static final int CAR_SERIES_E84XCD = 51; public static final int CAR_SERIES_E85X = 50; public static final int CAR_SERIES_E85XCD = 51; + public static final int CAR_SERIES_E85XJD = 51; public static int CAR_SERIES = 0; @@ -33,6 +36,10 @@ public class CarSeries { return CAR_SERIES; } String device = get( "ro.fota.device" ); + if ( TextUtils.isEmpty( device ) ) { + return CAR_SERIES_F80X; + } + if ( "FG166".equals( device ) ) { CAR_SERIES = CAR_SERIES_C80X; } else if ( "D801-802".equals( device ) ) { @@ -58,6 +65,10 @@ public class CarSeries { CAR_SERIES = CAR_SERIES_E85X; } else if ( "E85XCD".equals( device ) ) { CAR_SERIES = CAR_SERIES_E85XCD; + } else if ( "E85XJD".equals( device ) ) { + CAR_SERIES = CAR_SERIES_E85XJD; + } else if ( device.startsWith( "E85" ) ) { + CAR_SERIES = CAR_SERIES_E85XJD; } else { CAR_SERIES = CAR_SERIES_F80X; } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java index 85faab6b7a..192cdfe588 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java @@ -67,7 +67,7 @@ public abstract class BaseNaviInfoView { protected String getFormatSurplusTime( int seconds ) { if ( seconds > 60 * 60 ) { - mFormatSurplusDistanceUnit = "h"; + mFormatSurplusTimeUnit = "h"; return String.format( "%.1f", ( ( float ) seconds ) / ( 60 * 60 ) ); }