增加OBU状态管理

增加Debug调试页面

Signed-off-by: 董宏宇 <martindhy@gmail.com>
This commit is contained in:
董宏宇
2021-09-30 20:49:04 +08:00
parent 0170a7a11c
commit f3ee6c8795
18 changed files with 207 additions and 48 deletions

View File

@@ -4,7 +4,7 @@ import android.content.Context
import android.view.View
import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern
import com.mogo.eagle.core.function.hmi.notification.interfaces.OnFloatAnimator
import com.mogo.eagle.core.function.api.hmi.warning.WarningStatusListener
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
import com.mogo.utils.WindowUtils
import com.mogo.utils.logger.Logger
@@ -138,12 +138,12 @@ class WarningFloat {
/**
* 设置视图状态监听showdismiss
* @param listener 设置视图状态监听
* @param listenerIMoGo 设置视图状态监听
*/
fun addWarningStatusListener(listener: WarningStatusListener?) =
fun addWarningStatusListener(listenerIMoGo: IMoGoWarningStatusListener?) =
apply {
if (listener != null) {
config.statusListenerMap.add(listener)
if (listenerIMoGo != null) {
config.statusListenerMapIMoGo.add(listenerIMoGo)
}
}

View File

@@ -134,7 +134,7 @@ internal class WarningFloatWindowHelper(
* 入场动画
*/
private fun enterAnim(floatingView: View) {
config.statusListenerMap.forEach { listener ->
config.statusListenerMapIMoGo.forEach { listener ->
listener.onShow()
}
if (frameLayout == null || config.isAnim) return
@@ -175,7 +175,7 @@ internal class WarningFloatWindowHelper(
* 退出动画
*/
fun exitAnim() {
config.statusListenerMap.forEach { listener ->
config.statusListenerMapIMoGo.forEach { listener ->
listener.onDismiss()
}
if (frameLayout == null || (config.isAnim && enterAnimator == null)) return

View File

@@ -6,7 +6,7 @@ import com.mogo.eagle.core.function.hmi.notification.enums.ShowPattern
import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern
import com.mogo.eagle.core.function.hmi.notification.interfaces.OnFloatAnimator
import com.mogo.eagle.core.function.hmi.notification.interfaces.OnFloatCallbacks
import com.mogo.eagle.core.function.api.hmi.warning.WarningStatusListener
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
/**
* @author xiaoyuzhou
@@ -54,7 +54,7 @@ data class WarningNotificationConfig(
var floatAnimator: OnFloatAnimator? = DefaultAnimator(),
// 设置视图状态监听showdismiss
var statusListenerMap: ArrayList< WarningStatusListener> = ArrayList(),
var statusListenerMapIMoGo: ArrayList< IMoGoWarningStatusListener> = ArrayList(),
// Callbacks
var callbacks: OnFloatCallbacks? = null,

View File

@@ -14,7 +14,7 @@ import com.mogo.eagle.core.function.hmi.notification.WarningFloat
import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator
import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern
import com.mogo.eagle.core.function.hmi.ui.widget.V2XNotificationView
import com.mogo.eagle.core.function.api.hmi.warning.WarningStatusListener
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
import com.mogo.eagle.core.function.hmi.R
import com.mogo.utils.logger.Logger
import kotlinx.android.synthetic.main.fragment_hmi.*
@@ -55,7 +55,7 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
alertContent: String?,
ttsContent: String?,
tag: String?,
listener: WarningStatusListener?
listenerIMoGo: IMoGoWarningStatusListener?
) {
activity?.let {
@@ -80,8 +80,8 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
.setCountDownTime(10000)
.setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
.setImmersionStatusBar(true)
.addWarningStatusListener(listener)
.addWarningStatusListener(object : WarningStatusListener {
.addWarningStatusListener(listenerIMoGo)
.addWarningStatusListener(object : IMoGoWarningStatusListener {
override fun onShow() {
// 创建弹窗成功才进行TTS播报
Logger.d(

View File

@@ -2,7 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui
import com.mogo.commons.mvp.IView
import com.mogo.eagle.core.data.enums.WarningDirectionEnum
import com.mogo.eagle.core.function.api.hmi.warning.WarningStatusListener
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
/**
@@ -26,7 +26,7 @@ interface MoGoWarningContract {
alertContent: String?,
ttsContent: String?,
tag: String?,
listener: WarningStatusListener?
listenerIMoGo: IMoGoWarningStatusListener?
)
/**

View File

@@ -0,0 +1,11 @@
package com.mogo.eagle.core.function.hmi.ui.setting;
/**
* @author xiaoyuzhou
* @date 2021/9/30 8:46 下午
* 调试使用的设置页面,这里制作为调试使用
* 展示 本机、网络、工控机、OBU等状态信息支持设置IP等参数进行调试
*/
public class DebugSettingView {
}

View File

@@ -8,7 +8,7 @@ import android.util.Log
import androidx.fragment.app.Fragment
import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.eagle.core.function.hmi.WaringConst
import com.mogo.eagle.core.function.api.hmi.warning.WarningStatusListener
import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
import com.mogo.eagle.core.data.enums.WarningDirectionEnum
import com.mogo.service.MogoServicePaths
import com.mogo.utils.logger.Logger
@@ -72,9 +72,9 @@ class MoGoWarningProvider : IMoGoWaringProvider {
override fun showWarningV2X(
v2xType: Int, alertContent: String?,
ttsContent: String?, tag: String?,
listener: WarningStatusListener?
listenerIMoGo: IMoGoWarningStatusListener?
) {
mMoGoHmiFragment?.showWarningV2X(v2xType, alertContent, ttsContent, tag, listener)
mMoGoHmiFragment?.showWarningV2X(v2xType, alertContent, ttsContent, tag, listenerIMoGo)
}
override fun disableWarningV2X(tag: String?) {