diff --git a/.idea/misc.xml b/.idea/misc.xml index 6ab4c2b9b9..a23bcffaa7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -16,7 +16,7 @@ - + diff --git a/ZD_README/README_VersionHistory.md b/ZD_README/README_VersionHistory.md index eacbb71aea..54fd2203a4 100644 --- a/ZD_README/README_VersionHistory.md +++ b/ZD_README/README_VersionHistory.md @@ -1,7 +1,7 @@ ### 鹰眼 (MOGO-Autopilot) 平台接入说明 ```gradle // 新版本架构SDK -MOGO_CORE_SDK_VERSION = 0.0.6 +MOGO_CORE_SDK_VERSION = 0.0.9 // 所有UI展示层 com.mogo.eagle.core.function.impl:hmi:${MOGO_CORE_SDK_VERSION} @@ -37,7 +37,7 @@ com.mogo.eagle.core:network:${MOGO_CORE_SDK_VERSION} ```gradle -MOGO_COMMONS_VERSION = 2.0.63 +MOGO_COMMONS_VERSION = 2.0.66 tanluupload : "com.mogo.module:module-tanlu-upload:${MOGO_COMMONS_VERSION}", // modules moduleshare : "com.mogo.module:module-share:${MOGO_COMMONS_VERSION}", diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 18a2e0beb1..4b472ca25b 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -17,6 +17,7 @@ import com.mogo.commons.constants.SharedPrefsConstants; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.network.Utils; import com.mogo.eagle.core.data.config.FunctionBuildConfig; +import com.mogo.eagle.core.data.config.HmiBuildConfig; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.map.MapApiPath; import com.mogo.eagle.core.data.map.MogoLocation; @@ -102,6 +103,12 @@ public class MogoApplication extends AbsMogoApplication { FunctionBuildConfig.gpsProvider = BuildConfig.GPS_PROVIDER; // 配置BuglyAppID CrashReportConstants.buglyAppID = "ac71228f85"; + + /* // TODO 这里是演示代码使用，控制HMI展示元素 + HmiBuildConfig.isShowSpeedView = false; + HmiBuildConfig.isShowAutopilotStatusView = false; + HmiBuildConfig.isShowPerspectiveSwitchView = false; + HmiBuildConfig.isShowCheckStatusView = false;*/ } @Override 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 902350821b..377b83626b 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 @@ -14,6 +14,7 @@ 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.config.HmiBuildConfig import com.mogo.eagle.core.data.constants.MoGoFragmentPaths import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.eagle.core.data.notice.NoticeNormalData @@ -73,6 +74,7 @@ class MoGoHmiFragment : MvpFragment get() = TAG override fun initViews() { + initViewShowWithConfig() ivCameraIcon.setOnClickListener { if (cameraViewFloat == null) { showCameraList(CallerMonitorManager.getCameraList()) @@ -80,6 +82,40 @@ class MoGoHmiFragment : MvpFragment } } + /** + * 根据配置文件初始化视图显示 + */ + private fun initViewShowWithConfig() { + // 控制 速度 展示 + if (HmiBuildConfig.isShowSpeedView) { + setSpeedChartViewVisibility(View.VISIBLE) + } else { + setSpeedChartViewVisibility(View.GONE) + } + + // 控制 自动驾驶状态 展示 + if (HmiBuildConfig.isShowAutopilotStatusView) { + setAutopilotStatusViewVisibility(View.VISIBLE) + } else { + setAutopilotStatusViewVisibility(View.GONE) + } + + // 控制 切换视角 展示 + if (HmiBuildConfig.isShowPerspectiveSwitchView) { + setPerspectiveSwitchViewVisibility(View.VISIBLE) + } else { + setPerspectiveSwitchViewVisibility(View.GONE) + } + + // 控制 切换视角 展示 + if (HmiBuildConfig.isShowCheckStatusView) { + setCheckStatusViewVisibility(View.VISIBLE) + } else { + setCheckStatusViewVisibility(View.GONE) + } + + } + override fun getLayoutId(): Int { return R.layout.fragment_hmi } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt index 85d64290c0..c874d93181 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt @@ -21,10 +21,8 @@ import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern import com.mogo.eagle.core.function.hmi.ui.setting.DebugSettingView import com.mogo.map.navi.IMogoCarLocationChangedListener2 import com.mogo.service.IMogoServiceApis -import com.mogo.service.statusmanager.IMogoStatusChangedListener import com.mogo.service.statusmanager.StatusDescriptor import com.mogo.utils.UiThreadHandler -import com.mogo.utils.logger.Logger import java.util.* /** @@ -36,8 +34,7 @@ class SpeedPanelView @JvmOverloads constructor( attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) : FrameLayout(context, attrs, defStyleAttr), - IMogoCarLocationChangedListener2, - IMogoStatusChangedListener { + IMogoCarLocationChangedListener2 { val TAG = "SpeedPanelView" private var mMogoServiceApis: IMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS) @@ -132,9 +129,6 @@ class SpeedPanelView @JvmOverloads constructor( // 注册位置回调 mMogoServiceApis.registerCenterApi .registerCarLocationChangedListener(TAG, this) - // 注册VR模式回调 - mMogoServiceApis.statusManagerApi - .registerStatusChangedListener(TAG, StatusDescriptor.VR_MODE, this) // 开启定时查询速度 Timer().schedule(timerTask, Date(), 100) @@ -145,8 +139,6 @@ class SpeedPanelView @JvmOverloads constructor( // 解除注册 mMogoServiceApis.registerCenterApi .unregisterMogoLocationListener(TAG) - mMogoServiceApis.statusManagerApi - .unregisterStatusChangedListener(TAG, StatusDescriptor.VR_MODE, this) try { timerTask.cancel() } catch (e: Exception) { @@ -169,19 +161,4 @@ class SpeedPanelView @JvmOverloads constructor( // } } - override fun onStatusChanged(descriptor: StatusDescriptor?, isTrue: Boolean) { - UiThreadHandler.post { - if (descriptor == StatusDescriptor.VR_MODE) { - try { - visibility = if (isTrue) { - View.VISIBLE - } else { - View.GONE - } - } catch (e: Exception) { - e.printStackTrace() - } - } - } - } } \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt new file mode 100644 index 0000000000..37462ef62c --- /dev/null +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt @@ -0,0 +1,32 @@ +package com.mogo.eagle.core.data.config + +/** + * @author xiaoyuzhou + * @date 2021/8/24 8:59 下午 + * 配置 HMI 展示元素 + */ +object HmiBuildConfig { + /** + * 是否展示 速度 + */ + @JvmField + var isShowSpeedView = true + + /** + * 是否展示 自动驾驶 按钮 + */ + @JvmField + var isShowAutopilotStatusView = true + + /** + * 是否展示 切换视角 按钮 + */ + @JvmField + var isShowPerspectiveSwitchView = true + + /** + * 是否展示 检测状态 按钮 + */ + @JvmField + var isShowCheckStatusView = true +} \ No newline at end of file