diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 72b5b17ae2..22a4caf1d5 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -237,6 +237,10 @@ public class MogoApplication extends AbsMogoApplication { ); } + /** + * TODO 这里定位数据有问题 + * 上传自车位置信息到云端 + */ private void uploadLocPerFiveSecond() { if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { IMogoServiceApis apis = MogoApisHandler.getInstance().getApis(); diff --git a/config.gradle b/config.gradle index 3e044af82f..9613f93462 100644 --- a/config.gradle +++ b/config.gradle @@ -73,19 +73,15 @@ ext { retrofitconvertergson : "com.squareup.retrofit2:converter-gson:2.6.0", retrofitconverterscalars : "com.squareup.retrofit2:converter-scalars:2.1.0", - // leakcanary leakcanary : 'com.squareup.leakcanary:leakcanary-android:1.5.4', leakcanarynoop : 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4', - // material material : 'com.google.android.material:material:1.4.0', - indicator : 'com.github.zhpanvip:viewpagerindicator:1.0.4', strategy : 'com.zhidaoauto.mic:strategy:1.0.6', - carmanager : "com.zhidao.carmanager:common:1.0.30@aar", // @@ -135,10 +131,10 @@ ext { //plugin mogochainbase : "com.mogo.cloud:service-chain:${SERVICE_CHAIN_VERSION}", mogochainplugin : "com.mogo.cloud:hook:${HOOK_LOG_VERSION}", + //========================= 旧版本架构 Maven 版本管理 ========================= tanluupload : "com.mogo.module:module-tanlu-upload:${TANLULIB_VERSION}", // modules - moduletanlu : "com.mogo.module:module-tanlu:${MOGO_MODULE_TANLU_VERSION}", moduleshare : "com.mogo.module:module-share:${MOGO_MODULE_SHARE_VERSION}", mogocommons : "com.mogo.commons:mogo-commons:${MOGO_COMMONS_VERSION}", mogoutils : "com.mogo.commons:mogo-utils:${MOGO_UTILS_VERSION}", @@ -152,10 +148,8 @@ ext { 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}", - moduledata : "com.mogo.module:module-data:${MOGO_MODULE_DATA_VERSION}", mogoservice : "com.mogo.service:mogo-service:${MOGO_SERVICE_VERSION}", mogoserviceapi : "com.mogo.service:mogo-service-api:${MOGO_SERVICE_API_VERSION}", moduleapps : "com.mogo.module:module-apps:${MOGO_MODULE_APPS_VERSION}", @@ -164,11 +158,9 @@ ext { callchat : "com.mogo.module.carchatout:module-carchatting:${MOGO_MODULE_CARCHATTING_VERSION}", callchatprovider : "com.mogo.module.carchatout:module-carchatting-provider:${MOGO_MODULE_CARCHATTINGPROVIDER_VERSION}", - guideshow : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDESHOW_VERSION}", // V2X moduleV2x : "com.mogo.module:module-v2x:${MOGO_MODULE_V2X_VERSION}", moduleADAS : "com.mogo.module:mogo-module-adas:${MOGO_MODULE_ADAS_VERSION}", - modulemedia : "com.mogo.module:module-media:${MOGO_MODULE_MEDIA_VERSION}", modulesearch : "com.mogo.module:module-search:${MOGO_MODULE_SEARCH_VERSION}", // push modulepush : "com.mogo.module:module-push:${MOGO_MODULE_PUSH_VERSION}", @@ -176,16 +168,12 @@ ext { modulepushnoop : "com.mogo.module:module-push-noop:${MOGO_MODULE_PUSH_NOOP_VERSION}", //统一返回键 mogomoduleback : "com.mogo.module:module-back:${MOGO_MODULE_BACK_VERSION}", - mogomoduleauth : "com.mogo.module:module-authorize:${MOGO_MODULE_AUTHORIZE_VERSION}", - mogomoduleguide : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDE_VERSION}", // OBU moduleobu : "com.mogo.module:module-obu:${MOGO_MODULE_OBU_VERSION}", // 左侧面板 moduleleftpanel : "com.mogo.module:module-left-panel:${MOGO_MODULE_LEFT_PANEL_VERSION}", // 左侧面板空实现 moduleleftpanelnoop : "com.mogo.module:module-left-panel-noop:${MOGO_MODULE_LEFT_PANEL_VERSION}", - // 闪屏页 - modulesplash : "com.mogo.module:module-splash:${MOGO_MODULE_SPLASH_VERSION}", // 基础服务实现 mogobaseservicesdk : "com.mogo.base:services-sdk:${MOGO_BASE_SERVICES_SDK_VERSION}", mogobaseserviceapk : "com.mogo.base:services-apk:${MOGO_BASE_SERVICES_APK_VERSION}", @@ -208,15 +196,20 @@ ext { skinsupportcardview : "com.mogo.skin:skin-support-cardview:${SKIN_SUPPORT_CARDVIEW_VERSION}", skinsupportconstraintlayout : "com.mogo.skin:skin-support-constraint-layout:${SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION}", skinsupportdesign : "com.mogo.skin:skin-support-design:${SKIN_SUPPORT_DESIGN_VERSION}", + //========================= TTS语音 Maven 版本管理 ========================= ttsbase : "com.mogo.tts:tts-base:${TTS_BASE_VERSION}", ttsdi : "com.mogo.tts:tts-di:${TTS_DI_VERSION}", ttszhi : "com.mogo.tts:tts-zhi:${TTS_ZHI_VERSION}", ttspad : "com.mogo.tts:tts-pad:${TTS_ZHI_VERSION}", ttsnoop : "com.mogo.tts:tts-noop:${TTS_NOOP_VERSION}", + + //========================= 网约车 Maven 版本管理 ========================= mogooch : "com.mogo.och:och:${MOGO_OCH_VERSION}", mogoochbus : "com.mogo.och:och-bus:${MOGO_OCH_BUS_VERSION}", mogoochtaxi : "com.mogo.och:och-taxi:${MOGO_OCH_TAXI_VERSION}", mogoochnoop : "com.mogo.och:och-noop:${MOGO_OCH_NOOP_VERSION}", + + //========================= AiCloudSDK Maven 版本管理 ========================= mogoaicloudservicesdk : "com.mogo.aicloud.services:services-sdk:${MOGO_AICLOUD_SERVICES_SDK_VERSION}", mogoaicloudsocket : "com.mogo.cloud:socket:${MOGO_SOCKET_VERSION}", mogoaicloudpassport : "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}", diff --git a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml index 0b095cc6d1..cef385fb90 100644 --- a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -2,6 +2,7 @@ 460px 460px + 70px 30px 130px diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index cc92f49987..97e63fb5b4 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -2,6 +2,7 @@ 300px 300px + 60px 20px 110px diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java index 118d0ed3f3..d0b513a1c3 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java @@ -1,11 +1,8 @@ package com.mogo.commons.mvp; -import android.content.ComponentName; import android.content.Context; -import android.content.Intent; import android.os.Build; import android.os.Bundle; -import android.provider.Settings; import android.view.MotionEvent; import android.view.View; import android.view.Window; @@ -14,11 +11,9 @@ import android.view.WindowManager; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.app.AppCompatDelegate; import com.mogo.commons.debug.DebugConfig; import com.mogo.utils.SoftKeyBoardJobber; -import com.mogo.utils.logger.Logger; /** * @author congtaowang diff --git a/gradle.properties b/gradle.properties index f99b111671..35e6524a8e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -122,20 +122,13 @@ MOGO_MODULE_COMMON_VERSION=2.0.62 MOGO_MODULE_MAIN_VERSION=2.0.62 MOGO_MODULE_MAP_VERSION=2.0.62 MOGO_MODULE_SERVICE_VERSION=2.0.62 -MOGO_MODULE_DATA_VERSION=2.0.62 MOGO_MODULE_EXTENSIONS_VERSION=2.0.62 MOGO_MODULE_SEARCH_VERSION=2.0.62 MOGO_MODULE_BACK_VERSION=2.0.62 -MOGO_MODULE_AUTHORIZE_VERSION=2.0.62 -MOGO_MODULE_GUIDE_VERSION=2.0.62 -MOGO_MODULE_MEDIA_VERSION=2.0.62 MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.62 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.62 MOGO_MODULE_V2X_VERSION=2.0.62 # 探路 MOGO_MODULE_TANLU_VERSION=2.0.62 -# 视频引导 -MOGO_MODULE_GUIDESHOW_VERSION=2.0.62 # 推送 MOGO_MODULE_PUSH_VERSION=2.0.62 MOGO_MODULE_PUSH_BASE_VERSION=2.0.62 @@ -187,9 +180,6 @@ SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.62 SKIN_SUPPORT_CARDVIEW_VERSION=2.0.62 SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.62 SKIN_SUPPORT_DESIGN_VERSION=2.0.62 -# 闪屏页 -MOGO_MODULE_SPLASH_VERSION=2.0.62 -MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.62 # OCH MOGO_OCH_VERSION=2.0.62 MOGO_OCH_BUS_VERSION=2.0.62 diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java index 0892ada5c5..1c4dd37d48 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java @@ -1,6 +1,5 @@ package com.mogo.module.apps; -import android.app.Activity; import android.content.Context; import android.content.Intent; import android.graphics.Color; 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 9a2263c4c2..beda74a3b6 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 @@ -34,7 +34,6 @@ import com.mogo.service.IMogoServiceApis; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import com.mogo.service.fragmentmanager.FragmentStackTransactionListener; import com.mogo.service.fragmentmanager.IMogoFragmentManager; -import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.statusmanager.StatusDescriptor; @@ -45,8 +44,6 @@ import com.zhidao.adasconfig.api.AdasConfigApiController; import com.zhidao.adasconfig.common.log.LoggerController; import com.zhidao.autopilot.support.api.AutopilotServiceManage; -import java.util.List; - /** * @author congtaowang * @since 2019-12-23 diff --git a/tts/tts-pad/src/main/AndroidManifest.xml b/tts/tts-pad/src/main/AndroidManifest.xml index 70631ddf64..8c0a1cada7 100644 --- a/tts/tts-pad/src/main/AndroidManifest.xml +++ b/tts/tts-pad/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - / \ No newline at end of file diff --git a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java index f7dcc5bab4..b2cbae7691 100644 --- a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java +++ b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java @@ -37,7 +37,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -public /** * @author congtaowang * @since 2020/10/12 @@ -45,7 +44,7 @@ public * 描述 */ @Route( path = MogoTTSConstants.API_PATH ) -class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsListener { +public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsListener { private static final String TAG = "PadTTS"; private String mLastQAndASpeakText;