yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0

Browse Source 
# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt
This commit is contained in:
donghongyu
2023-02-01 19:41:41 +08:00
parent acd1b3b584 8be6c14004
commit fdecd41783
206 changed files with 3587 additions and 2293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoChassisLamplightListener.kt
View File

@@ -11,7 +11,7 @@ interface IMoGoChassisLamplightListener {
* 车辆转向灯 数据
* @param lightSwitch
*/
fun onAutopilotLightSwitchData(lightSwitch: Chassis.LightSwitch?)
fun onAutopilotLightSwitchData(lightSwitch: Chassis.LightSwitch?){}
/**
* 车辆刹车灯 数据

2
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoChassisLocationWGS84Listener.kt
View File

@@ -14,5 +14,5 @@ interface IMoGoChassisLocationWGS84Listener {
*
* @param gnssInfo
*/
fun onChassisLocationWGS84(gnssInfo: MessagePad.GnssInfo?)
fun onChassisLocationWGS84(gnssInfo: MessagePad.GnssInfo)
}

16
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/IMoGoHmiViewProxy.kt
View File

@@ -1,16 +0,0 @@
package com.mogo.eagle.core.function.api.hmi
import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight
/**
* 设置HMI中控件代理接口
*/
interface IMoGoHmiViewProxy {
/**
* 设置 红绿灯 代理View
* @param view
*/
fun setProxyTrafficLightView(view: IViewTrafficLight)
}

43
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/view/IViewTrafficLight.kt
View File

@@ -1,43 +0,0 @@
package com.mogo.eagle.core.function.api.hmi.view
import android.content.Context
import android.util.AttributeSet
import android.widget.LinearLayout
/**
* 定义红绿灯View具备的功能接口
*/
abstract class IViewTrafficLight(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) :
LinearLayout(context, attrs, defStyleAttr) {
/**
* 展示红绿灯预警
*
* @param checkLightId 0-都是默认，1-红，2-黄，3-绿
* @param lightSource 1:云端下发；2:自车感知
*/
open fun showWarningTrafficLight(checkLightId: Int,lightSource: Int) {}
/**
* 关闭红绿灯预警展示，并重制灯态
*/
open fun disableWarningTrafficLight() {}
/**
* @param readNum 红灯倒计时
* @param yellowNum 黄灯倒计时
* @param greenNum 绿灯倒计时
*/
open fun changeCountdownTrafficLightNum(readNum: Int, yellowNum: Int, greenNum: Int) {}
open fun changeCountdownGreen(greenNum: Int) {}
open fun changeCountdownYellow(yellowNum: Int) {}
open fun changeCountdownRed(redNum: Int) {}
/**
* 隐藏倒计时
*/
open fun disableCountdown(){}
}

68
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt
View File

