Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0
# Conflicts: # OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java # app_ipc_monitoring/src/main/java/com/zhidao/adas/client/DataDistribution.java # app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java # core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
This commit is contained in:
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.api.autopilot
|
||||
|
||||
import chassis.SpecialVehicleTaskCmdOuterClass
|
||||
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
|
||||
import com.mogo.eagle.core.data.badcase.BagManagerEntity
|
||||
import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
|
||||
import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
|
||||
|
||||
@@ -187,6 +188,12 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider {
|
||||
*/
|
||||
fun getBadCaseConfig(reqType: Int,recordType: Int,topicsNeedToCache: List<String>): Boolean
|
||||
|
||||
/**
|
||||
* 获取Bag包管理信息
|
||||
* @param bagManagerEntity 包管理请求实体类
|
||||
*/
|
||||
fun sendBagManagerCmd(bagManagerEntity: BagManagerEntity): Boolean
|
||||
|
||||
/**
|
||||
* 发送工控机所有节点重启命令
|
||||
*/
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.mogo.eagle.core.function.api.autopilot
|
||||
|
||||
import bag_manager.BagManagerOuterClass
|
||||
import mogo.telematics.pad.MessagePad
|
||||
import record_cache.RecordPanelOuterClass
|
||||
|
||||
@@ -20,4 +21,9 @@ interface IMoGoAutopilotRecordListener {
|
||||
*/
|
||||
fun onAutopilotRecordConfig(config: MessagePad.RecordDataConfig){}
|
||||
|
||||
/**
|
||||
* 录包任务管理应答
|
||||
*/
|
||||
fun onBagManagerResult(bagManager: BagManagerOuterClass.BagManager){}
|
||||
|
||||
}
|
||||
@@ -105,6 +105,11 @@ interface IDevaToolsProvider : IProvider {
|
||||
*/
|
||||
fun showFeedbackWindow(ctx: Context)
|
||||
|
||||
/**
|
||||
* 展示录包管理页面
|
||||
*/
|
||||
fun showBadCaseManagerView(context: Context)
|
||||
|
||||
/**
|
||||
* 下载指定包
|
||||
*/
|
||||
@@ -172,6 +177,11 @@ interface IDevaToolsProvider : IProvider {
|
||||
*/
|
||||
fun queryAppUpgrade()
|
||||
|
||||
/**
|
||||
* 查询obu是否有更新
|
||||
*/
|
||||
fun queryObuUpgrade(obuVersionName: String)
|
||||
|
||||
fun getEnvConfig(): EnvConfig?
|
||||
|
||||
fun getEnvCityName():String
|
||||
|
||||
@@ -16,4 +16,8 @@ interface IMoGoObuProvider : IMoGoFunctionServerProvider {
|
||||
fun isConnected(): Boolean
|
||||
|
||||
fun setObuLog(isChecked: Boolean)
|
||||
|
||||
fun uploadObuPack(filePathArray: Array<String>)
|
||||
|
||||
fun deleteObuFile()
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.mogo.eagle.core.function.api.obu
|
||||
|
||||
import com.mogo.eagle.core.data.traffic.TrafficData
|
||||
import mogo.telematics.pad.MessagePad
|
||||
|
||||
/**
|
||||
* @author xiaoyuzhou
|
||||
@@ -17,13 +16,6 @@ interface IMoGoObuStatusListener {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* obu Tracker data
|
||||
*/
|
||||
fun updateTrackerFusionData(trackObject: MessagePad.TrackedObject?){
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新obu Tracker 预警信息
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user