diff --git a/.idea/misc.xml b/.idea/misc.xml index 707ee6e613..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,10 @@ - + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index aad3e71d5e..99a8bc406f 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" @@ -282,4 +285,4 @@ def getGitCommit() { gitCommit } -apply plugin: 'arouterhook' \ No newline at end of file +//apply plugin: 'arouterhook' diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index ddd2d059ba..ca92b2cb80 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -37,12 +37,7 @@ 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(); @@ -78,6 +73,16 @@ public class MogoApplication extends AbsMogoApplication { 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(); diff --git a/build.gradle b/build.gradle index 1ff312c0fb..32a0f5815c 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,6 @@ 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 d79002527d..ea2f5501c3 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", - boostmultidex : "com.mogo.module.boostmultidex:module-boostmultidex:${BOOST_MULTIDEX_VERSION}", + 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 f8c85cf2c1..8d152859ba 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 @@ -151,4 +151,17 @@ public class DebugConfig { public static void setRequestOnlineCarData( boolean sRequestOnlineCarData ) { DebugConfig.sRequestOnlineCarData = sRequestOnlineCarData; } + + /** + * 是否支持临时激活小智 + */ + 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 07d4f84772..3640e7590a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,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 # 广告资源位 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 ) ); }