@@ -8,29 +8,18 @@ import com.mogo.eagle.core.data.map.Infrastructure
import com.mogo.eagle.core.data.notice.NoticeNormalData
import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
import com.mogo.eagle.core.data.report.ReportEntity
import com.mogo.eagle.core.function.api.hmi.IMoGoHmiViewProxy
/**
* @author xiaoyuzhou
* @date 2021/8/2 7:36 下午
*/
interface IMoGoHmiProvider : IMoGoHmiViewProxy {
interface IMoGoHmiProvider {
/**
* 浓雾预警
*/
fun displayEffects()
/**
* 控制转向灯
*/
fun setTurnLightFunction(isOpen: Boolean)
/**
* 控制刹车功能
*/
fun setBrakeLightFunction(isOpen: Boolean)
/**
* 控制sn绑定功能
*/
@@ -57,51 +46,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
*/
fun disableWarningV2X(tag: String?)
/**
* 展示红绿灯预警
*
* @param checkLightId 0-都是默认，1-红，2-黄，3-绿
* @param lightSource 1:云端下发；2:自车感知
*/
fun showWarningTrafficLight(checkLightId: Int,lightSource: Int)
/**
* 红绿灯是否展示
*/
fun isWarningTrafficLightShow(): Boolean
/**
* 关闭红绿灯预警
*/
fun disableWarningTrafficLight()
/**
* 关闭红绿灯倒计时
*/
fun disableWarningTrafficLightCountDown()
/**
* 修改红灯倒计时
*/
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 direction
@@ -229,16 +173,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
*/
fun updateMfStatus(tag: String, status: Boolean)
/**
* 设置司机端消息盒子是否展示
*/
fun updateDriverMsgBoxTipView(show: Boolean)
/**
* 设置乘客端消息盒子是否展示
*/
fun updatePassengerMsgBoxTipView(show: Boolean)
/**
* 调度弹窗展示
*/

18
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/listener/IGaoDeMapLocationListener.kt Normal file
View File

@@ -0,0 +1,18 @@
package com.mogo.eagle.core.function.api.map.listener
import com.mogo.eagle.core.data.map.MogoLocation
/**
* 封装高德地图通过设备GPS获取到的位置信息，频率1s一次，坐标系为CJC20
* 这里的数据仅用于非高精度业务
* @author xiaoyuzhou
* @date 2021/11/1 7:17 下午
*/
interface IGaoDeMapLocationListener {
/**
* 定位发生改变
*
* @param location 新定位点
*/
fun onLocationChanged(location: MogoLocation, from: Int, isGps: Boolean)
}

17
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/listener/IMoGoMapLocationListener.kt
View File

@@ -1,17 +0,0 @@
package com.mogo.eagle.core.function.api.map.listener
import com.mogo.eagle.core.data.map.MogoLocation
/**
* @author xiaoyuzhou
* @date 2021/11/1 7:17 下午
* 地图定位回调
*/
interface IMoGoMapLocationListener {
/**
* 定位发生改变
*
* @param location 新定位点
*/
fun onLocationChanged(location: MogoLocation?, from: Int, isGps: Boolean)
}

16
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxEventListener.kt
View File

@@ -1,9 +1,25 @@
package com.mogo.eagle.core.function.api.msgbox
import com.mogo.eagle.core.data.msgbox.MsgBoxBean
/**
* @author XuXinChao
* @date 2023/1/16
* 消息盒子事件监听回调
*/
interface IMsgBoxEventListener {
//汇总事件点击监听
fun onSummaryClickEvent()
//更新提示红点视图
fun onUpdateTipEvent(isShow: Boolean)
//气泡态运营平台事件点击监听
fun onBubbleOperationClickEvent(msgBoxBean: MsgBoxBean)
//气泡态V2X消息事件点击监听
fun onBubbleV2XClickEvent(msgBoxBean: MsgBoxBean)
//气泡态上报消息事件点击监听
fun onBubbleReportClickEvent(msgBoxBean: MsgBoxBean)
}

18
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuConnectListener.kt Normal file
View File

@@ -0,0 +1,18 @@
package com.mogo.eagle.core.function.api.obu
import com.mogo.eagle.core.data.obu.ObuStatusInfo
/**
* OBU 连接状态监听回调
* @author xiaoyuzhou
* @date 2021/9/30 5:53 下午
*/
interface IMoGoObuConnectListener {
/**
* 检查OBU连链接信息
* @param obuStatusInfo OBU 状态信息
*/
fun onConnectStatus(obuStatusInfo: ObuStatusInfo)
}

20
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuLocationWGS84Listener.kt Normal file
View File

@@ -0,0 +1,20 @@
package com.mogo.eagle.core.function.api.obu
import com.mogo.support.obu.model.MogoObuHvBasicsData
/**
* OBU HV 自车车辆基础信息数据,自车定位数据 WGS84 坐标系
* @author donghongyu
* @date 2023-02-01
*/
interface IMoGoObuLocationWGS84Listener {
/**
* HV车辆基础信息
*
* @param data 数据
* @since 1.0.0
*/
fun onObuLocationWGS84(data: MogoObuHvBasicsData)
}

7
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuStatusListener.kt
View File

@@ -9,13 +9,6 @@ import com.mogo.eagle.core.data.traffic.TrafficData
* OBU 状态监听回调
*/
interface IMoGoObuStatusListener {
/**
* 检查OBU连链接信息
* @param obuStatusInfo OBU 状态信息
*/
fun onObuStatusResponse(obuStatusInfo: ObuStatusInfo){
}
/**
* v2i时延

15
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuTrafficLightListener.kt
View File

@@ -1,15 +0,0 @@
package com.mogo.eagle.core.function.api.obu
/**
* @author lixiaopeng
* @date 2022/1/30 10：28 下午
* OBU 灯态信息
*/
interface IMoGoObuTrafficLightListener {
/**
* @param light 灯的信息
*/
fun onObuTrafficLight(light: Int){}
}

20
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuWarningMapListener.kt Normal file
View File

@@ -0,0 +1,20 @@
package com.mogo.eagle.core.function.api.obu
import com.mogo.support.obu.ObuScene
/**
* OBU 地图匹配结果，
* @author donghongyu
* @date 2023-02-01
*/
interface IMoGoObuWarningMapListener {
/**
* 地图匹配结果
*
* @param mapMatchData 数据
* @since 1.0.0
*/
fun onMoGoObuMapMath(mapMatchData: ObuScene.MapMatchData)
}

20
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuWarningRsiListener.kt Normal file
View File

@@ -0,0 +1,20 @@
package com.mogo.eagle.core.function.api.obu
import com.mogo.support.obu.ObuScene
/**
* OBU RSI预警信息，
* @author donghongyu
* @date 2023-02-01
*/
interface IMoGoObuWarningRsiListener {
/**
* RSI预警信息
*
* @param rsiWarningData 数据
* @since 1.0.0
*/
fun onMoGoObuRsiWarning(rsiWarningData: ObuScene.RsiWarningData)
}

20
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuWarningRsmListener.kt Normal file
View File

@@ -0,0 +1,20 @@
package com.mogo.eagle.core.function.api.obu
import com.mogo.support.obu.ObuScene
/**
* OBU RSM预警信息，弱势交通参与者预警信息
* @author donghongyu
* @date 2023-02-01
*/
interface IMoGoObuWarningRsmListener {
/**
* RSM预警信息，弱势交通参与者预警信息
*
* @param rsmWarningData 数据
* @since 1.0.0
*/
fun onMoGoObuRsmWarning(rsmWarningData: ObuScene.RsmWarningData)
}

20
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuWarningRvListener.kt Normal file
View File

@@ -0,0 +1,20 @@
package com.mogo.eagle.core.function.api.obu
import com.mogo.support.obu.model.MogoObuRvWarningData
/**
* OBU V2V预警信息，
* @author donghongyu
* @date 2023-02-01
*/
interface IMoGoObuWarningRvListener {
/**
* OBU V2V预警信息
*
* @param data 数据
* @since 1.0.0
*/
fun onMoGoObuRvWarning(data: MogoObuRvWarningData)
}

20
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuWarningSpatListener.kt Normal file
View File

@@ -0,0 +1,20 @@
package com.mogo.eagle.core.function.api.obu
import com.mogo.support.obu.ObuScene
/**
* OBU 红绿灯预警信息，
* @author donghongyu
* @date 2023-02-01
*/
interface IMoGoObuWarningSpatListener {
/**
* OBU 红绿灯预警信息
*
* @param spatWarningData 数据
* @since 1.0.0
*/
fun onMoGoObuSpatWarning(spatWarningData: ObuScene.SpatWarningData)
}

44
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/trafficlight/IMoGoTrafficLightListener.kt
View File

@@ -1,13 +1,15 @@
package com.mogo.eagle.core.function.api.trafficlight
import com.mogo.eagle.core.data.enums.DataSourceType
import com.mogo.eagle.core.data.enums.TrafficLightEnum
import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
interface IMoGoTrafficLightListener {
/**
* 当前红绿灯状态，包含红绿灯灯态，倒计时秒数，灯态经纬度，时间戳，剩余时间
* 当前云端红绿灯状态，包含红绿灯灯态，倒计时秒数，灯态经纬度，时间戳，剩余时间
*/
fun onTrafficLightStatus(trafficLightResult: TrafficLightResult)
fun onTrafficLightStatus(trafficLightResult: TrafficLightResult){}
/**
* 车辆进入路口回调
@@ -17,10 +19,46 @@ interface IMoGoTrafficLightListener {
}
/**
* 红绿灯接口请求失败
* 云端红绿灯接口请求失败
*/
fun onTrafficRequestError(){
}
/**
* obu红绿灯状态
*/
fun onObuTrafficLightStatus(light: TrafficLightEnum){}
/**
* 展示红绿灯预警
*
* @param checkLightId 0-都是默认，1-红，2-黄，3-绿
* @param lightSource 1:云端下发 2:自车感知 3:OBU
*/
fun showTrafficLight(checkLightId: TrafficLightEnum, lightSource: DataSourceType) {}
/**
* @param readNum 红灯倒计时
* @param yellowNum 黄灯倒计时
* @param greenNum 绿灯倒计时
*/
fun changeCountdownTrafficLightNum(readNum: Int, yellowNum: Int, greenNum: Int) {}
fun changeCountdownGreen(greenNum: Int) {}
fun changeCountdownYellow(yellowNum: Int) {}
fun changeCountdownRed(redNum: Int) {}
/**
* 关闭红绿灯预警展示，并重制灯态
*/
fun disableTrafficLight() {}
/**
* 关闭红绿灯计数
*/
fun disableTrafficLightCountDown() {}
}