From cc7870fa9fa6f51bf36e35d497e81d6d5eebef2c Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 10 Nov 2021 19:11:04 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=8D=87=E7=BA=A7ARouter=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8C=E6=94=AF=E6=8C=81Fragment=E5=8D=95?= =?UTF-8?q?=E5=88=A9=20[Change]=20=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=81HMI=E5=B1=82=E5=8A=A0=E8=BD=BD=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E9=87=87=E7=94=A8ARouter=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E8=8E=B7=E5=8F=96Fragment=E5=AE=9E=E4=BE=8B=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=EF=BC=9B=E5=BA=9F=E5=BC=83MoGoWarningProvide?= =?UTF-8?q?r=E4=BD=BF=E7=94=A8MoGoHmiFragment=E6=8E=A5=E7=AE=A1IMoGoWaring?= =?UTF-8?q?Provider=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .idea/misc.xml | 2 +- README_shell.md | 2 +- build.gradle | 2 +- config.gradle | 4 +- .../receiver/NoticeNormalBroadcastReceiver.kt | 5 +- .../V2XLimitingVelocityBroadcastReceiver.kt | 10 +- .../V2XTrafficLightBroadcastReceiver.kt | 10 +- .../receiver/V2XWarningBroadcastReceiver.kt | 18 +- .../core/function/hmi/ui/MoGoHmiFragment.kt | 307 ++++++++++-------- .../function/hmi/ui/MoGoWarningContract.kt | 123 ------- .../core/function/map/MoGoHDMapFragment.java | 41 --- .../core/function/map/MoGoMapPresenter.java | 9 - .../eagle/core/function/map/MoGoMapView.java | 6 - .../layout/function_map_fragment_hd_map.xml | 11 - .../function/notice/NoticeSocketManager.java | 2 +- .../function/call/hmi/CallerHmiManager.kt | 9 +- .../com/mogo/module/main/MainActivity.java | 28 +- .../module/main/cards/MogoModulesHandler.java | 13 - .../module/main/cards/MogoModulesManager.java | 36 +- .../res/layout/module_main_activity_main.xml | 6 - .../java/com/mogo/module/map/MapFragment.java | 8 +- .../mogo/module/map/MapFragmentProvider.java | 4 +- .../com/mogo/service/IMogoServiceApis.java | 4 - .../service/map/IMogoMapFrameController.java | 7 +- .../com/mogo/service/map/IMogoMapService.java | 35 -- .../mogo/service/impl/MogoServiceApis.java | 6 - .../mogo/service/impl/map/MogoMapService.java | 65 +--- 27 files changed, 233 insertions(+), 540 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MoGoHDMapFragment.java delete mode 100644 core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MoGoMapPresenter.java delete mode 100644 core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MoGoMapView.java delete mode 100644 core/function-impl/mogo-core-function-map/src/main/res/layout/function_map_fragment_hd_map.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 9f65ae86e1..8af1c7c7d7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -77,7 +77,7 @@ - + \ No newline at end of file diff --git a/README_shell.md b/README_shell.md index 93e18f30ce..3b344df103 100644 --- a/README_shell.md +++ b/README_shell.md @@ -21,7 +21,7 @@ adb pull /sdcard/Android/data/com.mogo.launcher.f/log/20211022 // 顶部弹窗场景，控制展示 adb shell am broadcast -a com.hmi.v2x.notification --ez v2xIsShow true --es tag "200011" --ei v2xType 20011 --es alertContent "测试外部传入数据" --es ttsContent "测试TTS" // 关闭顶部弹窗 -adb shell am broadcast -a com.hmi.v2x.notification --ez v2xIsShow false --es tag "20008" +adb shell am broadcast -a com.hmi.v2x.notification --ez v2xIsShow false --es tag "200011" // 控制红绿灯 adb shell am broadcast -a com.hmi.v2x.trafficlight --ez trafficLightIsShow true --ei trafficLightCheckType 1 diff --git a/build.gradle b/build.gradle index f1f6003158..c4a19ae4ac 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.5.3' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31' - classpath "com.alibaba:arouter-register:1.0.4-mogo" + classpath "com.alibaba:arouter-register:1.0.8-mogo" classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.4' // classpath "com.bytedance.android.byteX:base-plugin:0.3.0" // classpath "com.mogo.cloud:hook:${HOOK_LOG_VERSION}" diff --git a/config.gradle b/config.gradle index de3ec987ef..cdfefa2a90 100644 --- a/config.gradle +++ b/config.gradle @@ -50,8 +50,8 @@ ext { rxjava : "io.reactivex.rxjava2:rxjava:2.2.2", rxandroid : "io.reactivex.rxjava2:rxandroid:2.1.1", // arouter - arouter : "com.alibaba:arouter-api:1.0.4-mogo", - aroutercompiler : "com.alibaba:arouter-compiler:1.0.4-mogo", + arouter : "com.alibaba:arouter-api:1.0.8-mogo", + aroutercompiler : "com.alibaba:arouter-compiler:1.0.8-mogo", // glide glide : 'com.github.bumptech.glide:glide:4.8.0', glideokhttp3 : 'com.github.bumptech.glide:okhttp3-integration:4.8.0', diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt index e5a20d66a8..9f44cb8aa0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt @@ -10,6 +10,7 @@ import com.mogo.service.IMogoServiceApis import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.notice.NoticeNormalData import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.utilcode.util.SharedPrefs import com.mogo.utils.logger.Logger @@ -23,14 +24,12 @@ class NoticeNormalBroadcastReceiver : BroadcastReceiver() { companion object { private const val TAG = "NoticeNormalBroadcastReceiver" private var mMogoServiceApis: IMogoServiceApis? = null - private var mIMoGoWaringProvider: IMoGoWaringProvider? = null } override fun onReceive(context: Context, intent: Intent) { try { mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS) .navigation(context) as IMogoServiceApis - mIMoGoWaringProvider = mMogoServiceApis!!.waringProviderApi // 分发场景 dispatchShowWaring("11", "官方公告", "测试普通云公告普通云公告普通云公告普通云公告普通云公告普通云公告普通云公告哈哈哈哈哈哈好好", @@ -60,6 +59,6 @@ class NoticeNormalBroadcastReceiver : BroadcastReceiver() { data.videoUrl = videoUrl data.fileType = fileType - mIMoGoWaringProvider!!.showNoticeNormalData(data) + CallerHmiManager.showNoticeNormalData(data) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt index 4d50f4d116..03c9780f2b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt @@ -4,10 +4,10 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.eagle.core.data.constants.MogoServicePaths +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.hmi.WaringConst import com.mogo.service.IMogoServiceApis -import com.mogo.eagle.core.data.constants.MogoServicePaths -import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider import com.mogo.utils.logger.Logger /** @@ -21,14 +21,12 @@ class V2XLimitingVelocityBroadcastReceiver : BroadcastReceiver() { companion object { private const val TAG = "V2XLimitingVelocityBroadcastReceiver" private var mMogoServiceApis: IMogoServiceApis? = null - private var mIMoGoWaringProvider: IMoGoWaringProvider? = null } override fun onReceive(context: Context, intent: Intent) { try { mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS) .navigation(context) as IMogoServiceApis - mIMoGoWaringProvider = mMogoServiceApis!!.waringProviderApi mContext = context val limitingVelocityIsShow = @@ -64,13 +62,13 @@ class V2XLimitingVelocityBroadcastReceiver : BroadcastReceiver() { * @param limitingVelocitySpeed 限速速度 */ private fun dispatchShowWaring(limitingVelocitySpeed: Int) { - mIMoGoWaringProvider!!.showLimitingVelocity(limitingVelocitySpeed) + CallerHmiManager.showLimitingVelocity(limitingVelocitySpeed) } /** * 关闭限速标志 */ private fun dispatchCloseWaring() { - mIMoGoWaringProvider!!.disableLimitingVelocity() + CallerHmiManager.disableLimitingVelocity() } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt index c0b4e2806e..3d6b064735 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt @@ -4,10 +4,10 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.eagle.core.data.constants.MogoServicePaths +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.hmi.WaringConst import com.mogo.service.IMogoServiceApis -import com.mogo.eagle.core.data.constants.MogoServicePaths -import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider import com.mogo.utils.logger.Logger /** @@ -21,14 +21,12 @@ class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() { companion object { private const val TAG = "V2XTrafficLightBroadcastReceiver" private var mMogoServiceApis: IMogoServiceApis? = null - private var mIMoGoWaringProvider: IMoGoWaringProvider? = null } override fun onReceive(context: Context, intent: Intent) { try { mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS) .navigation(context) as IMogoServiceApis - mIMoGoWaringProvider = mMogoServiceApis!!.waringProviderApi mContext = context val trafficLightIsShow = @@ -64,13 +62,13 @@ class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() { * @param trafficLightCheckType 选中的交通的灯 0-都是默认，1-红，2-黄，3-绿 */ private fun dispatchShowWaring(trafficLightCheckType: Int) { - mIMoGoWaringProvider!!.showWarningTrafficLight(trafficLightCheckType) + CallerHmiManager.showWarningTrafficLight(trafficLightCheckType) } /** * 关闭交通灯 */ private fun dispatchCloseWaring() { - mIMoGoWaringProvider!!.disableWarningTrafficLight() + CallerHmiManager.disableWarningTrafficLight() } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt index 67995752df..d5b6f7e4d3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt @@ -4,11 +4,11 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import com.alibaba.android.arouter.launcher.ARouter -import com.mogo.module.common.enums.EventTypeEnum -import com.mogo.eagle.core.function.hmi.WaringConst -import com.mogo.service.IMogoServiceApis import com.mogo.eagle.core.data.constants.MogoServicePaths -import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager +import com.mogo.eagle.core.function.hmi.WaringConst +import com.mogo.module.common.enums.EventTypeEnum +import com.mogo.service.IMogoServiceApis import com.mogo.utils.logger.Logger /** @@ -22,14 +22,12 @@ class V2XWarningBroadcastReceiver : BroadcastReceiver() { companion object { private const val TAG = "V2XWarningBroadcastReceiver" private var mMogoServiceApis: IMogoServiceApis? = null - private var mIMoGoWaringProvider: IMoGoWaringProvider? = null } override fun onReceive(context: Context, intent: Intent) { try { mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS) .navigation(context) as IMogoServiceApis - mIMoGoWaringProvider = mMogoServiceApis!!.waringProviderApi mContext = context val v2xIsShow = intent.getBooleanExtra(WaringConst.BROADCAST_V2X_IS_SHOW_EXTRA_KEY, false) @@ -60,9 +58,7 @@ class V2XWarningBroadcastReceiver : BroadcastReceiver() { * 分发处理关闭场景 */ private fun dispatchCloseWaring(tag: String?) { - mIMoGoWaringProvider!!.disableWarningV2X( - tag - ) + CallerHmiManager.disableWarningV2X(tag) } /** @@ -80,9 +76,9 @@ class V2XWarningBroadcastReceiver : BroadcastReceiver() { tag: String? ) { if (EventTypeEnum.TYPE_USECASE_ID_IVP.poiType == v2xType.toString()) { - mIMoGoWaringProvider!!.showLimitingVelocity(1) + CallerHmiManager.showLimitingVelocity(1) } - mIMoGoWaringProvider!!.showWarningV2X( + CallerHmiManager.showWarningV2X( v2xType, alertContent, ttsContent, diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 470cad6b88..201d6a6851 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -1,18 +1,24 @@ package com.mogo.eagle.core.function.hmi.ui import android.animation.Animator +import android.content.Context import android.text.TextUtils import android.util.Log import android.view.Gravity import android.view.View import android.view.WindowManager import android.view.animation.OvershootInterpolator +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity +import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.data.camera.CameraEntity +import com.mogo.eagle.core.data.constants.MoGoFragmentPaths import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.eagle.core.data.notice.NoticeNormalData import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData +import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager import com.mogo.eagle.core.function.hmi.R @@ -33,20 +39,31 @@ import kotlinx.android.synthetic.main.fragment_hmi.* * @date 2021/8/3 2:40 下午 * 预警图层 */ +@Route(path = MoGoFragmentPaths.PATH_FRAGMENT_HMI) class MoGoHmiFragment : MvpFragment(), - MoGoWarningContract.View { + IMoGoWaringProvider, + MoGoWarningContract.View { private val TAG = "MoGoHmiFragment" - private var mWarningFloat: WarningFloat.Builder? = null private var cameraListView: CameraListView? = null private var cameraViewFloat: WarningFloat.Builder? = null + override fun init(context: Context?) { + Log.d(TAG, "init") + } override fun vipIdentification(visible: Boolean) { flVipIdentificationView.visibility = if (visible) View.VISIBLE else View.GONE } + override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? { + return null + } + + override val functionName: String + get() = TAG + override fun initViews() { ivCameraIcon.setOnClickListener { if (cameraViewFloat == null) { @@ -93,11 +110,11 @@ class MoGoHmiFragment : MvpFragment */ @Synchronized override fun showWarningV2X( - v2xType: Int, - alertContent: String?, - ttsContent: String?, - tag: String?, - listenerIMoGo: IMoGoWarningStatusListener? + v2xType: Int, + alertContent: String?, + ttsContent: String?, + tag: String?, + listenerIMoGo: IMoGoWarningStatusListener? ) { activity?.let { @@ -106,9 +123,9 @@ class MoGoHmiFragment : MvpFragment notificationView.setWarningIcon(EventTypeEnum.getWarningIcon(v2xType.toString())) notificationView.setWarningContent( - alertContent ?: EventTypeEnum.getWarningContent( - v2xType.toString() - ) + alertContent ?: EventTypeEnum.getWarningContent( + v2xType.toString() + ) ) if (mWarningFloat != null && mWarningFloat!!.config.floatTag != tag) { @@ -116,47 +133,47 @@ class MoGoHmiFragment : MvpFragment } mWarningFloat = WarningFloat.with(it) - .setTag(tag) - .setLayout(notificationView) - .setSidePattern(SidePattern.RESULT_RIGHT) - .setCountDownTime(5000) - .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110) - .setImmersionStatusBar(true) - .addWarningStatusListener(listenerIMoGo) - .addWarningStatusListener(object : IMoGoWarningStatusListener { - override fun onShow() { - // 创建弹窗成功才进行TTS播报 - Logger.d( - "MoGoWarningFragment", - "mWarningFloat = $mWarningFloat---ttsContent = $ttsContent" - ) - if (mWarningFloat != null && !TextUtils.isEmpty(ttsContent)) { - Logger.d("MoGoWarningFragment", "---> ttsContent = $ttsContent") - AIAssist.getInstance(activity) - .speakTTSVoice(ttsContent) - } + .setTag(tag) + .setLayout(notificationView) + .setSidePattern(SidePattern.RESULT_TOP) + .setCountDownTime(5000) + .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110) + .setImmersionStatusBar(true) + .addWarningStatusListener(listenerIMoGo) + .addWarningStatusListener(object : IMoGoWarningStatusListener { + override fun onShow() { + // 创建弹窗成功才进行TTS播报 + Logger.d( + "MoGoWarningFragment", + "mWarningFloat = $mWarningFloat---ttsContent = $ttsContent" + ) + if (mWarningFloat != null && !TextUtils.isEmpty(ttsContent)) { + Logger.d("MoGoWarningFragment", "---> ttsContent = $ttsContent") + AIAssist.getInstance(activity) + .speakTTSVoice(ttsContent) + } + } + }) + .setAnimator(object : DefaultAnimator() { + override fun enterAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.enterAnim(view, params, windowManager, sidePattern)?.apply { + interpolator = OvershootInterpolator() } - }) - .setAnimator(object : DefaultAnimator() { - override fun enterAnim( - view: View, - params: WindowManager.LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.enterAnim(view, params, windowManager, sidePattern)?.apply { - interpolator = OvershootInterpolator() - } - override fun exitAnim( - view: View, - params: WindowManager.LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.exitAnim(view, params, windowManager, sidePattern)?.setDuration(200) - }) - .show() + override fun exitAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.exitAnim(view, params, windowManager, sidePattern)?.setDuration(200) + }) + .show() } } @@ -165,7 +182,7 @@ class MoGoHmiFragment : MvpFragment * 关闭指定floatTag 的 VR下V2X预警弹窗 * @param tag 弹窗标识 */ - override fun disableWarningV2X(tag: String) { + override fun disableWarningV2X(tag: String?) { activity?.let { WarningFloat.dismiss(tag) } @@ -252,7 +269,7 @@ class MoGoHmiFragment : MvpFragment * 展示云公告顶部弹窗 * @param trafficStylePushData */ - override fun showNoticeForTrafficWithData(trafficStylePushData: NoticeTrafficStylePushData) { + override fun showNoticeForTrafficWithData(trafficStylePushData: NoticeTrafficStylePushData?) { ThreadUtils.runOnUiThread { activity.let { val noticeBannerView = this.context?.let { it1 -> NoticeBannerView(it1) } @@ -260,58 +277,10 @@ class MoGoHmiFragment : MvpFragment mWarningFloat = it?.let { it1 -> noticeBannerView?.let { it2 -> WarningFloat.with(it1) - .setTag(tag) - .setLayout(it2) - .setSidePattern(SidePattern.TOP) - .setCountDownTime(60 * 1000 * 3) - .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110) - .setImmersionStatusBar(true) - .addWarningStatusListener(null) - .addWarningStatusListener(object : IMoGoWarningStatusListener { - override fun onShow() { - // 创建弹窗成功才进行TTS播报 -// AIAssist.getInstance(activity) -// .speakTTSVoice("") - } - }) - .setAnimator(object : DefaultAnimator() { - override fun enterAnim( - view: View, - params: WindowManager.LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.enterAnim(view, params, windowManager, sidePattern)?.apply { - interpolator = OvershootInterpolator() - } - - override fun exitAnim( - view: View, - params: WindowManager.LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.exitAnim(view, params, windowManager, sidePattern) - ?.setDuration(200) - }) - .show() - } - } - } - } - } - - override fun showNoticeNormalData(normalData: NoticeNormalData) { - activity.let { - val noticeBannerView = this.context?.let { it1 -> NoticeNormalBannerView(it1) } - noticeBannerView?.setPushData(normalData) - mWarningFloat = it?.let { it1 -> - noticeBannerView?.let { it2 -> - WarningFloat.with(it1) .setTag(tag) .setLayout(it2) .setSidePattern(SidePattern.TOP) - .setCountDownTime(10000) + .setCountDownTime(60 * 1000 * 3) .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110) .setImmersionStatusBar(true) .addWarningStatusListener(null) @@ -324,25 +293,74 @@ class MoGoHmiFragment : MvpFragment }) .setAnimator(object : DefaultAnimator() { override fun enterAnim( - view: View, - params: WindowManager.LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern ): Animator? = - super.enterAnim(view, params, windowManager, sidePattern)?.apply { + super.enterAnim(view, params, windowManager, sidePattern) + ?.apply { interpolator = OvershootInterpolator() } override fun exitAnim( - view: View, - params: WindowManager.LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern ): Animator? = - super.exitAnim(view, params, windowManager, sidePattern) - ?.setDuration(200) + super.exitAnim(view, params, windowManager, sidePattern) + ?.setDuration(200) }) .show() + } + } + } + } + } + + override fun showNoticeNormalData(normalData: NoticeNormalData?) { + activity.let { + val noticeBannerView = this.context?.let { it1 -> NoticeNormalBannerView(it1) } + noticeBannerView?.setPushData(normalData) + mWarningFloat = it?.let { it1 -> + noticeBannerView?.let { it2 -> + WarningFloat.with(it1) + .setTag(tag) + .setLayout(it2) + .setSidePattern(SidePattern.TOP) + .setCountDownTime(10000) + .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110) + .setImmersionStatusBar(true) + .addWarningStatusListener(null) + .addWarningStatusListener(object : IMoGoWarningStatusListener { + override fun onShow() { + // 创建弹窗成功才进行TTS播报 +// AIAssist.getInstance(activity) +// .speakTTSVoice("") + } + }) + .setAnimator(object : DefaultAnimator() { + override fun enterAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.enterAnim(view, params, windowManager, sidePattern)?.apply { + interpolator = OvershootInterpolator() + } + + override fun exitAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.exitAnim(view, params, windowManager, sidePattern) + ?.setDuration(200) + }) + .show() } } } @@ -368,40 +386,40 @@ class MoGoHmiFragment : MvpFragment } }) cameraViewFloat = WarningFloat.with(it) - .setTag("CameraListFloat") - .setLayout(cameraListView!!) - .setSidePattern(SidePattern.RIGHT) - .setLocation(1742, 280) - .setImmersionStatusBar(true) - .setAnimator(object : DefaultAnimator() { - override fun enterAnim( - view: View, - params: WindowManager.LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.enterAnim(view, params, windowManager, sidePattern) - ?.apply { - interpolator = OvershootInterpolator() - } + .setTag("CameraListFloat") + .setLayout(cameraListView!!) + .setSidePattern(SidePattern.RIGHT) + .setLocation(1742, 280) + .setImmersionStatusBar(true) + .setAnimator(object : DefaultAnimator() { + override fun enterAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.enterAnim(view, params, windowManager, sidePattern) + ?.apply { + interpolator = OvershootInterpolator() + } - override fun exitAnim( - view: View, - params: WindowManager.LayoutParams, - windowManager: WindowManager, - sidePattern: SidePattern - ): Animator? = - super.exitAnim(view, params, windowManager, sidePattern) - ?.setDuration(200) - }) - .addWarningStatusListener(object : IMoGoWarningStatusListener { - override fun onDismiss() { - cameraViewFloat = null - cameraListView = null - ivCameraIcon.setBackgroundResource(R.drawable.icon_camera_nor) - } - }) - .show() + override fun exitAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.exitAnim(view, params, windowManager, sidePattern) + ?.setDuration(200) + }) + .addWarningStatusListener(object : IMoGoWarningStatusListener { + override fun onDismiss() { + cameraViewFloat = null + cameraListView = null + ivCameraIcon.setBackgroundResource(R.drawable.icon_camera_nor) + } + }) + .show() } else { cameraViewFloat?.show() } @@ -421,4 +439,5 @@ class MoGoHmiFragment : MvpFragment Log.d(TAG, "onDestroy") } + } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoWarningContract.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoWarningContract.kt index 1b4387a64e..b9916ef0da 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoWarningContract.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoWarningContract.kt @@ -15,128 +15,5 @@ interface MoGoWarningContract { interface View : IView { - /** - * 隐藏 脉速表 - * @param visibility View.VISIBLE, View.INVISIBLE,View.GONE - */ - fun setSpeedChartViewVisibility(visibility: Int) - - /** - * 隐藏 自动驾驶触发 按钮 - * @param visibility View.VISIBLE, View.INVISIBLE,View.GONE - */ - fun setAutopilotStatusViewVisibility(visibility: Int) - - /** - * 隐藏 切换视角 按钮 - * @param visibility View.VISIBLE, View.INVISIBLE,View.GONE - */ - fun setPerspectiveSwitchViewVisibility(visibility: Int) - - /** - * 隐藏 检测状态 按钮 - * @param visibility View.VISIBLE, View.INVISIBLE,View.GONE - */ - fun setCheckStatusViewVisibility(visibility: Int) - - /** - * 展示VR下V2X预警 - * - * @param v2xType V2X类型 - * @param alertContent 提醒文本 - * @param ttsContent tts语音播报消息 - * @param tag tag绑定弹窗的标志 - */ - fun showWarningV2X( - v2xType: Int, - alertContent: String?, - ttsContent: String?, - tag: String?, - listenerIMoGo: IMoGoWarningStatusListener? - ) - - /** - * 关闭指定floatTag 的 VR下V2X预警弹窗 - * @param tag 弹窗标识 - */ - fun disableWarningV2X(tag: String) - - /** - * 展示红绿灯预警 - * - * @param checkLightId 0-都是默认，1-红，2-黄，3-绿 - */ - fun showWarningTrafficLight(checkLightId: Int) - - /** - * 关闭红绿灯预警 - */ - fun disableWarningTrafficLight() - - /** - * 修改红灯倒计时 - */ - fun changeCountdownRed(redNum: Int) - - /** - * 修改黄灯倒计时 - */ - fun changeCountdownYellow(yellowNum: Int) - - /** - * 修改绿灯倒计时 - */ - fun changeCountdownGreen(greenNum: Int) - - /** - * @param readNum 红灯倒计时 - * @param yellowNum 黄灯倒计时 - * @param greenNum 绿灯倒计时 - */ - fun changeCountdownTrafficLightNum(readNum: Int, yellowNum: Int, greenNum: Int) - - /** - * 展示限速预警 - * - * @param limitingSpeed 限速速度 - */ - fun showLimitingVelocity(limitingSpeed: Int) - - /** - * 关闭限速预警 - */ - fun disableLimitingVelocity() - - /** - * 展示指定方位上的红框预警 - * @param direction - * @see WarningDirectionEnum - */ - fun showWarning(direction: WarningDirectionEnum) - - /** - * 展示指定方位上的红框预警 - * @param direction - * @see WarningDirectionEnum - * @param closeTime 倒计时 - */ - fun showWarning(direction: WarningDirectionEnum, closeTime: Long) - - /** - * 展示云公告顶部弹窗 - * @param trafficStylePushData - */ - fun showNoticeForTrafficWithData(trafficStylePushData: NoticeTrafficStylePushData) - - /** - * 展示普通云公告 - * @param normalData - */ - fun showNoticeNormalData(normalData: NoticeNormalData) - - /** - * 展示VIP标识 - */ - fun vipIdentification(visible: Boolean) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MoGoHDMapFragment.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MoGoHDMapFragment.java deleted file mode 100644 index 75861a56ec..0000000000 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MoGoHDMapFragment.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.mogo.eagle.core.function.map; - -import androidx.annotation.NonNull; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.commons.mvp.MvpFragment; -import com.mogo.eagle.core.data.constants.MoGoFragmentPaths; -import com.mogo.utils.logger.Logger; - -/** - * @author donghongyu - * @since 2021-11-09 - * 高精度地图层UI - */ -@Route(path = MoGoFragmentPaths.PATH_FRAGMENT_MAP) -public class MoGoHDMapFragment extends MvpFragment implements MoGoMapView { - - private static final String TAG = "MoGoHDMapFragment"; - - @Override - protected int getLayoutId() { - return R.layout.function_map_fragment_hd_map; - } - - @Override - public String getTagName() { - return TAG; - } - - @Override - protected void initViews() { - Logger.d(TAG, "initViews"); - } - - @NonNull - @Override - protected MoGoMapPresenter createPresenter() { - return new MoGoMapPresenter(this); - } - -} diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MoGoMapPresenter.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MoGoMapPresenter.java deleted file mode 100644 index 9b95c75073..0000000000 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MoGoMapPresenter.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.mogo.eagle.core.function.map; - -import com.mogo.commons.mvp.Presenter; - -public class MoGoMapPresenter extends Presenter { - public MoGoMapPresenter(MoGoMapView view) { - super(view); - } -} diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MoGoMapView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MoGoMapView.java deleted file mode 100644 index e8a3f18706..0000000000 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MoGoMapView.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.mogo.eagle.core.function.map; - -import com.mogo.commons.mvp.IView; - -public interface MoGoMapView extends IView { -} diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/function_map_fragment_hd_map.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/function_map_fragment_hd_map.xml deleted file mode 100644 index 7a8bfb151f..0000000000 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/function_map_fragment_hd_map.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java index 36a70d0ea6..19b9c5924a 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java @@ -64,7 +64,7 @@ class NoticeSocketManager { return; } - CallerHmiManager.INSTANCE.showNormalBanner(obj); + CallerHmiManager.INSTANCE.showNoticeNormalData(obj); } }; diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt index 5a5d9d3ed1..19a35df550 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.call.hmi -import com.mogo.eagle.core.data.constants.MogoServicePaths +import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.eagle.core.data.constants.MoGoFragmentPaths import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.eagle.core.data.notice.NoticeNormalData import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData @@ -16,7 +17,7 @@ import com.mogo.eagle.core.function.call.base.CallerBase */ object CallerHmiManager : CallerBase() { private val waringProviderApi: IMoGoWaringProvider - get() = getApiInstance(IMoGoWaringProvider::class.java, MogoServicePaths.PATH_HMI) + get() = ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_HMI).navigation() as IMoGoWaringProvider; /** * 隐藏 脉速表 @@ -170,14 +171,14 @@ object CallerHmiManager : CallerBase() { * 普通公告弹窗 * */ - fun showNormalBanner(noticeNormal: NoticeNormalData) { + fun showNoticeNormalData(noticeNormal: NoticeNormalData) { waringProviderApi.showNoticeNormalData(noticeNormal) } /** * 展示VIP标识 */ - fun vipIdentification(visible: Boolean){ + fun vipIdentification(visible: Boolean) { waringProviderApi.vipIdentification(visible) } 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 eaba111a0c..670de4bf4e 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 @@ -96,16 +96,6 @@ public class MainActivity extends MvpActivity implement @Override protected void beforeSetContentView(Bundle savedInstanceState) { init(); - installSkinManager(savedInstanceState); - } - - /** - * 安装皮肤支持 - * - * @param savedInstanceState - */ - private void installSkinManager(Bundle savedInstanceState) { - mServiceApis.getMapServiceApi().getMapViewInstanceHandler().createMapViewInstance(this); } @Override @@ -208,7 +198,7 @@ public class MainActivity extends MvpActivity implement loadOthersModules(); Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms"); }); - MogoModulesManager.getInstance().loadMapModule(R.id.module_main_id_map_fragment_container); + loadFunctionMapView(); } else { loadOthersModules(); } @@ -243,8 +233,8 @@ public class MainActivity extends MvpActivity implement * 加载其它模块 */ protected void loadOthersModules() { - //loadFunctionFragment(); // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。 + loadFunctionFragment(); loadContainerModules(); MogoModulesManager.getInstance().loadModules(); MogoModulesManager.getInstance().loadFunctionModules(); @@ -270,9 +260,9 @@ public class MainActivity extends MvpActivity implement } protected void loadContainerModules() { + //MogoModulesManager.getInstance().loadWaringModule(R.id.module_main_id_waring_fragment); MogoModulesManager.getInstance().loadEntrancesModule(R.id.module_main_id_entrance_fragment_container); MogoModulesManager.getInstance().loadEventPanelModule(R.id.module_main_id_event_panel_fragment_container); - MogoModulesManager.getInstance().loadWaringModule(R.id.module_main_id_waring_fragment); } @Override @@ -284,8 +274,17 @@ public class MainActivity extends MvpActivity implement @Override public void loadFunctionFragment() { + // 加载 HMI 框架 + MvpFragment fragmentHdMap = (MvpFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_HMI).navigation(); + addFragment(fragmentHdMap, fragmentHdMap.getTagName(), R.id.module_main_id_waring_fragment); + } + + /** + * 加载地图视图 + */ + private void loadFunctionMapView() { MvpFragment fragmentHdMap = (MvpFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_MAP).navigation(); - addFragment(fragmentHdMap, fragmentHdMap.getTagName(), R.id.module_main_id_hd_map_fragment_container); + addFragment(fragmentHdMap, fragmentHdMap.getTagName(), R.id.module_main_id_map_fragment_container); } @NonNull @@ -399,7 +398,6 @@ public class MainActivity extends MvpActivity implement mMogoFragmentManager.unregisterMainFragmentStackTransactionListener(); mMogoFragmentManager.destroy(); mMogoFragmentManager = null; - mServiceApis.getMapServiceApi().getMapViewInstanceHandler().destroy(); mServiceApis.getMapServiceApi().getMapUIController().destroy(); AdasConfigApiController.getInstance().release(); mServiceApis.getAdasControllerApi().release(); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java index e863e1dbda..d045388074 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java @@ -27,13 +27,6 @@ public interface MogoModulesHandler { */ void loadFunctionModulesServer(); - /** - * 加载地图 - * - * @param containerId 容器id - */ - void loadMapModule(int containerId); - /** * 加载所有应用 * @@ -56,12 +49,6 @@ public interface MogoModulesHandler { */ void loadBaseModule(); - /** - * 加载预警面板 - * - * @param containerId - */ - void loadWaringModule(int containerId); /** * 加载事件面板 diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 1b20508bff..1f0e05417f 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -9,13 +9,12 @@ import com.alibaba.android.arouter.facade.template.IProvider; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider; +import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; import com.mogo.module.main.MainActivity; -import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.module.IMogoModuleProvider; -import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; import com.mogo.utils.logger.Logger; import java.util.Collection; @@ -129,14 +128,6 @@ public class MogoModulesManager implements MogoModulesHandler { } } - @Override - public void loadMapModule( int containerId ) { - Logger.d( TAG, "loadMapModule" ); - IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance() - .build( MogoModulePaths.PATH_MODULE_MAP ) - .navigation( getContext() ); - addFragment( provider, containerId ); - } @Override public void loadAppsListModule( int containerId ) { @@ -172,14 +163,6 @@ public class MogoModulesManager implements MogoModulesHandler { } } - @Override - public void loadWaringModule(int containerId) { - IMoGoFunctionProvider provider = ( IMoGoFunctionProvider ) ARouter.getInstance() - .build( MogoServicePaths.PATH_HMI) - .navigation( getContext() ); - addFragment( provider, containerId ); - } - private IProvider loadBaseProvider(String path ) { try { @@ -236,23 +219,6 @@ public class MogoModulesManager implements MogoModulesHandler { .commitAllowingStateLoss(); } - private void addFragment( IMoGoFunctionProvider provider, int containerId ) { - if ( provider == null ) { - Logger.e( TAG, "add fragment fail cause provider == null, container is %s", ResourcesHelper.getResNameById( getApplicationContext(), containerId ) ); - return; - } - Fragment fragment = mActivity.getSupportFragmentManager().findFragmentByTag( provider.getFunctionName() ); - if ( fragment == null ) { - fragment = provider.createCoverage( mActivity, null ); - } - if ( fragment == null ) { - Logger.e( TAG, "add fragment fail cause fragment == null, container is %s", ResourcesHelper.getResNameById( getApplicationContext(), containerId ) ); - return; - } - mActivity.getSupportFragmentManager().beginTransaction() - .replace( containerId, fragment, provider.getFunctionName() ) - .commitAllowingStateLoss(); - } @Override public void onDestroy() { diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index 2717e7ecf2..066073f5d0 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -13,12 +13,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - - - * 地图图层，地图操作都在这个图层完成 */ +@Route(path = MoGoFragmentPaths.PATH_FRAGMENT_MAP) public class MapFragment extends MvpFragment< MapView, MapPresenter > implements MapView, IMogoMapFrameController { private static final String TAG = "MapFragment"; diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragmentProvider.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragmentProvider.java index c0041f3830..e126f1e32a 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragmentProvider.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragmentProvider.java @@ -28,9 +28,7 @@ public class MapFragmentProvider implements IMogoModuleProvider { @Override public Fragment createFragment( Context context, Bundle data ) { - MapFragment mMapFragment = new MapFragment(); - mMapFragment.setArguments( data ); - return mMapFragment; + return null; } @NonNull diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java index 747fa4c934..4c0d642e96 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java @@ -285,9 +285,5 @@ public interface IMogoServiceApis extends IProvider { */ IV2XProvider getV2XListenerManager(); - /** - * warning 模块 - */ - IMoGoWaringProvider getWaringProviderApi(); } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoMapFrameController.java b/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoMapFrameController.java index 6bc08593b5..696221d40a 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoMapFrameController.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoMapFrameController.java @@ -3,16 +3,15 @@ package com.mogo.service.map; import com.alibaba.android.arouter.facade.template.IProvider; import com.mogo.map.IDestroyable; -public /** * @author congtaowang * @since 2020/10/23 - * + *

