From 02c62e89381cb7372b637e1d3426aa6fdc928579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 2 Jun 2020 13:50:03 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c44c657668..4a0812b702 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,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.0.13 +MOGO_MODULE_V2X_VERSION=1.0.14 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.11 # 推送 From 0cc409b36f6d1b31717db5f5c446763c24625582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 2 Jun 2020 13:50:44 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c44c657668..4a0812b702 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,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.0.13 +MOGO_MODULE_V2X_VERSION=1.0.14 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.11 # 推送 From 24fbefd3d3c11f52ca390c24ff7de13a80761ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 2 Jun 2020 16:03:43 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4a0812b702..0a90d37dbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,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.0.14 +MOGO_MODULE_V2X_VERSION=1.0.15 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.11 # 推送 From ffe56084d649f08c0088e2e6392c7dacb6661f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 2 Jun 2020 16:03:56 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4a0812b702..0a90d37dbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,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.0.14 +MOGO_MODULE_V2X_VERSION=1.0.15 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.11 # 推送 From d9e82b7bdc8b56c09fe87f9b8090bd5b5fb0b2c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 2 Jun 2020 16:13:37 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0a90d37dbe..b53fea8dc7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,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.0.15 +MOGO_MODULE_V2X_VERSION=1.0.16 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.11 # 推送 From d223b30aea66fa4b97be46753891386e21282f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 2 Jun 2020 16:14:03 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0a90d37dbe..b53fea8dc7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,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.0.15 +MOGO_MODULE_V2X_VERSION=1.0.16 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.11 # 推送 From b19cea3f505d433e5fca2bce036129a7ef2eef7a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 2 Jun 2020 16:31:03 +0800 Subject: [PATCH 07/12] release the cod of AppEnum of callChat --- .idea/misc.xml | 2 +- .../src/main/java/com/mogo/module/apps/model/AppEnum.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 707ee6e613..2dc54c489f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java index b0ad31e2b6..ac70be137a 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java @@ -19,7 +19,7 @@ public enum AppEnum { QQMusic( "QQ音乐", "com.pvetec.musics", R.drawable.module_apps_ic_qq_music ), //"车聊聊", -// Im( "车聊聊", "com.zhidao.imdemo", R.drawable.module_apps_ic_im ), + Im( "车聊聊", "com.zhidao.imdemo", R.drawable.module_apps_ic_im ), //"探路", // RoadCondition( "探路", "com.zhidao.roadcondition", R.drawable.module_apps_ic_road_condition ), From a24b3e83ba8f193f6c58e1258a525d71a8a2201e Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 2 Jun 2020 18:46:00 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 5 +- app/build.gradle | 70 ++++++++++++------- app/src/catholic/AndroidManifest.xml | 35 ++-------- app/src/d80x/AndroidManifest.xml | 63 ----------------- app/src/independent/AndroidManifest.xml | 29 ++++++++ app/src/launcher/AndroidManifest.xml | 28 ++++++++ app/src/main/AndroidManifest.xml | 47 +++---------- app/src/nwd/AndroidManifest.xml | 60 ---------------- config.gradle | 2 + gradle.properties | 3 + .../mogo-module-main-independent/.gitignore | 1 + .../mogo-module-main-independent/build.gradle | 50 +++++++++++++ .../consumer-rules.pro | 0 .../gradle.properties | 3 + .../proguard-rules.pro | 21 ++++++ .../independent/ExampleInstrumentedTest.java | 26 +++++++ .../src/main/AndroidManifest.xml | 34 +++++++++ .../independent/MainIndependentActivity.java | 23 ++++++ .../main/independent/ExampleUnitTest.java | 17 +++++ .../mogo-module-main-launcher/.gitignore | 1 + .../mogo-module-main-launcher/build.gradle | 50 +++++++++++++ .../consumer-rules.pro | 0 .../gradle.properties | 3 + .../proguard-rules.pro | 21 ++++++ .../launcher/ExampleInstrumentedTest.java | 26 +++++++ .../src/main}/AndroidManifest.xml | 28 +------- .../main/launcher/MainLauncherActivity.java | 19 +++++ .../module/main/launcher/ExampleUnitTest.java | 17 +++++ modules/mogo-module-main/build.gradle | 40 +++++------ .../com/mogo/module/main/MainActivity.java | 26 +++---- settings.gradle | 2 + 31 files changed, 473 insertions(+), 277 deletions(-) delete mode 100644 app/src/d80x/AndroidManifest.xml create mode 100644 app/src/independent/AndroidManifest.xml create mode 100644 app/src/launcher/AndroidManifest.xml delete mode 100644 app/src/nwd/AndroidManifest.xml create mode 100644 main-extensions/mogo-module-main-independent/.gitignore create mode 100644 main-extensions/mogo-module-main-independent/build.gradle create mode 100644 main-extensions/mogo-module-main-independent/consumer-rules.pro create mode 100644 main-extensions/mogo-module-main-independent/gradle.properties create mode 100644 main-extensions/mogo-module-main-independent/proguard-rules.pro create mode 100644 main-extensions/mogo-module-main-independent/src/androidTest/java/com/zhidao/mogo/module/main/independent/ExampleInstrumentedTest.java create mode 100644 main-extensions/mogo-module-main-independent/src/main/AndroidManifest.xml create mode 100644 main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java create mode 100644 main-extensions/mogo-module-main-independent/src/test/java/com/zhidao/mogo/module/main/independent/ExampleUnitTest.java create mode 100644 main-extensions/mogo-module-main-launcher/.gitignore create mode 100644 main-extensions/mogo-module-main-launcher/build.gradle create mode 100644 main-extensions/mogo-module-main-launcher/consumer-rules.pro create mode 100644 main-extensions/mogo-module-main-launcher/gradle.properties create mode 100644 main-extensions/mogo-module-main-launcher/proguard-rules.pro create mode 100644 main-extensions/mogo-module-main-launcher/src/androidTest/java/com/zhidao/mogo/module/main/launcher/ExampleInstrumentedTest.java rename {app/src/zhidao => main-extensions/mogo-module-main-launcher/src/main}/AndroidManifest.xml (62%) create mode 100644 main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java create mode 100644 main-extensions/mogo-module-main-launcher/src/test/java/com/zhidao/mogo/module/main/launcher/ExampleUnitTest.java diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 2c9f3703ae..6bde38ff56 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,6 +4,7 @@ diff --git a/app/build.gradle b/app/build.gradle index 99c5b45516..fb46431630 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,46 +53,64 @@ android { targetCompatibility 1.8 } - flavorDimensions "product", "env" + flavorDimensions "product","basic" , "env" productFlavors { - // 诺威达 - nwd { - dimension "product" + //独立app + independent{ + dimension "basic" sourceSets { main { - manifest.srcFile 'src/nwd/AndroidManifest.xml' + manifest.srcFile 'src/independent/AndroidManifest.xml' } } applicationId rootProject.ext.android.applicationId } - d80x { - dimension "product" + // launcher app + launcher{ + dimension "basic" sourceSets { main { - manifest.srcFile 'src/d80x/AndroidManifest.xml' + manifest.srcFile 'src/launcher/AndroidManifest.xml' } } applicationId rootProject.ext.android.zhidadoApplicationId } - zhidao { - dimension "product" - sourceSets { - main { - manifest.srcFile 'src/zhidao/AndroidManifest.xml' - } - } - applicationId rootProject.ext.android.applicationId - } + // 诺威达 +// nwd { +// dimension "product" +// sourceSets { +// main { +// manifest.srcFile 'src/nwd/AndroidManifest.xml' +// } +// } +// applicationId rootProject.ext.android.applicationId +// } +// d80x { +// dimension "product" +// sourceSets { +// main { +// manifest.srcFile 'src/d80x/AndroidManifest.xml' +// } +// } +// applicationId rootProject.ext.android.zhidadoApplicationId +// } +// zhidao { +// dimension "product" +// sourceSets { +// main { +// manifest.srcFile 'src/zhidao/AndroidManifest.xml' +// } +// } +// applicationId rootProject.ext.android.applicationId +// } // 通用 APP catholic { dimension "product" - sourceSets { - main { - manifest.srcFile 'src/catholic/AndroidManifest.xml' - } - } - applicationId rootProject.ext.android.applicationId + } + // f系列-分体机全系列，未细分 + f8xx{ + dimension "product" } qa { dimension "env" @@ -176,7 +194,8 @@ dependencies { } if (Boolean.valueOf(RELEASE)) { - api rootProject.ext.dependencies.modulemain + launcherApi rootProject.ext.dependencies.modulemainlauncher + independentApi rootProject.ext.dependencies.modulemainindependent api rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.modulesearch @@ -186,7 +205,8 @@ dependencies { debugImplementation rootProject.ext.dependencies.gpssimulatordebug releaseImplementation rootProject.ext.dependencies.gpssimulatornoop } else { - implementation project(':modules:mogo-module-main') + 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') diff --git a/app/src/catholic/AndroidManifest.xml b/app/src/catholic/AndroidManifest.xml index 8fe77ba4ff..ccd3059601 100644 --- a/app/src/catholic/AndroidManifest.xml +++ b/app/src/catholic/AndroidManifest.xml @@ -12,38 +12,11 @@ android:supportsRtl="true" android:theme="@style/AppTheme.App" tools:replace="android:label"> - - - - - - - - - - - - - + - + + + diff --git a/app/src/d80x/AndroidManifest.xml b/app/src/d80x/AndroidManifest.xml deleted file mode 100644 index 1096abd079..0000000000 --- a/app/src/d80x/AndroidManifest.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/independent/AndroidManifest.xml b/app/src/independent/AndroidManifest.xml new file mode 100644 index 0000000000..79962badfc --- /dev/null +++ b/app/src/independent/AndroidManifest.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/launcher/AndroidManifest.xml b/app/src/launcher/AndroidManifest.xml new file mode 100644 index 0000000000..80f278b7a4 --- /dev/null +++ b/app/src/launcher/AndroidManifest.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 31f31689d3..acc1e77d97 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,46 +14,15 @@ android:supportsRtl="true" android:theme="@style/AppTheme.App" tools:replace="android:label"> - - - - - - - - - - - - - - - - - + + + + + - + + + \ No newline at end of file diff --git a/app/src/nwd/AndroidManifest.xml b/app/src/nwd/AndroidManifest.xml deleted file mode 100644 index 357926ae40..0000000000 --- a/app/src/nwd/AndroidManifest.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/config.gradle b/config.gradle index 09aca032e8..69e6a49dee 100644 --- a/config.gradle +++ b/config.gradle @@ -88,6 +88,8 @@ ext { mogomapapi : "com.mogo.map:mogo-map-api:${MOGO_MAP_API_VERSION}", modulecommon : "com.mogo.module:module-common:${MOGO_MODULE_COMMON_VERSION}", modulemain : "com.mogo.module:module-main:${MOGO_MODULE_MAIN_VERSION}", + modulemainlauncher : "com.mogo.module:module-main-launcher:${MOGO_MODULE_MAIN_LAUNCHER_VERSION}", + modulemainindependent : "com.mogo.module:module-main-independent:${MOGO_MODULE_MAIN_INDEPENDENT_VERSION}", modulemap : "com.mogo.module:module-map:${MOGO_MODULE_MAP_VERSION}", moduleservice : "com.mogo.module:module-service:${MOGO_MODULE_SERVICE_VERSION}", mogoservice : "com.mogo.service:mogo-service:${MOGO_SERVICE_VERSION}", diff --git a/gradle.properties b/gradle.properties index c44c657668..2001ab0d94 100644 --- a/gradle.properties +++ b/gradle.properties @@ -51,6 +51,9 @@ MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.1.0.15 MOGO_MODULE_AUTHORIZE_VERSION=1.1.0.15 MOGO_MODULE_GUIDE_VERSION=1.1.0.15 +MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.0.0.0 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.0.0.0 + ## 工程外部模块 # 探路 diff --git a/main-extensions/mogo-module-main-independent/.gitignore b/main-extensions/mogo-module-main-independent/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/main-extensions/mogo-module-main-independent/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/main-extensions/mogo-module-main-independent/build.gradle b/main-extensions/mogo-module-main-independent/build.gradle new file mode 100644 index 0000000000..e2cf94d684 --- /dev/null +++ b/main-extensions/mogo-module-main-independent/build.gradle @@ -0,0 +1,50 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion rootProject.ext.android.compileSdkVersion + // buildToolsVersion rootProject.ext.android.buildToolsVersion + defaultConfig { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion + versionCode Integer.valueOf(VERSION_CODE) + versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles 'consumer-rules.pro' + + javaCompileOptions { + annotationProcessorOptions { + arguments = [AROUTER_MODULE_NAME: project.getName()] + } + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + + implementation rootProject.ext.dependencies.androidxappcompat + implementation rootProject.ext.dependencies.androidxconstraintlayout + implementation rootProject.ext.dependencies.arouter + annotationProcessor rootProject.ext.dependencies.aroutercompiler + if (Boolean.valueOf(RELEASE)) { + implementation rootProject.ext.dependencies.modulemain + } else { + implementation project(":modules:mogo-module-main") + } +} + +apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/main-extensions/mogo-module-main-independent/consumer-rules.pro b/main-extensions/mogo-module-main-independent/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/main-extensions/mogo-module-main-independent/gradle.properties b/main-extensions/mogo-module-main-independent/gradle.properties new file mode 100644 index 0000000000..48aa348f9c --- /dev/null +++ b/main-extensions/mogo-module-main-independent/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.module +POM_ARTIFACT_ID=module-main-independent +VERSION_CODE=1 diff --git a/main-extensions/mogo-module-main-independent/proguard-rules.pro b/main-extensions/mogo-module-main-independent/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/main-extensions/mogo-module-main-independent/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/main-extensions/mogo-module-main-independent/src/androidTest/java/com/zhidao/mogo/module/main/independent/ExampleInstrumentedTest.java b/main-extensions/mogo-module-main-independent/src/androidTest/java/com/zhidao/mogo/module/main/independent/ExampleInstrumentedTest.java new file mode 100644 index 0000000000..0d481e0787 --- /dev/null +++ b/main-extensions/mogo-module-main-independent/src/androidTest/java/com/zhidao/mogo/module/main/independent/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.zhidao.mogo.module.main.independent; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("com.zhidao.mogo.module.main.independent.test", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/main-extensions/mogo-module-main-independent/src/main/AndroidManifest.xml b/main-extensions/mogo-module-main-independent/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..fcfddb2b4a --- /dev/null +++ b/main-extensions/mogo-module-main-independent/src/main/AndroidManifest.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java new file mode 100644 index 0000000000..efd78c1938 --- /dev/null +++ b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java @@ -0,0 +1,23 @@ +package com.zhidao.mogo.module.main.independent; + +import android.os.Bundle; +import android.view.View; + +import androidx.annotation.Nullable; + +import com.mogo.module.main.MainActivity; + +/** + * 针对独立应用形式，做单独定制 + * + * @author tongchenfei + */ +public class MainIndependentActivity extends MainActivity { + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + mApps.setVisibility(View.GONE); + mLeftShadowFrame.setVisibility(View.GONE); + } +} diff --git a/main-extensions/mogo-module-main-independent/src/test/java/com/zhidao/mogo/module/main/independent/ExampleUnitTest.java b/main-extensions/mogo-module-main-independent/src/test/java/com/zhidao/mogo/module/main/independent/ExampleUnitTest.java new file mode 100644 index 0000000000..1d5940b5c0 --- /dev/null +++ b/main-extensions/mogo-module-main-independent/src/test/java/com/zhidao/mogo/module/main/independent/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.zhidao.mogo.module.main.independent; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/main-extensions/mogo-module-main-launcher/.gitignore b/main-extensions/mogo-module-main-launcher/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/main-extensions/mogo-module-main-launcher/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/main-extensions/mogo-module-main-launcher/build.gradle b/main-extensions/mogo-module-main-launcher/build.gradle new file mode 100644 index 0000000000..e2cf94d684 --- /dev/null +++ b/main-extensions/mogo-module-main-launcher/build.gradle @@ -0,0 +1,50 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion rootProject.ext.android.compileSdkVersion + // buildToolsVersion rootProject.ext.android.buildToolsVersion + defaultConfig { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion + versionCode Integer.valueOf(VERSION_CODE) + versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles 'consumer-rules.pro' + + javaCompileOptions { + annotationProcessorOptions { + arguments = [AROUTER_MODULE_NAME: project.getName()] + } + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + + implementation rootProject.ext.dependencies.androidxappcompat + implementation rootProject.ext.dependencies.androidxconstraintlayout + implementation rootProject.ext.dependencies.arouter + annotationProcessor rootProject.ext.dependencies.aroutercompiler + if (Boolean.valueOf(RELEASE)) { + implementation rootProject.ext.dependencies.modulemain + } else { + implementation project(":modules:mogo-module-main") + } +} + +apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/main-extensions/mogo-module-main-launcher/consumer-rules.pro b/main-extensions/mogo-module-main-launcher/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/main-extensions/mogo-module-main-launcher/gradle.properties b/main-extensions/mogo-module-main-launcher/gradle.properties new file mode 100644 index 0000000000..73da301072 --- /dev/null +++ b/main-extensions/mogo-module-main-launcher/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.module +POM_ARTIFACT_ID=module-main-launcher +VERSION_CODE=1 diff --git a/main-extensions/mogo-module-main-launcher/proguard-rules.pro b/main-extensions/mogo-module-main-launcher/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/main-extensions/mogo-module-main-launcher/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/main-extensions/mogo-module-main-launcher/src/androidTest/java/com/zhidao/mogo/module/main/launcher/ExampleInstrumentedTest.java b/main-extensions/mogo-module-main-launcher/src/androidTest/java/com/zhidao/mogo/module/main/launcher/ExampleInstrumentedTest.java new file mode 100644 index 0000000000..6bccfd240a --- /dev/null +++ b/main-extensions/mogo-module-main-launcher/src/androidTest/java/com/zhidao/mogo/module/main/launcher/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.zhidao.mogo.module.main.launcher; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("com.zhidao.mogo.module.main.launcher.test", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/app/src/zhidao/AndroidManifest.xml b/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml similarity index 62% rename from app/src/zhidao/AndroidManifest.xml rename to main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml index 31f31689d3..b59a0bf53e 100644 --- a/app/src/zhidao/AndroidManifest.xml +++ b/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml @@ -1,21 +1,9 @@ - + package="com.zhidao.mogo.module.main.launcher"> - - - + - - - - \ No newline at end of file diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java new file mode 100644 index 0000000000..c7db9f79d3 --- /dev/null +++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java @@ -0,0 +1,19 @@ +package com.zhidao.mogo.module.main.launcher; + +import android.os.Bundle; + +import androidx.annotation.Nullable; + +import com.mogo.module.main.MainActivity; + +/** + * 针对作为Launcher的情况，做个性化操作 + * + * @author tongchenfei + */ +public class MainLauncherActivity extends MainActivity { + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } +} diff --git a/main-extensions/mogo-module-main-launcher/src/test/java/com/zhidao/mogo/module/main/launcher/ExampleUnitTest.java b/main-extensions/mogo-module-main-launcher/src/test/java/com/zhidao/mogo/module/main/launcher/ExampleUnitTest.java new file mode 100644 index 0000000000..2004abd04d --- /dev/null +++ b/main-extensions/mogo-module-main-launcher/src/test/java/com/zhidao/mogo/module/main/launcher/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.zhidao.mogo.module.main.launcher; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle index 61422928c8..0bfcb0b4bd 100644 --- a/modules/mogo-module-main/build.gradle +++ b/modules/mogo-module-main/build.gradle @@ -41,27 +41,27 @@ dependencies { implementation rootProject.ext.dependencies.arouter annotationProcessor rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(RELEASE)) { - implementation rootProject.ext.dependencies.mogoutils - implementation rootProject.ext.dependencies.mogocommons - implementation rootProject.ext.dependencies.modulecommon - implementation rootProject.ext.dependencies.modulemap - implementation rootProject.ext.dependencies.mogoserviceapi - implementation rootProject.ext.dependencies.mogoservice - implementation rootProject.ext.dependencies.moduleservice - implementation rootProject.ext.dependencies.moduleapps - implementation rootProject.ext.dependencies.mogoconnection - implementation rootProject.ext.dependencies.moduleextensions + api rootProject.ext.dependencies.mogoutils + api rootProject.ext.dependencies.mogocommons + api rootProject.ext.dependencies.modulecommon + api rootProject.ext.dependencies.modulemap + api rootProject.ext.dependencies.mogoserviceapi + api rootProject.ext.dependencies.mogoservice + api rootProject.ext.dependencies.moduleservice + api rootProject.ext.dependencies.moduleapps + api rootProject.ext.dependencies.mogoconnection + api rootProject.ext.dependencies.moduleextensions } else { - implementation project(":foudations:mogo-utils") - implementation project(":foudations:mogo-commons") - implementation project(':modules:mogo-module-common') - implementation project(':modules:mogo-module-map') - implementation project(':modules:mogo-module-service') - implementation project(':services:mogo-service-api') - implementation project(':services:mogo-service') - implementation project(':modules:mogo-module-apps') - implementation project(':foudations:mogo-connection') - implementation project(':modules:mogo-module-extensions') + api project(":foudations:mogo-utils") + api project(":foudations:mogo-commons") + api project(':modules:mogo-module-common') + api project(':modules:mogo-module-map') + api project(':modules:mogo-module-service') + api project(':services:mogo-service-api') + api project(':services:mogo-service') + api project(':modules:mogo-module-apps') + api project(':foudations:mogo-connection') + api project(':modules:mogo-module-extensions') } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index f4b8d04f5a..9354765ddb 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -47,21 +47,21 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme IMogoLocationListener, IMogoMarkerClickListener { - private static final String TAG = "MainActivity"; + private static final String TAG = MainActivity.class.getSimpleName(); - private IMogoServiceApis mServiceApis; - private IMogoMapService mMogoMapService; - private IMogoMapUIController mMogoMapUIController; - private MogoModulesHandler mMogoModuleHandler; - private IMogoFragmentManager mMogoFragmentManager; - private IMogoStatusManager mMogoStatusManager; + protected IMogoServiceApis mServiceApis; + protected IMogoMapService mMogoMapService; + protected IMogoMapUIController mMogoMapUIController; + protected MogoModulesHandler mMogoModuleHandler; + protected IMogoFragmentManager mMogoFragmentManager; + protected IMogoStatusManager mMogoStatusManager; - private View mHeader; - private View mApps; - private View mEntrance; - private FrameLayout mFloatingLayout; - private FrameLayout mCoverUpLayout; - private View mLeftShadowFrame; + protected View mHeader; + protected View mApps; + protected View mEntrance; + protected FrameLayout mFloatingLayout; + protected FrameLayout mCoverUpLayout; + protected View mLeftShadowFrame; /** * 主模块管控定位，可以向各个模块发送统一定位信息 diff --git a/settings.gradle b/settings.gradle index 03d4c6868f..fe14af1bfd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,5 @@ +include ':main-extensions:mogo-module-main-independent' +include ':main-extensions:mogo-module-main-launcher' rootProject.name = 'MogoLauncher' include ':app' include ':foudations:mogo-utils' From 9574b4448f74ce846085a24e66e9f51e41bc5abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 2 Jun 2020 19:20:01 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b53fea8dc7..085310319b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,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.0.16 +MOGO_MODULE_V2X_VERSION=1.0.17 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.11 # 推送 From baa447fc6e7a2bfa585098d902532953b2e03108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 2 Jun 2020 19:20:16 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b53fea8dc7..085310319b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,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.0.16 +MOGO_MODULE_V2X_VERSION=1.0.17 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.11 # 推送 From a6528a1853523eed1abdc22ee39a155d7aa9f673 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 3 Jun 2020 10:16:14 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extensions/utils/TopViewAnimHelper.java | 13 +++++++++++++ .../src/main/res/layout/demo_top.xml | 2 +- .../res/layout/module_ext_layout_entrance.xml | 19 +++++++++---------- .../src/main/res/values-ldpi/dimens.xml | 5 +++-- .../src/main/res/values-xhdpi/dimens.xml | 6 +++--- 5 files changed, 29 insertions(+), 16 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java index 509b373035..4815bccb32 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java @@ -242,6 +242,10 @@ public class TopViewAnimHelper { R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT, (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46)); + constraintSet.clear(ivTurnIcon.getId(),ConstraintSet.TOP); + constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM, + naviBg.getId(), ConstraintSet.BOTTOM, (int) getDimen(R.dimen.module_ext_navi_info_turn_icon_margin_bottom)); + constraintSet.connect(naviBg.getId(), ConstraintSet.TOP, R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, (int) getDimen(R.dimen.dp_316)); @@ -350,6 +354,9 @@ public class TopViewAnimHelper { 0); constraintSet.connect(naviBg.getId(), ConstraintSet.TOP, R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, 0); + constraintSet.connect(ivTurnIcon.getId(),ConstraintSet.TOP,naviBg.getId(),ConstraintSet.TOP,0); + constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM, + naviBg.getId(), ConstraintSet.BOTTOM, 0); } constraintSet.applyTo(topMotionLayout); @@ -398,6 +405,9 @@ public class TopViewAnimHelper { constraintSet.connect(naviBg.getId(), ConstraintSet.TOP, R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, 0); + constraintSet.connect(ivTurnIcon.getId(),ConstraintSet.TOP,naviBg.getId(),ConstraintSet.TOP,0); + constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM, + naviBg.getId(), ConstraintSet.BOTTOM, 0); constraintSet.applyTo(topMotionLayout); scene = Scene.NAVI_WITH_ROAD_EVENT; } else { @@ -424,6 +434,9 @@ public class TopViewAnimHelper { // naviBg.getLayoutParams().height = // (int) topMotionLayout.getContext().getResources().getDimension(R.dimen // .module_ext_navi_info_panel_small_height); + constraintSet.clear(ivTurnIcon.getId(),ConstraintSet.TOP); + constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM, + naviBg.getId(), ConstraintSet.BOTTOM, (int) getDimen(R.dimen.module_ext_navi_info_turn_icon_margin_bottom)); constraintSet.applyTo(topMotionLayout); scene = Scene.NAVI; } diff --git a/modules/mogo-module-extensions/src/main/res/layout/demo_top.xml b/modules/mogo-module-extensions/src/main/res/layout/demo_top.xml index 31de59022d..35d63b4697 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/demo_top.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/demo_top.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="@dimen/dp_350" - android:background="#000"> + android:background="#ccc"> - - @@ -257,6 +247,15 @@ app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg" app:layout_goneMarginTop="@dimen/module_ext_north_goneMarginTop" /> + 60px 85px 85px - 52px - 52px + 38px + 38px 13px 13px 20px @@ -95,6 +95,7 @@ 24px 15px + 5px 9px 9px diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 2fc96a1770..c9ef02f98b 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -79,8 +79,8 @@ 144px 159px 159px - 96px - 96px + 70px + 70px 24px 83px 24px @@ -92,7 +92,7 @@ 34px 24px 28px - + 24px 17px 17px 36px From 1b1993b3059c1010b79a3a0db984e58eac200c43 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 3 Jun 2020 10:42:34 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=95=B4=E4=BD=93=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E8=BF=90=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhidao/mogo/module/main/launcher/MainLauncherActivity.java | 2 ++ .../src/main/java/com/mogo/module/main/MainActivity.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java index c7db9f79d3..94c1efef92 100644 --- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java +++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java @@ -5,6 +5,7 @@ import android.os.Bundle; import androidx.annotation.Nullable; import com.mogo.module.main.MainActivity; +import com.mogo.utils.logger.Logger; /** * 针对作为Launcher的情况，做个性化操作 @@ -15,5 +16,6 @@ public class MainLauncherActivity extends MainActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Logger.d(TAG, "MainLauncherActivity onCreate()"); } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 9354765ddb..dc91434ee9 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -47,7 +47,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme IMogoLocationListener, IMogoMarkerClickListener { - private static final String TAG = MainActivity.class.getSimpleName(); + protected static final String TAG = MainActivity.class.getSimpleName(); protected IMogoServiceApis mServiceApis; protected IMogoMapService mMogoMapService;