Merge branch 'release_robotaxi-d_231031_6.2.0.2' into 6.2.0_merge_master
# Conflicts: # OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java # OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java # OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java # OCH/sweeper/sweeper/build.gradle # OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java # OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java # app/script/functions/och.gradle # app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt # core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt # core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml # core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml # core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
This commit is contained in:
yangyakun
@@ -224,6 +224,14 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider {
|
||||
*/
|
||||
fun sendFusionMode(cmd: Int): Boolean
|
||||
|
||||
/**
|
||||
* 超车的最大速度闻值(double, m/s, 范围[3, 12.5])
|
||||
*
|
||||
* @param maxSpeed m/s, 范围[3, 12.5]
|
||||
* @return boolean
|
||||
*/
|
||||
fun sendOvertakeMaxSpeed(maxSpeed: Double): Boolean
|
||||
|
||||
/**
|
||||
* 批量设置参数命令
|
||||
*
|
||||
@@ -240,6 +248,7 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider {
|
||||
* {@link AdasConstants.MapSystemParamType#V2N_TO_PNC Value类型：boolean或boolean类型String}
|
||||
* {@link AdasConstants.MapSystemParamType#V2I_TO_PNC Value类型：boolean或boolean类型String}
|
||||
* {@link AdasConstants.MapSystemParamType#FUSION_MODE Value类型：int或int类型String}
|
||||
* {@link AdasConstants.MapSystemParamType#OVERTAKE_MAX_SPEED Value类型：double或double类型String}
|
||||
* @return boolean
|
||||
*/
|
||||
fun sendSetParamReq(param: Map<AdasConstants.MapSystemParamType, Any>): Boolean
|
||||
|
||||
@@ -22,4 +22,7 @@ interface IMsgBoxEventListener {
|
||||
|
||||
//气泡态上报消息事件点击监听
|
||||
fun onBubbleReportClickEvent(msgBoxBean: MsgBoxBean){}
|
||||
|
||||
//通知播放缓存的未播放消息
|
||||
fun onHandleCachedMsg(){}
|
||||
}
|
||||
@@ -17,6 +17,7 @@ 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.devatools.perf.IMoGoCpuUsageProvider
|
||||
import com.mogo.eagle.core.function.api.lookaround.*
|
||||
import com.mogo.eagle.core.function.api.upgrade.*
|
||||
|
||||
@@ -238,4 +239,9 @@ interface IDevaToolsProvider : IProvider {
|
||||
* 主线程卡顿监控
|
||||
*/
|
||||
fun block(): IMoGoBlockProvider?
|
||||
|
||||
/**
|
||||
* 各线程CPU使用率
|
||||
*/
|
||||
fun usage(): IMoGoCpuUsageProvider?
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package com.mogo.eagle.core.function.api.devatools.badcase
|
||||
|
||||
import com.mogo.eagle.core.data.deva.badcase.AiDataEntity
|
||||
import com.mogo.eagle.core.data.deva.badcase.RecordOptionEntity
|
||||
|
||||
interface BadCaseNetListener {
|
||||
/**
|
||||
* AI数据采集数据回调
|
||||
*/
|
||||
fun onAiDataResponse(list: List<AiDataEntity>){}
|
||||
|
||||
/**
|
||||
* AI数据采集请求错误回调
|
||||
*/
|
||||
fun onAiDataError(){}
|
||||
|
||||
/**
|
||||
* 主动录包数据回调
|
||||
*/
|
||||
fun onInitiativeResponse(list: List<RecordOptionEntity>){}
|
||||
|
||||
/**
|
||||
* 主动录包请求错误回调
|
||||
*/
|
||||
fun onInitiativeError(){}
|
||||
|
||||
/**
|
||||
* 被动录包数据回调
|
||||
*/
|
||||
fun onPassiveResponse(list: List<RecordOptionEntity>){}
|
||||
|
||||
/**
|
||||
* 被动录包请求错误回调
|
||||
*/
|
||||
fun onPassiveError(){}
|
||||
|
||||
/**
|
||||
* 录包上传Cos成功回调
|
||||
*/
|
||||
fun onUploadCosSuccess(cosUrl: String){}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.mogo.eagle.core.function.api.devatools.perf
|
||||
|
||||
interface IMoGoCpuUsageProvider {
|
||||
|
||||
fun onProcessLaunched()
|
||||
|
||||
fun onMainThreadLaunched()
|
||||
|
||||
fun updateMainThreadTime()
|
||||
|
||||
fun updateOtherThreadTime()
|
||||
|
||||
fun dump(): LinkedHashMap<String, Long>
|
||||
}
|
||||
@@ -1,68 +1,16 @@
|
||||
package com.mogo.eagle.core.function.api.map.angle
|
||||
|
||||
import com.mogo.map.uicontroller.*
|
||||
import java.util.concurrent.*
|
||||
import java.util.concurrent.TimeUnit.SECONDS
|
||||
|
||||
private interface IAttach {
|
||||
interface IAttach {
|
||||
val angle: VisualAngleMode
|
||||
val priority: Int
|
||||
val displayThreshold: Long //最大展示时长 > 0; 表示最长展示多长时间， -1 表示，一直展示，直到触发默认视角, 0: 默认视角专用值，
|
||||
}
|
||||
|
||||
|
||||
sealed class Scene: IAttach
|
||||
interface Scene: IAttach
|
||||
|
||||
|
||||
/**
|
||||
* 默认视图
|
||||
* @param delay: 表示多少稍后，默认值为2
|
||||
* @param unit: 时间单位，默认为秒
|
||||
*/
|
||||
class Default(val delay: Long = 2, val unit: TimeUnit = SECONDS): Scene() {
|
||||
|
||||
override val angle: VisualAngleMode = VisualAngleMode.MODE_MEDIUM_SIGHT
|
||||
|
||||
override val priority: Int = 1
|
||||
|
||||
override val displayThreshold: Long
|
||||
get() = 0
|
||||
|
||||
override fun toString(): String {
|
||||
return "Default(delay=$delay, unit=$unit, angle=$angle, priority=$priority)"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 道路事件
|
||||
*/
|
||||
class RoadEvent(val poi_lon: Double, val poi_lat: Double, val poi_angle: Double, val isGps: Boolean = true): Scene() {
|
||||
|
||||
override val angle: VisualAngleMode = VisualAngleMode.MODE_LONG_SIGHT
|
||||
|
||||
override val priority: Int = 5
|
||||
|
||||
override val displayThreshold: Long
|
||||
get() = SECONDS.toMillis(8)
|
||||
|
||||
override fun toString(): String {
|
||||
return "RoadEvent(priority=${priority}, displayThreshold: ${displayThreshold}, priority=${priority}, lon: $poi_lon, lat: $poi_lat, angle: $poi_angle)"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 十字路口
|
||||
*/
|
||||
class CrossRoad(var open: Boolean = false): Scene() {
|
||||
override val angle: VisualAngleMode = VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS
|
||||
override val priority: Int = 4
|
||||
override val displayThreshold: Long
|
||||
get() = -1
|
||||
|
||||
override fun toString(): String {
|
||||
return "CrossRoad(open: ${open}, priority=${priority}, displayThreshold: ${displayThreshold}, priority=${priority})"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,11 +2,21 @@ package com.mogo.eagle.core.function.api.map.roma
|
||||
|
||||
interface IMoGoRomaListener {
|
||||
|
||||
/**
|
||||
* 是否在自由漫游范围内
|
||||
*/
|
||||
fun mapRomaInRange(range:Boolean){}
|
||||
|
||||
/**
|
||||
* 漫游地图状态回调
|
||||
*/
|
||||
fun mapRomaStatus(status:Int, msg:String){}
|
||||
|
||||
/**
|
||||
* 漫游按钮显示状态
|
||||
*/
|
||||
fun romaViewStatus(status: Boolean){}
|
||||
|
||||
/**
|
||||
* 漫游状态回调
|
||||
*/
|
||||
|
||||
@@ -4,4 +4,6 @@ interface IReceivedMsgListener {
|
||||
fun onReceivedMsg(type: Int, byteArray: ByteArray)
|
||||
|
||||
fun onReceivedServerSn(sn: String?) {}
|
||||
|
||||
fun onDemoMode(isDemoMode: Boolean) {}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package com.mogo.eagle.core.function.api.unmanned
|
||||
|
||||
interface IUnmannedListener {
|
||||
/**
|
||||
* 单位: 秒(s)
|
||||
*/
|
||||
fun onVirtualTaskPullTaskIntervalUpdate(time: Int)
|
||||
}
|
||||
Reference in New Issue
Block a user