* 地图图层切换：高德地图 <-> 自研地图，过渡期使用 */ -interface IMogoMapFrameController extends IProvider, IDestroyable { +public interface IMogoMapFrameController extends IProvider, IDestroyable { - void initDelegate( IMogoMapFrameController controller ); + void initDelegate(IMogoMapFrameController controller); /** * 切换到高德2D diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoMapService.java b/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoMapService.java index b2728c24ae..ed14869225 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoMapService.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoMapService.java @@ -3,18 +3,13 @@ package com.mogo.service.map; import android.content.Context; import com.alibaba.android.arouter.facade.template.IProvider; -import com.mogo.map.CoordinatesTransformer; -import com.mogo.map.IMogoMapViewInstanceHandler; import com.mogo.map.listener.IMogoHosListenerRegister; import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.navi.IMogoAimless; import com.mogo.map.navi.IMogoNavi; import com.mogo.map.overlay.IMogoOverlayManager; -import com.mogo.map.search.drive.IMogoRoadSearch; import com.mogo.map.search.geo.IMogoGeoSearch; -import com.mogo.map.search.inputtips.IMogoInputtipsSearch; -import com.mogo.map.search.inputtips.query.MogoInputtipsQuery; import com.mogo.map.search.poisearch.IMogoPoiSearch; import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.map.search.traffic.IMogoTrafficSearch; @@ -45,15 +40,6 @@ public interface IMogoMapService extends IProvider { @Deprecated IMogoLocationClient getLocationClient( Context context ); - /** - * 获取关键字搜索地址服务 - * - * @param context - * @param query - * @return - */ - IMogoInputtipsSearch getInputtipsSearch( Context context, MogoInputtipsQuery query ); - /** * 地理编码或逆地理编码服务 * @@ -117,20 +103,6 @@ public interface IMogoMapService extends IProvider { */ IMogoOverlayManager getOverlayManager( Context context ); - /** - * 路线搜索 - * - * @return - */ - IMogoRoadSearch getRoadSearchApi(); - - /** - * 地图实例 - * - * @return - */ - IMogoMapViewInstanceHandler getMapViewInstanceHandler(); - /** * 交通态势查询 * @@ -138,13 +110,6 @@ public interface IMogoMapService extends IProvider { */ IMogoTrafficSearch getTrafficSearchApi(); - /** - * 坐标转换工具 - * - * @return - */ - CoordinatesTransformer getCoordinatesTransformer(); - /** * 获取地图版本号 * @return diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java index 0af6580b7f..c6012d7cb0 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java @@ -6,7 +6,6 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.template.IProvider; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.eagle.core.data.constants.MogoServicePaths; -import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider; import com.mogo.service.IMogoServiceApis; import com.mogo.service.adas.IMogoADASController; import com.mogo.service.analytics.IMogoAnalytics; @@ -236,11 +235,6 @@ public class MogoServiceApis implements IMogoServiceApis { return getApiInstance(IV2XProvider.class, MogoServicePaths.PATH_V2X_FRONT_CRASH_WARNING); } - @Override - public IMoGoWaringProvider getWaringProviderApi() { - return getApiInstance(IMoGoWaringProvider.class, MogoServicePaths.PATH_HMI); - } - @Override public IMogoTrafficUploadProvider getTrafficUploadApi() { return getApiInstance(IMogoTrafficUploadProvider.class, MogoServicePaths.PATH_TRAFFIC_UPLOAD); diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java b/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java index 6142e8101b..653b324caa 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java @@ -3,21 +3,16 @@ package com.mogo.service.impl.map; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.map.CoordinatesTransformer; -import com.mogo.map.IMogoMapViewInstanceHandler; +import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.map.MogoAimless; -import com.mogo.map.MogoCoordinatesTransformer; import com.mogo.map.MogoGeoSearch; -import com.mogo.map.MogoInputtipsSearch; import com.mogo.map.MogoLocationClient; import com.mogo.map.MogoMap; import com.mogo.map.MogoMapUIController; -import com.mogo.map.MogoMapViewInstanceHandler; import com.mogo.map.MogoMarkerManager; import com.mogo.map.MogoNavi; import com.mogo.map.MogoOverlayManager; import com.mogo.map.MogoPoiSearch; -import com.mogo.map.MogoRoadSearch; import com.mogo.map.MogoTrafficSearch; import com.mogo.map.listener.IMogoHosListenerRegister; import com.mogo.map.listener.MogoHosListenerRegister; @@ -26,15 +21,11 @@ import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.navi.IMogoAimless; import com.mogo.map.navi.IMogoNavi; import com.mogo.map.overlay.IMogoOverlayManager; -import com.mogo.map.search.drive.IMogoRoadSearch; import com.mogo.map.search.geo.IMogoGeoSearch; -import com.mogo.map.search.inputtips.IMogoInputtipsSearch; -import com.mogo.map.search.inputtips.query.MogoInputtipsQuery; import com.mogo.map.search.poisearch.IMogoPoiSearch; import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.map.search.traffic.IMogoTrafficSearch; import com.mogo.map.uicontroller.IMogoMapUIController; -import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.map.IMogoMapService; /** @@ -43,47 +34,42 @@ import com.mogo.service.map.IMogoMapService; *

* 地图对外地接口 */ -@Route( path = MogoServicePaths.PATH_SERVICES_MAP ) +@Route(path = MogoServicePaths.PATH_SERVICES_MAP) public class MogoMapService implements IMogoMapService { @Override - public IMogoLocationClient getSingletonLocationClient( Context context ) { - return MogoLocationClient.getInstance( context ); + public IMogoLocationClient getSingletonLocationClient(Context context) { + return MogoLocationClient.getInstance(context); } @Override - public IMogoLocationClient getLocationClient( Context context ) { - return new MogoLocationClient( context ); + public IMogoLocationClient getLocationClient(Context context) { + return new MogoLocationClient(context); } @Override - public IMogoInputtipsSearch getInputtipsSearch( Context context, MogoInputtipsQuery query ) { - return new MogoInputtipsSearch( context, query ); + public IMogoGeoSearch getGeoSearch(Context context) { + return new MogoGeoSearch(context); } @Override - public IMogoGeoSearch getGeoSearch( Context context ) { - return new MogoGeoSearch( context ); + public IMogoPoiSearch getPoiSearch(Context context, MogoPoiSearchQuery query) { + return new MogoPoiSearch(context, query); } @Override - public IMogoPoiSearch getPoiSearch( Context context, MogoPoiSearchQuery query ) { - return new MogoPoiSearch( context, query ); + public IMogoNavi getNavi(Context context) { + return MogoNavi.getInstance(context); } @Override - public IMogoNavi getNavi( Context context ) { - return MogoNavi.getInstance( context ); + public IMogoAimless getAimless(Context context) { + return MogoAimless.getInstance(context); } @Override - public IMogoAimless getAimless( Context context ) { - return MogoAimless.getInstance( context ); - } - - @Override - public IMogoMarkerManager getMarkerManager( Context context ) { - return MogoMarkerManager.getInstance( context ); + public IMogoMarkerManager getMarkerManager(Context context) { + return MogoMarkerManager.getInstance(context); } @Override @@ -97,30 +83,15 @@ public class MogoMapService implements IMogoMapService { } @Override - public IMogoOverlayManager getOverlayManager( Context context ) { + public IMogoOverlayManager getOverlayManager(Context context) { return MogoOverlayManager.getInstance(); } - @Override - public IMogoRoadSearch getRoadSearchApi() { - return new MogoRoadSearch(); - } - - @Override - public IMogoMapViewInstanceHandler getMapViewInstanceHandler() { - return MogoMapViewInstanceHandler.getInstance(); - } - @Override public IMogoTrafficSearch getTrafficSearchApi() { return new MogoTrafficSearch(); } - @Override - public CoordinatesTransformer getCoordinatesTransformer() { - return MogoCoordinatesTransformer.getInstance(); - } - @Override public String getMapVersion() { if (MogoMap.getInstance().getMogoMap() != null) { @@ -131,7 +102,7 @@ public class MogoMapService implements IMogoMapService { } @Override - public void init( Context context ) { + public void init(Context context) { } }