Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0

This commit is contained in:
donghongyu
2023-02-01 18:35:45 +08:00
119 changed files with 1390 additions and 1689 deletions

View File

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

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)
}

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(){}
}

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

View File

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

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() {}
}