From 7d6fe9feef6bf0100156b94a0969935534d0ca2b Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 17 Aug 2020 16:49:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96=20build.gradle=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 5 +---- app/functions/perform.gradle | 11 +++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 app/functions/perform.gradle diff --git a/app/build.gradle b/app/build.gradle index 9141820b14..b7666feb3e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -251,8 +251,6 @@ dependencies { implementation rootProject.ext.dependencies.mogologlib if (Boolean.valueOf(RELEASE)) { - launcherImplementation rootProject.ext.dependencies.modulemainlauncher - independentImplementation rootProject.ext.dependencies.modulemainindependent implementation rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.modulesearch @@ -270,8 +268,6 @@ dependencies { implementation rootProject.ext.dependencies.mogomodulewidgets implementation rootProject.ext.dependencies.mogomoduleback } else { - launcherImplementation project(':main-extensions:mogo-module-main-launcher') - independentImplementation project(':main-extensions:mogo-module-main-independent') implementation project(':foudations:mogo-commons') implementation project(':modules:mogo-module-common') implementation project(':modules:mogo-module-search') @@ -289,6 +285,7 @@ dependencies { implementation project(':modules:mogo-module-back') } + apply from: "./functions/perform.gradle" apply from: "./functions/baseservices.gradle" apply from: "./functions/socketpush.gradle" apply from: "./functions/gpssimulator.gradle" diff --git a/app/functions/perform.gradle b/app/functions/perform.gradle new file mode 100644 index 0000000000..a708b71fe9 --- /dev/null +++ b/app/functions/perform.gradle @@ -0,0 +1,11 @@ +// 表现：独立 app 和 launcher + +project.dependencies { + if (Boolean.valueOf(RELEASE)) { + launcherImplementation rootProject.ext.dependencies.modulemainlauncher + independentImplementation rootProject.ext.dependencies.modulemainindependent + } else { + launcherImplementation project(':main-extensions:mogo-module-main-launcher') + independentImplementation project(':main-extensions:mogo-module-main-independent') + } +} \ No newline at end of file From db0498ccb2f618b8db974e8cfffc834a87d77750 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 17 Aug 2020 16:58:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=20=E4=B8=8D=E6=94=AF=E6=8C=81=E8=AF=AD?= =?UTF-8?q?=E9=9F=B3=E9=A2=84=E6=BF=80=E6=B4=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 12 ++++++------ .../java/com/mogo/commons/debug/DebugConfig.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b7666feb3e..e543390155 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -116,7 +116,7 @@ android { dimension "product" // 使用思必驰语音 buildConfigField 'int', 'AIType', '2' - buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' + buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' @@ -130,7 +130,7 @@ android { dimension "product" // 使用思必驰语音 buildConfigField 'int', 'AIType', '2' - buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' + buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' @@ -144,7 +144,7 @@ android { dimension "product" // 使用思必驰语音 buildConfigField 'int', 'AIType', '2' - buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' + buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' @@ -158,7 +158,7 @@ android { dimension "product" // 使用思必驰语音 buildConfigField 'int', 'AIType', '2' - buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' + buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' @@ -172,7 +172,7 @@ android { dimension "product" // 使用同行者语音 buildConfigField 'int', 'AIType', '1' - buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' + buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' @@ -186,7 +186,7 @@ android { dimension "product" // 使用同行者语音 buildConfigField 'int', 'AIType', '1' - buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' + buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' 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 ebf76b2850..882654d243 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 @@ -193,7 +193,7 @@ public class DebugConfig { /** * 是否支持临时激活小智 */ - private static boolean sActiveAIAssistFlag = true; + private static boolean sActiveAIAssistFlag = false; public static boolean isActiveAIAssistFlag() { return sActiveAIAssistFlag; From 22dd151d44785ea9b2c4d377eb9176b2cd34e125 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 17 Aug 2020 17:03:47 +0800 Subject: [PATCH 3/4] 1. bugfix: NPE --- .../src/main/java/com/mogo/module/apps/AppsAdapter.java | 3 +++ .../src/main/res/layout/module_apps_item_app.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsAdapter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsAdapter.java index 77f41bccd3..4a5535bf59 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsAdapter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsAdapter.java @@ -53,6 +53,9 @@ public class AppsAdapter extends BaseAdapter { holder = ( ( AppViewHolder ) convertView.getTag() ); } AppInfo appInfo = getItem( position ); + if ( appInfo == null ) { + return holder.mItemView; + } if ( appInfo.getIconResId() <= 0 ) { if ( appInfo.getIcon() != null ) { holder.mIcon.setImageDrawable( appInfo.getIcon() ); diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml index 49c0dd467e..0e89455b55 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml @@ -10,7 +10,7 @@ android:id="@+id/module_apps_id_app_icon" android:layout_width="@dimen/module_apps_navigation_icon_width" android:scaleType="fitXY" - android:src="@drawable/module_apps_ic_im" + android:src="@drawable/module_apps_ic_default_icon" android:layout_height="@dimen/module_apps_navigation_icon_height" /> Date: Mon, 17 Aug 2020 17:07:26 +0800 Subject: [PATCH 4/4] 1. bugfix: NPE --- .../main/java/com/mogo/module/apps/AppsAdapter.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsAdapter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsAdapter.java index 4a5535bf59..04b5308f85 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsAdapter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsAdapter.java @@ -25,7 +25,13 @@ public class AppsAdapter extends BaseAdapter { private List< AppInfo > mAppInfos; public AppsAdapter( List< AppInfo > appInfos ) { - this.mAppInfos = new ArrayList<>( appInfos ); + this.mAppInfos = new ArrayList<>(); + for ( AppInfo appInfo : appInfos ) { + if ( appInfo == null ) { + continue; + } + mAppInfos.add( appInfo ); + } } @Override @@ -53,9 +59,6 @@ public class AppsAdapter extends BaseAdapter { holder = ( ( AppViewHolder ) convertView.getTag() ); } AppInfo appInfo = getItem( position ); - if ( appInfo == null ) { - return holder.mItemView; - } if ( appInfo.getIconResId() <= 0 ) { if ( appInfo.getIcon() != null ) { holder.mIcon.setImageDrawable( appInfo.getIcon() );