From 734d1d3efdc3d39e250941ffc601fc60eef22331 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 30 Mar 2022 11:17:25 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=90=88=E5=B9=B6main=E4=B8=8Ehmi?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- app/build.gradle | 8 +- app/src/main/AndroidManifest.xml | 5 +- app/src/main/res/values/colors.xml | 2 + app/src/main/res/values/styles.xml | 32 ++++- .../mogo-core-function-hmi/build.gradle | 93 +++++++++++--- .../libs/persistentlib.jar | Bin .../src/main/AndroidManifest.xml | 64 +++++++++ .../function/main/EventDispatchCenter.java | 0 .../core/function/main/MainActivity.java | 2 +- .../function/main/MainLauncherActivity.java | 1 + .../function/main/MainMoGoApplication.java | 6 - .../core/function/main/MainPresenter.java | 0 .../eagle/core/function/main/MainView.java | 0 .../core/function/main/SchemeIntent.java | 4 +- .../main/cards/MogoModulesHandler.java | 0 .../main/cards/MogoModulesManager.java | 0 .../main/constants/MainConstants.java | 0 .../delaycheck/DelayCheckApiServices.java | 0 .../delaycheck/DelayCheckHttpConstant.java | 0 .../main/delaycheck/DelayCheckResponse.java | 0 .../main/delaycheck/DelayCheckResult.java | 0 .../delaycheck/DelayCheckUploadRequest.java | 0 .../main/delaycheck/DelayCheckUtil.java | 0 .../main/monitoring/VehicleMonitoring.java | 0 .../registercenter/MogoRegisterCenter.java | 0 .../MogoRegisterCenterHandler.java | 0 .../main/service/MogoMainService.java | 0 .../main/utils/DisplayEffectsHelper.java | 3 +- .../main/utils/DisplayEffectsManager.java | 0 .../windowview/DispatchTouchEventWrapper.java | 0 .../main/windowview/FloatingViewHandler.java | 0 .../main/windowview/IWindowViewHandler.java | 0 .../main/windowview/MogoWindowManager.java | 0 .../drawable-ldpi/module_main_launcher_bg.png | Bin .../main/res/drawable-ldpi/mogo_slogan.png | Bin .../drawable-mdpi/module_main_launcher_bg.png | Bin .../main/res/drawable-mdpi/mogo_slogan.png | Bin .../main/res/drawable-xhdpi-2560x1440/wu1.png | Bin .../main/res/drawable-xhdpi-2560x1440/wu2.png | Bin .../module_main_launcher_bg.png | Bin .../module_main_warning_bkg_bottom.xml | 0 .../module_main_warning_bkg_left.xml | 0 .../module_main_warning_bkg_right.xml | 0 .../module_main_warning_bkg_top.xml | 0 .../main/res/drawable-xhdpi/mogo_slogan.png | Bin .../src/main/res/drawable-xhdpi/wu1.png | Bin .../src/main/res/drawable-xhdpi/wu2.png | Bin .../res/drawable/main_bitmap_splash_bg.xml | 0 .../res/drawable/main_bitmap_splash_icon.xml | 0 .../src/main/res/drawable/main_splash_bg.xml | 0 .../module_main_dw_left_frame_bkg.xml | 0 .../drawable/module_main_dw_top_frame_bkg.xml | 0 .../res/layout/module_main_activity_main.xml | 0 .../values-xhdpi-2560x1440/dimens_main.xml} | 0 .../src/main/res/values/color.xml | 2 + .../src/main/res/values/dimens_main.xml} | 0 .../src/main/res/values/styles_main.xml} | 0 .../mogo-core-function-main/.gitignore | 1 - .../mogo-core-function-main/build.gradle | 121 ------------------ .../consumer-rules.pro | 0 .../mogo-core-function-main/gradle.properties | 3 - .../proguard-rules.pro | 21 --- .../src/main/AndroidManifest.xml | 70 ---------- .../src/main/res/values-mdpi/dimens.xml | 41 ------ .../src/main/res/values-xhdpi/dimens.xml | 37 ------ .../src/main/res/values/colors.xml | 5 - .../src/main/res/values/strings.xml | 3 - settings.gradle | 3 +- 68 files changed, 181 insertions(+), 346 deletions(-) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/libs/persistentlib.jar (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java (99%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java (98%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java (98%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/MainPresenter.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/MainView.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/SchemeIntent.java (99%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesHandler.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesManager.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/constants/MainConstants.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckApiServices.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckHttpConstant.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckResponse.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckResult.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckUploadRequest.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckUtil.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/monitoring/VehicleMonitoring.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenter.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenterHandler.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/utils/DisplayEffectsHelper.java (97%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/utils/DisplayEffectsManager.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/windowview/DispatchTouchEventWrapper.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/windowview/FloatingViewHandler.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/windowview/IWindowViewHandler.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/java/com/mogo/eagle/core/function/main/windowview/MogoWindowManager.java (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable-ldpi/module_main_launcher_bg.png (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable-ldpi/mogo_slogan.png (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable-mdpi/module_main_launcher_bg.png (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable-mdpi/mogo_slogan.png (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable-xhdpi-2560x1440/wu1.png (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable-xhdpi-2560x1440/wu2.png (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable-xhdpi/module_main_launcher_bg.png (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable-xhdpi/module_main_warning_bkg_bottom.xml (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable-xhdpi/mogo_slogan.png (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable-xhdpi/wu1.png (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable-xhdpi/wu2.png (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable/main_bitmap_splash_bg.xml (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable/main_bitmap_splash_icon.xml (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable/main_splash_bg.xml (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable/module_main_dw_left_frame_bkg.xml (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/drawable/module_main_dw_top_frame_bkg.xml (100%) rename core/function-impl/{mogo-core-function-main => mogo-core-function-hmi}/src/main/res/layout/module_main_activity_main.xml (100%) rename core/function-impl/{mogo-core-function-main/src/main/res/values-xhdpi-1920x1000/dimens.xml => mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens_main.xml} (100%) rename core/function-impl/{mogo-core-function-main/src/main/res/values/dimens.xml => mogo-core-function-hmi/src/main/res/values/dimens_main.xml} (100%) rename core/function-impl/{mogo-core-function-main/src/main/res/values/styles.xml => mogo-core-function-hmi/src/main/res/values/styles_main.xml} (100%) delete mode 100644 core/function-impl/mogo-core-function-main/.gitignore delete mode 100644 core/function-impl/mogo-core-function-main/build.gradle delete mode 100644 core/function-impl/mogo-core-function-main/consumer-rules.pro delete mode 100644 core/function-impl/mogo-core-function-main/gradle.properties delete mode 100644 core/function-impl/mogo-core-function-main/proguard-rules.pro delete mode 100644 core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml delete mode 100644 core/function-impl/mogo-core-function-main/src/main/res/values-mdpi/dimens.xml delete mode 100644 core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi/dimens.xml delete mode 100644 core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml delete mode 100644 core/function-impl/mogo-core-function-main/src/main/res/values/strings.xml diff --git a/app/build.gradle b/app/build.gradle index 66a4af0052..68f2bc1df2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -237,18 +237,18 @@ dependencies { releaseImplementation rootProject.ext.dependencies.releaseleakcanary if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_function_main implementation rootProject.ext.dependencies.ttspad + implementation rootProject.ext.dependencies.mogo_core_function_hmi + androidTestImplementation rootProject.ext.dependencies.mogo_core_function_call androidTestImplementation rootProject.ext.dependencies.mogo_core_res - androidTestImplementation rootProject.ext.dependencies.mogo_core_function_hmi androidTestImplementation rootProject.ext.dependencies.mogo_core_function_notice } else { - implementation project(':core:function-impl:mogo-core-function-main') implementation project(':tts:tts-pad') + implementation project(':core:function-impl:mogo-core-function-hmi') + androidTestImplementation project(':core:mogo-core-function-call') androidTestImplementation project(':core:mogo-core-res') - androidTestImplementation project(':core:function-impl:mogo-core-function-hmi') androidTestImplementation project(':core:function-impl:mogo-core-function-notice') } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7528c86e94..7d31d4c005 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,9 +13,9 @@ android:label="@string/app_shell_name" android:largeHeap="true" android:resizeableActivity="false" - android:usesCleartextTraffic="true" android:supportsRtl="true" - android:theme="@style/Main" + android:theme="@style/AppTheme.App" + android:usesCleartextTraffic="true" tools:replace="android:label"> @@ -36,7 +36,6 @@ android:value="${MAP_SDK_VERSION}" /> - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 7e091a2301..fff387fdb3 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,4 +5,6 @@ #D81B60 + #1C1C1C + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index cc42d0d0c2..55f99fed29 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,12 +1,32 @@ - - + diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle index 5fba5dc7e4..8515dbefae 100644 --- a/core/function-impl/mogo-core-function-hmi/build.gradle +++ b/core/function-impl/mogo-core-function-hmi/build.gradle @@ -5,6 +5,7 @@ plugins { id 'kotlin-kapt' id 'com.alibaba.arouter' } + android { compileSdkVersion rootProject.ext.android.compileSdkVersion // buildToolsVersion rootProject.ext.android.buildToolsVersion @@ -50,39 +51,93 @@ dependencies { implementation rootProject.ext.dependencies.androidxccorektx implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxconstraintlayout - implementation rootProject.ext.dependencies.arouter - implementation rootProject.ext.dependencies.rxandroid implementation rootProject.ext.dependencies.androidxrecyclerview implementation rootProject.ext.dependencies.flexbox + + implementation rootProject.ext.dependencies.rxandroid implementation rootProject.ext.dependencies.mogoaicloudtrafficlive - kapt rootProject.ext.dependencies.aroutercompiler kapt rootProject.ext.dependencies.androidxroomcompiler implementation rootProject.ext.dependencies.androidxroomruntime implementation rootProject.ext.dependencies.androidxroomktx + //Crash日志收集 + implementation rootProject.ext.dependencies.crashSdk + implementation rootProject.ext.dependencies.boostmultidex + + debugImplementation rootProject.ext.dependencies.debugleakcanary + releaseImplementation rootProject.ext.dependencies.releaseleakcanary + + implementation rootProject.ext.dependencies.arouter + kapt rootProject.ext.dependencies.aroutercompiler + + implementation rootProject.ext.dependencies.mogoami + + implementation rootProject.ext.dependencies.mogochainbase if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.modulecommon - compileOnly rootProject.ext.dependencies.mogoserviceapi + api rootProject.ext.dependencies.mogoaicloudservicesdk + api rootProject.ext.dependencies.mogocommons + api rootProject.ext.dependencies.modulecommon + api rootProject.ext.dependencies.mogoserviceapi + api rootProject.ext.dependencies.moduleservice + api rootProject.ext.dependencies.mogoservice + api rootProject.ext.dependencies.mogomap + api rootProject.ext.dependencies.crashreportupgrade +// api rootProject.ext.dependencies.crashreportbugly + + api rootProject.ext.dependencies.mogo_core_res + api rootProject.ext.dependencies.mogo_core_data + api rootProject.ext.dependencies.mogo_core_utils + api rootProject.ext.dependencies.mogo_core_network + api rootProject.ext.dependencies.mogo_core_function_obu_mogo + api rootProject.ext.dependencies.mogo_core_function_notice + api rootProject.ext.dependencies.mogo_core_function_bindingcar + api rootProject.ext.dependencies.mogo_core_function_autopilot + api rootProject.ext.dependencies.mogo_core_function_check + api rootProject.ext.dependencies.mogo_core_function_map + api rootProject.ext.dependencies.mogo_core_function_v2x + api rootProject.ext.dependencies.mogo_core_function_monitoring + api rootProject.ext.dependencies.mogo_core_function_devatools + api rootProject.ext.dependencies.mogo_core_function_carcorder + api rootProject.ext.dependencies.mogo_core_function_call + api rootProject.ext.dependencies.mogo_core_function_api + implementation project(':libraries:map-usbcamera') - implementation rootProject.ext.dependencies.mogo_core_res - implementation rootProject.ext.dependencies.mogo_core_data - implementation rootProject.ext.dependencies.mogo_core_utils - implementation rootProject.ext.dependencies.mogo_core_network - implementation rootProject.ext.dependencies.mogo_core_function_call } else { - implementation project(':modules:mogo-module-common') - implementation project(':services:mogo-service-api') - implementation project(':libraries:map-usbcamera') + api project(':foudations:mogo-aicloud-services-sdk') + api project(':foudations:mogo-commons') + api project(':modules:mogo-module-common') + api project(':services:mogo-service-api') + api project(':services:mogo-service') - implementation project(':core:mogo-core-res') - implementation project(':core:mogo-core-data') - implementation project(':core:mogo-core-utils') - implementation project(':core:mogo-core-network') - implementation project(':core:mogo-core-function-api') - implementation project(':core:mogo-core-function-call') + api project(':modules:mogo-module-service') + api project(':libraries:mogo-map') + api project(':test:crashreport-upgrade') +// api project(':test:crashreport-bugly') + api project(':test:crashreport-apmbyte') + + api project(':core:mogo-core-res') + api project(':core:mogo-core-data') + api project(':core:mogo-core-utils') + api project(':core:function-impl:mogo-core-function-obu-mogo') + api project(':core:function-impl:mogo-core-function-autopilot') + api project(':core:function-impl:mogo-core-function-check') + api project(':core:function-impl:mogo-core-function-map') + api project(':core:function-impl:mogo-core-function-notice') + api project(':core:function-impl:mogo-core-function-v2x') + api project(':core:function-impl:mogo-core-function-monitoring') + api project(':core:function-impl:mogo-core-function-devatools') + api project(':core:function-impl:mogo-core-function-carcorder') + api project(':core:function-impl:mogo-core-function-dispatch') + api project(':core:function-impl:mogo-core-function-chat') + api project(':core:function-impl:mogo-core-function-bindingcar') + + api project(':core:mogo-core-function-call') + api project(':core:mogo-core-function-api') + + api project(':libraries:map-usbcamera') } } diff --git a/core/function-impl/mogo-core-function-main/libs/persistentlib.jar b/core/function-impl/mogo-core-function-hmi/libs/persistentlib.jar similarity index 100% rename from core/function-impl/mogo-core-function-main/libs/persistentlib.jar rename to core/function-impl/mogo-core-function-hmi/libs/persistentlib.jar diff --git a/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml index dbd54a7ca7..8fb4538c3b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml @@ -3,9 +3,73 @@ package="com.mogo.eagle.core.function.hmi"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java similarity index 99% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java index 18aabb3be3..e43061461a 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java @@ -25,6 +25,7 @@ import com.mogo.commons.mvp.MvpFragment; import com.mogo.eagle.core.data.constants.MoGoFragmentPaths; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; +import com.mogo.eagle.core.function.hmi.R; import com.mogo.eagle.core.function.main.cards.MogoModulesManager; import com.mogo.eagle.core.function.main.service.MogoMainService; import com.mogo.eagle.core.function.main.utils.DisplayEffectsHelper; @@ -33,7 +34,6 @@ import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.permissions.PermissionsDialogUtils; import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; -import com.mogo.eagle.core.utilcode.util.BarUtils; import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.eagle.core.utilcode.util.ProcessUtils; import com.mogo.map.listener.IMogoHosListenerRegister; diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java similarity index 98% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index eecde1072f..e8423db102 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -13,6 +13,7 @@ import androidx.annotation.Nullable; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; +import com.mogo.eagle.core.function.hmi.R; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.service.intent.IMogoIntentListener; diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java similarity index 98% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 201eac3af4..6cdead57ae 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -39,7 +39,6 @@ import com.mogo.service.IMogoServiceApis; import com.mogo.service.cloud.socket.IMogoLifecycleListener; import com.mogo.test.crashreport.CrashReportConstants; import com.mogo.test.crashreport.upgrade.UpgradeReportConstants; -import com.zhidao.boot.persistent.lib.PersistentManager; import com.zhidao.support.obu.ami.AmiClientManager; import java.lang.reflect.Field; @@ -354,11 +353,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_MAP_DATA_COLLECT_PROVIDER, "MoGoMapDataCollector")); } - if (!DebugConfig.isLauncher()) { - PersistentManager - .getInstance().initManager(this); - } - CallerLogger.INSTANCE.i(M_MAIN + TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms"); } diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainPresenter.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainPresenter.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainPresenter.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainPresenter.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainView.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainView.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainView.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/SchemeIntent.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/SchemeIntent.java similarity index 99% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/SchemeIntent.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/SchemeIntent.java index 6868114781..0d88a7d1f7 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/SchemeIntent.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/SchemeIntent.java @@ -176,9 +176,9 @@ public class SchemeIntent implements IMogoStatusChangedListener { mApis.getAnalyticsApi().track("appenterfront", properties); } - /* + /** * 语音打开事件面板 - * */ + */ private void handleShowEventPanel(int item) { CallerLogger.INSTANCE.d(M_MAIN + TAG, "语音打开事件面板" + item); //mApis.getEventPanelManager().showPanelWithSelectedItem(item); diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesHandler.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesHandler.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesHandler.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesHandler.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesManager.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesManager.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesManager.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesManager.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/constants/MainConstants.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/constants/MainConstants.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/constants/MainConstants.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/constants/MainConstants.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckApiServices.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckApiServices.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckApiServices.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckApiServices.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckHttpConstant.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckHttpConstant.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckHttpConstant.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckHttpConstant.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckResponse.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckResponse.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckResponse.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckResponse.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckResult.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckResult.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckResult.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckResult.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckUploadRequest.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckUploadRequest.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckUploadRequest.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckUploadRequest.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckUtil.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckUtil.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckUtil.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/delaycheck/DelayCheckUtil.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/monitoring/VehicleMonitoring.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/monitoring/VehicleMonitoring.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/monitoring/VehicleMonitoring.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/monitoring/VehicleMonitoring.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenter.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenter.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenter.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenter.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenterHandler.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenterHandler.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenterHandler.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/registercenter/MogoRegisterCenterHandler.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/utils/DisplayEffectsHelper.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/utils/DisplayEffectsHelper.java similarity index 97% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/utils/DisplayEffectsHelper.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/utils/DisplayEffectsHelper.java index 442a580ba4..c683d791ce 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/utils/DisplayEffectsHelper.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/utils/DisplayEffectsHelper.java @@ -6,7 +6,8 @@ import android.content.res.Resources; import android.util.DisplayMetrics; import android.view.View; -import com.mogo.eagle.core.function.main.R; +import com.mogo.eagle.core.function.hmi.R; + /** * created by wujifei on 2021/3/30 14:05 diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/utils/DisplayEffectsManager.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/utils/DisplayEffectsManager.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/utils/DisplayEffectsManager.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/utils/DisplayEffectsManager.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/windowview/DispatchTouchEventWrapper.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/DispatchTouchEventWrapper.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/windowview/DispatchTouchEventWrapper.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/DispatchTouchEventWrapper.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/windowview/FloatingViewHandler.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/FloatingViewHandler.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/windowview/FloatingViewHandler.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/FloatingViewHandler.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/windowview/IWindowViewHandler.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/IWindowViewHandler.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/windowview/IWindowViewHandler.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/IWindowViewHandler.java diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/windowview/MogoWindowManager.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/MogoWindowManager.java similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/windowview/MogoWindowManager.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/windowview/MogoWindowManager.java diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable-ldpi/module_main_launcher_bg.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-ldpi/module_main_launcher_bg.png similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable-ldpi/module_main_launcher_bg.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-ldpi/module_main_launcher_bg.png diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable-ldpi/mogo_slogan.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-ldpi/mogo_slogan.png similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable-ldpi/mogo_slogan.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-ldpi/mogo_slogan.png diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable-mdpi/module_main_launcher_bg.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-mdpi/module_main_launcher_bg.png similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable-mdpi/module_main_launcher_bg.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-mdpi/module_main_launcher_bg.png diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable-mdpi/mogo_slogan.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-mdpi/mogo_slogan.png similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable-mdpi/mogo_slogan.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-mdpi/mogo_slogan.png diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi-2560x1440/wu1.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/wu1.png similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi-2560x1440/wu1.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/wu1.png diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi-2560x1440/wu2.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/wu2.png similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi-2560x1440/wu2.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi-2560x1440/wu2.png diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/module_main_launcher_bg.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_main_launcher_bg.png similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/module_main_launcher_bg.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_main_launcher_bg.png diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_bottom.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_main_warning_bkg_bottom.xml similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_bottom.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_main_warning_bkg_bottom.xml diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/mogo_slogan.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/mogo_slogan.png similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/mogo_slogan.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/mogo_slogan.png diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/wu1.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/wu1.png similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/wu1.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/wu1.png diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/wu2.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/wu2.png similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable-xhdpi/wu2.png rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/wu2.png diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable/main_bitmap_splash_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/main_bitmap_splash_bg.xml similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable/main_bitmap_splash_bg.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/main_bitmap_splash_bg.xml diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable/main_bitmap_splash_icon.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/main_bitmap_splash_icon.xml similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable/main_bitmap_splash_icon.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/main_bitmap_splash_icon.xml diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable/main_splash_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/main_splash_bg.xml similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable/main_splash_bg.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/main_splash_bg.xml diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable/module_main_dw_left_frame_bkg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/module_main_dw_left_frame_bkg.xml similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable/module_main_dw_left_frame_bkg.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/module_main_dw_left_frame_bkg.xml diff --git a/core/function-impl/mogo-core-function-main/src/main/res/drawable/module_main_dw_top_frame_bkg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/module_main_dw_top_frame_bkg.xml similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/drawable/module_main_dw_top_frame_bkg.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/module_main_dw_top_frame_bkg.xml diff --git a/core/function-impl/mogo-core-function-main/src/main/res/layout/module_main_activity_main.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/layout/module_main_activity_main.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml diff --git a/core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi-1920x1000/dimens.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens_main.xml similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi-1920x1000/dimens.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens_main.xml diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml index 317d205176..ccf9d105ba 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml @@ -1,5 +1,7 @@ + #212831 + #2B6EFF #1F9BFE #5A8EFD diff --git a/core/function-impl/mogo-core-function-main/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens_main.xml similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/values/dimens.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens_main.xml diff --git a/core/function-impl/mogo-core-function-main/src/main/res/values/styles.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/styles_main.xml similarity index 100% rename from core/function-impl/mogo-core-function-main/src/main/res/values/styles.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/values/styles_main.xml diff --git a/core/function-impl/mogo-core-function-main/.gitignore b/core/function-impl/mogo-core-function-main/.gitignore deleted file mode 100644 index 42afabfd2a..0000000000 --- a/core/function-impl/mogo-core-function-main/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-main/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle deleted file mode 100644 index 72babe725b..0000000000 --- a/core/function-impl/mogo-core-function-main/build.gradle +++ /dev/null @@ -1,121 +0,0 @@ -plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' - id 'com.alibaba.arouter' -} - -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' - //ARouter apt 参数 - kapt { - useBuildCache = false - arguments { - arg("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']) - //Crash日志收集 - implementation rootProject.ext.dependencies.crashSdk - implementation rootProject.ext.dependencies.androidxappcompat - implementation rootProject.ext.dependencies.boostmultidex - - debugImplementation rootProject.ext.dependencies.debugleakcanary - releaseImplementation rootProject.ext.dependencies.releaseleakcanary - - implementation rootProject.ext.dependencies.androidxconstraintlayout - - implementation rootProject.ext.dependencies.arouter - kapt rootProject.ext.dependencies.aroutercompiler - - implementation rootProject.ext.dependencies.mogoami - - implementation rootProject.ext.dependencies.mogochainbase - - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - api rootProject.ext.dependencies.mogoaicloudservicesdk - api rootProject.ext.dependencies.mogocommons - api rootProject.ext.dependencies.modulecommon - api rootProject.ext.dependencies.mogoserviceapi - api rootProject.ext.dependencies.moduleservice - api rootProject.ext.dependencies.mogoservice - api rootProject.ext.dependencies.mogomap - api rootProject.ext.dependencies.crashreportupgrade -// api rootProject.ext.dependencies.crashreportbugly - - api rootProject.ext.dependencies.mogo_core_data - api rootProject.ext.dependencies.mogo_core_utils - api rootProject.ext.dependencies.mogo_core_function_obu_mogo - api rootProject.ext.dependencies.mogo_core_function_hmi - api rootProject.ext.dependencies.mogo_core_function_notice - api rootProject.ext.dependencies.mogo_core_function_bindingcar - api rootProject.ext.dependencies.mogo_core_function_autopilot - api rootProject.ext.dependencies.mogo_core_function_check - api rootProject.ext.dependencies.mogo_core_function_map - api rootProject.ext.dependencies.mogo_core_function_v2x - api rootProject.ext.dependencies.mogo_core_function_monitoring - api rootProject.ext.dependencies.mogo_core_function_devatools - api rootProject.ext.dependencies.mogo_core_function_carcorder - api rootProject.ext.dependencies.mogo_core_function_call - - } else { - api project(':foudations:mogo-aicloud-services-sdk') - api project(':foudations:mogo-commons') - api project(':modules:mogo-module-common') - api project(':services:mogo-service-api') - api project(':services:mogo-service') - - api project(':modules:mogo-module-service') - api project(':libraries:mogo-map') - api project(':test:crashreport-upgrade') -// api project(':test:crashreport-bugly') - api project(':test:crashreport-apmbyte') - - api project(':core:mogo-core-data') - api project(':core:mogo-core-utils') - api project(':core:function-impl:mogo-core-function-obu-mogo') - api project(':core:function-impl:mogo-core-function-hmi') - api project(':core:function-impl:mogo-core-function-autopilot') - api project(':core:function-impl:mogo-core-function-check') - api project(':core:function-impl:mogo-core-function-map') - api project(':core:function-impl:mogo-core-function-notice') - api project(':core:function-impl:mogo-core-function-v2x') - api project(':core:function-impl:mogo-core-function-monitoring') - api project(':core:function-impl:mogo-core-function-devatools') - api project(':core:function-impl:mogo-core-function-carcorder') - api project(':core:function-impl:mogo-core-function-dispatch') - api project(':core:mogo-core-function-call') - api project(':core:function-impl:mogo-core-function-chat') - api project(':core:function-impl:mogo-core-function-bindingcar') - } -} - -apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/core/function-impl/mogo-core-function-main/consumer-rules.pro b/core/function-impl/mogo-core-function-main/consumer-rules.pro deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/core/function-impl/mogo-core-function-main/gradle.properties b/core/function-impl/mogo-core-function-main/gradle.properties deleted file mode 100644 index 2a2587d9c2..0000000000 --- a/core/function-impl/mogo-core-function-main/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -GROUP=com.mogo.eagle.core.function.impl -POM_ARTIFACT_ID=main -VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-main/proguard-rules.pro b/core/function-impl/mogo-core-function-main/proguard-rules.pro deleted file mode 100644 index 481bb43481..0000000000 --- a/core/function-impl/mogo-core-function-main/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# 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/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml deleted file mode 100644 index da2988996a..0000000000 --- a/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-main/src/main/res/values-mdpi/dimens.xml b/core/function-impl/mogo-core-function-main/src/main/res/values-mdpi/dimens.xml deleted file mode 100644 index e5fc253d07..0000000000 --- a/core/function-impl/mogo-core-function-main/src/main/res/values-mdpi/dimens.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 444px - - 350px - 8px - 352px - 370px - 32px - 140.5px - 18px - 20px - 10px - 144px - 352px - - 320px - 319px - - 110px - 6px - 15px - 460px - 444px - 0px - 350px - 10px - 16px - 658px - 8px - 2px - 2px - 1920px - - 0px - - 0px - 0px - 6px - 6px - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi/dimens.xml deleted file mode 100644 index f40a0f3b9e..0000000000 --- a/core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi/dimens.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 800px - - 350px - 10px - 660px - 690px - 60px - 211px - 30px - 30px - 15px - 270px - 660px - 600px - 599px - - 200px - 20px - 30px - 830px - 800px - 0px - 20px - 30px - - 340px - 1313px - 20px - 20px - - 20px - 18px - 18px - 18px - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml b/core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml deleted file mode 100644 index 44ce84bc8c..0000000000 --- a/core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - #212831 - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-main/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-main/src/main/res/values/strings.xml deleted file mode 100644 index d687f9a422..0000000000 --- a/core/function-impl/mogo-core-function-main/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - mogo-module-main - diff --git a/settings.gradle b/settings.gradle index 391339c25e..4b7f66742d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,9 +21,8 @@ include ':core:mogo-core-function-call' include ':core:function-impl:mogo-core-function-devatools' // 业务实现 -// Main 应用主入口封装,在这里进行初始化应用 -include ':core:function-impl:mogo-core-function-main' // UI 展示及交互 +// Main 应用主入口封装,在这里进行初始化应用 include ':core:function-impl:mogo-core-function-hmi' // 小地图控件 // 地图控件,HD-高精地图