Merge branch 'dev_robotaxi-d_230612_3.3.0' into 3.3.0merge2master
This commit is contained in:
yangyakun
@@ -11,6 +11,7 @@ import com.zhjt.mogo.adas.data.sweeper.task.SweeperTask.StartTaskResp
|
||||
import com.zhjt.mogo.adas.data.sweeper.task.SweeperTaskSuspendResume.SuspendResumeTaskReq
|
||||
import com.zhjt.mogo.adas.data.sweeper.task.confirm.SweeperTaskConfirm.TaskConfirmResp
|
||||
import com.zhjt.mogo.adas.data.sweeper.task.stop.SweeperTaskStop.StopTaskResp
|
||||
import com.zhjt.mogo.adas.data.AdasConstants
|
||||
|
||||
/**
|
||||
* @author xiaoyuzhou
|
||||
@@ -215,7 +216,7 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider {
|
||||
* @param paramType 参数类型{@link com.zhidao.support.adas.high.common.Constants.PARAM_TYPE}
|
||||
* @return boolean
|
||||
*/
|
||||
fun sendGetParamReq(paramType: Int): Boolean
|
||||
fun sendGetParamReq(paramType: AdasConstants.MapSystemParamType): Boolean
|
||||
|
||||
/**
|
||||
* 获取数据采集录制模式配置列表
|
||||
|
||||
@@ -23,13 +23,6 @@ interface IMoGoAutopilotIdentifyListener {
|
||||
*/
|
||||
fun onAutopilotIdentifyPlanningObj(planningObjects: List<MessagePad.PlanningObject>?){}
|
||||
|
||||
/**
|
||||
* 报警信息
|
||||
*
|
||||
* @param warn 预警信息
|
||||
*/
|
||||
fun onAutopilotWarnMessage(warn: MessagePad.Warn?) {}
|
||||
|
||||
/**
|
||||
* 感知红绿灯
|
||||
* @param trafficLights 感知红绿灯
|
||||
|
||||
@@ -13,12 +13,27 @@ import system_master.*
|
||||
interface IMoGoAutopilotStatusListener {
|
||||
|
||||
/**
|
||||
* 自动驾驶状态信息 TODO 接口优化，拆分业务属性字段
|
||||
* 自动驾驶状态信息
|
||||
*
|
||||
* @param autoPilotStatusInfo 状态信息
|
||||
*/
|
||||
@Deprecated("3.3.0之后不建议使用此种回调方式，按需回调,主界面暂时使用用于check检查信息透出")
|
||||
fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {}
|
||||
|
||||
/**
|
||||
* 自动驾驶状态信息
|
||||
*
|
||||
* @param state 状态信息
|
||||
*/
|
||||
fun onAutopilotStatusResponse(state: Int) {}
|
||||
|
||||
/**
|
||||
* 自动驾驶docker信息
|
||||
*
|
||||
* @param dockerVersion docker版本
|
||||
*/
|
||||
fun onAutopilotDockerInfo(dockerVersion:String){}
|
||||
|
||||
/**
|
||||
* 自动驾驶到站
|
||||
*
|
||||
|
||||
@@ -8,6 +8,6 @@ interface IMoGoChassisAccStateListener {
|
||||
/**
|
||||
* 车辆加速度
|
||||
*/
|
||||
fun onAutopilotAcc(carAcc: Float)
|
||||
fun onAutopilotAcc(carAcc: Float){}
|
||||
|
||||
}
|
||||
@@ -8,5 +8,5 @@ interface IMoGoChassisBrakeStateListener {
|
||||
/**
|
||||
* 刹车
|
||||
*/
|
||||
fun onAutopilotBrake(brake: Float)
|
||||
fun onAutopilotBrake(brake: Float){}
|
||||
}
|
||||
@@ -8,5 +8,5 @@ interface IMoGoChassisThrottleStateListener {
|
||||
/**
|
||||
* 油门
|
||||
*/
|
||||
fun onAutopilotThrottle(throttle: Float)
|
||||
fun onAutopilotThrottle(throttle: Float){}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.mogo.eagle.core.function.api.autopilot
|
||||
|
||||
import com.zhjt.mogo.adas.data.bean.*
|
||||
import mogo.telematics.pad.*
|
||||
|
||||
|
||||
interface IMoGoGetParamResponseListener {
|
||||
|
||||
/**
|
||||
* 参数获取应答
|
||||
* <p>
|
||||
* 调用{@link AdasManager#sendGetAllParamReq()}或{@link AdasManager#sendGetParamReq(int)}
|
||||
* 如果对应的value是空串，说明没有这个param或者get失败了。重启后值还是在redis里
|
||||
*
|
||||
* @param header 头
|
||||
* @param getParamResp 配置参数
|
||||
* @param adasParam 解析后的配置参数
|
||||
*/
|
||||
fun onGetParamResp(header: MessagePad.Header, getParamResp: MessagePad.SetParamReq, adasParam: AdasParam)
|
||||
}
|
||||
@@ -10,11 +10,10 @@ interface IMoGoSweeperFutianCleanSystemListener {
|
||||
/**
|
||||
* 清扫车（福田）清扫控制系统状态
|
||||
*/
|
||||
fun onSweeperFutianCleanSystemState(cleanSystemState: ChassisStatesOuterClass.SweeperFuTianTaskSystemStates)
|
||||
|
||||
fun onSweeperFutianCleanSystemState(cleanSystemState: ChassisStatesOuterClass.SweeperFuTianTaskSystemStates){}
|
||||
|
||||
/**
|
||||
* 清扫车（福田）指标数据 贴边数据
|
||||
*/
|
||||
fun onSweeperFutianTaskIndexData(roboSweeperTaskIndex: RoboSweeperTaskIndexOuterClass.RoboSweeperTaskIndex)
|
||||
fun onSweeperFutianTaskIndexData(roboSweeperTaskIndex: RoboSweeperTaskIndexOuterClass.RoboSweeperTaskIndex){}
|
||||
}
|
||||
@@ -14,6 +14,9 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxBean
|
||||
import com.mogo.eagle.core.function.api.devatools.apm.*
|
||||
import com.mogo.eagle.core.function.api.devatools.strict.*
|
||||
import com.mogo.eagle.core.function.api.devatools.download.*
|
||||
import com.mogo.eagle.core.function.api.devatools.logcat.*
|
||||
import com.mogo.eagle.core.function.api.devatools.mofang.*
|
||||
import com.mogo.eagle.core.function.api.lookaround.*
|
||||
import com.mogo.eagle.core.function.api.upgrade.*
|
||||
|
||||
/**
|
||||
@@ -205,4 +208,21 @@ interface IDevaToolsProvider : IProvider {
|
||||
fun upgradeProvider(): IMoGoUpgradeProvider?
|
||||
|
||||
fun strict(): IStrictModeProvider
|
||||
|
||||
|
||||
/**
|
||||
* 360环视数据提供者
|
||||
*/
|
||||
fun lookAroundDataProvider(): IMoGoLookAroundProvider
|
||||
|
||||
/**
|
||||
* 魔方功能提供者
|
||||
*/
|
||||
fun mofang(): IMoGoMoFangProvider
|
||||
|
||||
|
||||
/**
|
||||
* 日志记录功能
|
||||
*/
|
||||
fun logRecord(): IMoGoLogRecordProvider
|
||||
}
|
||||
@@ -55,4 +55,11 @@ interface IMoGoDevaToolsListener {
|
||||
|
||||
}
|
||||
|
||||
fun gpsStatus(status:Boolean) {// true:开启并授权
|
||||
|
||||
}
|
||||
|
||||
fun tracingStatus(status:Boolean) {// true：未异常
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.mogo.eagle.core.function.api.devatools.logcat
|
||||
|
||||
import android.content.Context
|
||||
import java.io.File
|
||||
|
||||
interface IMoGoLogRecordProvider {
|
||||
|
||||
fun init(context: Context)
|
||||
|
||||
fun start()
|
||||
|
||||
fun stop()
|
||||
|
||||
fun upload(startTime: Long, endTime: Long)
|
||||
|
||||
fun export(): File?
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
package com.mogo.eagle.core.function.api.devatools.mofang
|
||||
|
||||
|
||||
/**
|
||||
* 魔方数据的数据处理
|
||||
* @author lixiaopeng
|
||||
* @date 2023-02-20
|
||||
*/
|
||||
interface IMoGoMoFangListener {
|
||||
/**
|
||||
* 魔方数据的数据处理
|
||||
* @param keyCode 按键类型
|
||||
* @param action 按键状态
|
||||
*/
|
||||
fun onMofangHandle(keyCode: Int, action: Int): Boolean
|
||||
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
package com.mogo.eagle.core.function.api.devatools.mofang
|
||||
|
||||
import android.app.Application
|
||||
import android.view.*
|
||||
|
||||
interface IMoGoMoFangProvider {
|
||||
|
||||
fun init(app: Application)
|
||||
|
||||
fun connect()
|
||||
|
||||
fun disconnect()
|
||||
|
||||
fun isConnected(): Boolean
|
||||
|
||||
fun enableTest(enable: Boolean)
|
||||
|
||||
fun isEnableTest(): Boolean
|
||||
|
||||
fun provideWindowCallback(delegate: Window.Callback?): Window.Callback
|
||||
|
||||
fun registerMoFangStatusListener(tag: String, listener: OnMoFangStatusListener)
|
||||
|
||||
fun unRegisterMoFangStatusListener(listener: OnMoFangStatusListener)
|
||||
|
||||
/**
|
||||
* 魔方状态监听器
|
||||
*/
|
||||
interface OnMoFangStatusListener {
|
||||
|
||||
/**
|
||||
* 魔方已连接
|
||||
*/
|
||||
fun onMoFangConnected()
|
||||
|
||||
/**
|
||||
* 魔方断开连接了
|
||||
*/
|
||||
fun onMoFangDisconnected()
|
||||
|
||||
/**
|
||||
* 魔方电量变化了
|
||||
*/
|
||||
fun onMoFangBatteryChanged(battery: Int)
|
||||
|
||||
/**
|
||||
* 魔方单键点击了
|
||||
*/
|
||||
fun onMoFangClicked(keyCode: Int)
|
||||
|
||||
/**
|
||||
* 魔方单键长按了
|
||||
*/
|
||||
fun onMoFangLongClicked(keyCode: Int)
|
||||
|
||||
/**
|
||||
* 魔方触发了组合键
|
||||
*/
|
||||
fun onMoFangCombineClicked(vararg keyCodes: Int)
|
||||
|
||||
/**
|
||||
* 魔方状态异常
|
||||
*/
|
||||
fun onMoFangStatusError(msg: String)
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,8 @@ interface IViewControlListener {
|
||||
companion object{
|
||||
const val TrafficLightView_TAG = "TrafficLightView_TAG"
|
||||
const val LimitingVelocityView_TAG = "LimitingVelocityView_TAG"
|
||||
const val FUNC_MODE_DEMO = "demoMode"
|
||||
const val FUNC_MODE_RAIN = "rainMode"
|
||||
}
|
||||
|
||||
/** --------- View --------- **/
|
||||
@@ -36,4 +38,9 @@ interface IViewControlListener {
|
||||
*/
|
||||
fun updateStatusBarDownloadView(insert: Boolean, tag: String, progress: Int){}
|
||||
|
||||
/**
|
||||
* 更新Func Mode
|
||||
*/
|
||||
fun updateFuncMode(tag:String, boolean: Boolean){}
|
||||
|
||||
}
|
||||
|
||||
@@ -133,4 +133,20 @@ interface IMoGoHmiProvider :IProvider{
|
||||
fun updateStatusBarDownloadView(insert: Boolean, tag: String, progress: Int)
|
||||
|
||||
|
||||
/**
|
||||
* 展示360环视弹窗，主要用于M1车型
|
||||
*/
|
||||
fun show360LookAround()
|
||||
|
||||
/**
|
||||
* 隐藏360环视弹窗，主要用于M1车型
|
||||
*/
|
||||
fun hide360LookAround()
|
||||
|
||||
|
||||
/**
|
||||
* 360环视弹窗是否正在展示
|
||||
*/
|
||||
fun is360LookAroundShowing(): Boolean
|
||||
fun showStatusSummaryDialog()
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package com.mogo.eagle.core.function.api.lookaround
|
||||
|
||||
import android.content.Context
|
||||
import com.mogo.eagle.core.function.api.lookaround.data.*
|
||||
import kotlinx.coroutines.flow.*
|
||||
|
||||
interface IMoGoLookAroundProvider {
|
||||
|
||||
fun init(ctx: Context)
|
||||
|
||||
fun flow(): Flow<LookAroundData>
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.mogo.eagle.core.function.api.lookaround.data
|
||||
|
||||
data class LookAroundData(var data: ByteArray?, var bitmapWidth: Int, var bitmapHeight: Int, var targetX: Int = 0, var targetY: Int = 0, var targetWidth: Int = 0, var targetHeight: Int = 0) {
|
||||
|
||||
override fun toString(): String {
|
||||
return "LookAroundData(data=${data?.size}, bitmapWidth=$bitmapWidth, bitmapHeight=$bitmapHeight, targetX=$targetX, targetY=$targetY, targetWidth=$targetWidth, targetHeight=$targetHeight)"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fun LookAroundData.isValid(): Boolean {
|
||||
return this.data != null && this.bitmapWidth > 0 && this.bitmapHeight > 0 && targetX > 0 && targetY > 0 && targetWidth > 0 && targetHeight > 0
|
||||
}
|
||||
@@ -2,8 +2,13 @@ package com.mogo.eagle.core.function.api.map.roma
|
||||
|
||||
interface IMoGoRomaListener {
|
||||
|
||||
/**
|
||||
* 漫游地图状态回调
|
||||
*/
|
||||
fun mapRomaStatus(status:Int, msg:String){}
|
||||
|
||||
/**
|
||||
* 漫游状态回调
|
||||
*/
|
||||
fun romaStatus(status:Boolean)
|
||||
fun romaStatus(status:Boolean){}
|
||||
}
|
||||
@@ -8,6 +8,6 @@ interface IMogoRoma : IProvider {
|
||||
* 触发开启/关闭漫游
|
||||
* @param romaStatus 漫游状态
|
||||
*/
|
||||
fun trigger(romaStatus:Boolean,requestSuccess:((Boolean) -> Unit)? = null)
|
||||
fun trigger(romaStatus:Boolean)
|
||||
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package com.mogo.eagle.core.function.api.telematic
|
||||
|
||||
interface IConnectStatusListener {
|
||||
fun onServerStatusChanged(isStarted: Boolean) {}
|
||||
}
|
||||
Reference in New Issue
Block a user