Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0
# Conflicts: # OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java # OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java # OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java # OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java
This commit is contained in:
donghongyu
@@ -283,4 +283,11 @@ interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider {
|
||||
* 福田清扫车业务指令下发
|
||||
*/
|
||||
fun sendSweeperFuTianTaskCmd(fuTianTaskCmd: SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd)
|
||||
|
||||
/**
|
||||
* 打开点云绘制
|
||||
*
|
||||
* @param isDrawPointCloud 是否绘制点云
|
||||
*/
|
||||
fun setIsDrawPointCloud(isDrawPointCloud: Boolean)
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.mogo.eagle.core.function.api.hmi.warning
|
||||
|
||||
import android.view.ViewGroup
|
||||
import com.alibaba.android.arouter.facade.template.IProvider
|
||||
import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
|
||||
import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean
|
||||
import com.mogo.eagle.core.data.enums.WarningDirectionEnum
|
||||
@@ -13,47 +14,19 @@ import com.mogo.eagle.core.data.report.ReportEntity
|
||||
* @author xiaoyuzhou
|
||||
* @date 2021/8/2 7:36 下午
|
||||
*/
|
||||
interface IMoGoHmiProvider {
|
||||
|
||||
/**
|
||||
* 浓雾预警
|
||||
*/
|
||||
fun displayEffects()
|
||||
|
||||
/**
|
||||
* 控制sn绑定功能
|
||||
*/
|
||||
fun setSnBinding(isOpen: Boolean)
|
||||
|
||||
/**
|
||||
* 控制展示obu的弱势交通
|
||||
*/
|
||||
fun setObuWeaknessTraffic(isOpen: Boolean)
|
||||
|
||||
/**
|
||||
* 控制展示云端的弱势交通
|
||||
*/
|
||||
fun setCloudWeaknessTraffic(isOpen: Boolean)
|
||||
interface IMoGoHmiProvider :IProvider{
|
||||
|
||||
/**
|
||||
* 不展示顶部弹窗，其它保留
|
||||
*/
|
||||
fun warningV2X(v2xType: String, alertContent: CharSequence?, ttsContent: String?, listener: IMoGoWarningStatusListener?, playTts: Boolean, expireTime: Long)
|
||||
fun warningV2X(v2xType: String, alertContent: CharSequence?, ttsContent: String?, listener: IMoGoWarningStatusListener?, direction: WarningDirectionEnum, expireTime: Long)
|
||||
|
||||
/**
|
||||
* 展示指定方位上的红框预警
|
||||
* @param direction
|
||||
* @see WarningDirectionEnum
|
||||
*/
|
||||
fun showWarning(direction: WarningDirectionEnum)
|
||||
|
||||
/**
|
||||
* 展示指定方位上的红框预警
|
||||
* @param direction
|
||||
* @see WarningDirectionEnum
|
||||
* @param closeTime 倒计时
|
||||
*/
|
||||
fun showWarning(direction: WarningDirectionEnum, closeTime: Long)
|
||||
fun showWarning(v2xType: String ,direction: WarningDirectionEnum, expireTime: Long)
|
||||
|
||||
/**
|
||||
* 主动消失边框预警
|
||||
@@ -74,30 +47,35 @@ interface IMoGoHmiProvider {
|
||||
*/
|
||||
fun showNoticeNormalData(normalData: NoticeNormalData?)
|
||||
|
||||
/**
|
||||
* 路侧直播，超视距感知
|
||||
*/
|
||||
fun startRoadCameraLive(flvUrl: String)
|
||||
|
||||
/**
|
||||
* 超视距感知关闭
|
||||
*/
|
||||
fun showNoSignView()
|
||||
|
||||
/**
|
||||
* 展示工具栏
|
||||
*/
|
||||
fun showToolsView()
|
||||
|
||||
fun hideToolsView()
|
||||
|
||||
/**
|
||||
* 加载全览模式图层
|
||||
* 关闭工具栏
|
||||
*/
|
||||
fun showSmallFragment()
|
||||
|
||||
fun hideSmallFragment()
|
||||
fun hideToolsView()
|
||||
|
||||
/**
|
||||
* 展示绑定车辆弹框
|
||||
*/
|
||||
fun showToBindingcarDialog()
|
||||
fun showToBindingCarDialog()
|
||||
|
||||
/**
|
||||
* 展示修改绑定车辆弹框
|
||||
*/
|
||||
fun showModifyBindingcarDialog()
|
||||
fun showModifyBindingCarDialog()
|
||||
|
||||
/**
|
||||
* 展示升级app弹框
|
||||
@@ -122,8 +100,21 @@ interface IMoGoHmiProvider {
|
||||
*/
|
||||
fun showIPCReportWindow(errorReportList: ArrayList<ReportEntity>,warningReportList: ArrayList<ReportEntity>,reportLevel: Int)
|
||||
|
||||
/**
|
||||
* 道路视频 放入指定url
|
||||
*/
|
||||
fun showVideoDialog(infList: List<Infrastructure>)
|
||||
|
||||
/**
|
||||
* 调度弹窗展示
|
||||
*/
|
||||
fun showDispatchDialog(msgData: DispatchAdasAutoPilotLocReceiverBean)
|
||||
|
||||
/**
|
||||
* 隐藏调度弹窗
|
||||
*/
|
||||
fun dismissDispatchDialog()
|
||||
|
||||
/**
|
||||
* 设置状态栏暗夜或明亮模式
|
||||
* 默认 light
|
||||
@@ -150,14 +141,4 @@ interface IMoGoHmiProvider {
|
||||
*/
|
||||
fun updateMfStatus(tag: String, status: Boolean)
|
||||
|
||||
/**
|
||||
* 调度弹窗展示
|
||||
*/
|
||||
fun showDispatchDialog(msgData: DispatchAdasAutoPilotLocReceiverBean)
|
||||
|
||||
/**
|
||||
* 隐藏调度弹窗
|
||||
*/
|
||||
fun dismissDispatchDialog()
|
||||
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
package com.mogo.eagle.core.function.api.map.hd
|
||||
|
||||
import androidx.annotation.RawRes
|
||||
import com.mogo.eagle.core.data.map.CenterLine
|
||||
import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
|
||||
|
||||
/**
|
||||
* @author donghongyu
|
||||
* @date 12/10/20 1:36 PM
|
||||
* 地图层控制
|
||||
*/
|
||||
interface IMoGoMapFragmentProvider : IMoGoFunctionServerProvider {
|
||||
/**
|
||||
* 修改地图中心点
|
||||
* MapAutoApi.CAR_CENTER_100 1/4
|
||||
* MapAutoApi.CAR_CENTER_100 2/5
|
||||
* MapAutoApi.CAR_CENTER_100 80米
|
||||
* MapAutoApi.CAR_CENTER_100 2/5
|
||||
*/
|
||||
fun changeMaoViewAngle(type: Int)
|
||||
|
||||
/**
|
||||
* 修改高精地图自车图标
|
||||
* 传入资源ID
|
||||
*/
|
||||
fun changeCurrentIcon(@RawRes iconId: Int)
|
||||
|
||||
/**
|
||||
* 设置地图视线角度
|
||||
*/
|
||||
fun setMapDAngle(mode: Int)
|
||||
|
||||
/**
|
||||
* 获取车道中心线信息
|
||||
*/
|
||||
fun getCenterLineInfo(lon: Double, lat: Double, angle: Float): CenterLine?
|
||||
|
||||
|
||||
/**
|
||||
* 进入VR 模式
|
||||
*
|
||||
* @param isDayMode true-白天模式，false-夜间模式
|
||||
*/
|
||||
fun stepInVrMode(isDayMode: Boolean)
|
||||
|
||||
/**
|
||||
* 打开点云绘制
|
||||
*
|
||||
* @param isDrawPointCloud 是否绘制点云
|
||||
*/
|
||||
fun setIsDrawPointCloud(isDrawPointCloud: Boolean)
|
||||
|
||||
/**
|
||||
* 设制点云大小
|
||||
*
|
||||
* @param pointCloudSize 点云的点大小
|
||||
*/
|
||||
fun setPointCloudSize(pointCloudSize: Float)
|
||||
|
||||
|
||||
/**
|
||||
* 设置点云颜色
|
||||
*
|
||||
* @param color // color:"#RRGGBB*
|
||||
*/
|
||||
fun setPointCloudColor(color: String)
|
||||
|
||||
/**
|
||||
* 设置地图是否是Debug模式
|
||||
* @param debugMode 是否开启Debug模式
|
||||
*/
|
||||
fun setDebugMode(debugMode: Boolean)
|
||||
|
||||
}
|
||||
@@ -6,5 +6,8 @@ import com.mogo.eagle.core.data.enums.DataSourceType
|
||||
* 限速信息回掉
|
||||
*/
|
||||
interface ILimitingVelocityListener {
|
||||
fun onLimitingVelocityChange(limitingVelocity: Int,sourceType: DataSourceType)
|
||||
|
||||
fun onUnion(limitingVelocity: Int,sourceType: DataSourceType){}
|
||||
|
||||
fun onLimitingVelocityChange(limitingVelocity: Int,sourceType: DataSourceType){}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.mogo.eagle.core.function.api.trafficlight
|
||||
package com.mogo.eagle.core.function.api.v2x
|
||||
|
||||
import com.mogo.eagle.core.data.enums.DataSourceType
|
||||
import com.mogo.eagle.core.data.enums.TrafficLightEnum
|
||||
@@ -28,7 +28,7 @@ interface IMoGoTrafficLightListener {
|
||||
/**
|
||||
* obu红绿灯状态
|
||||
*/
|
||||
fun onObuTrafficLightStatus(light: TrafficLightEnum){}
|
||||
fun onTrafficLightPlusSource(light: TrafficLightEnum, remain:Int = -1, lightSource: DataSourceType){}
|
||||
|
||||
/**
|
||||
* 展示红绿灯预警
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.mogo.eagle.core.function.api.vip
|
||||
package com.mogo.eagle.core.function.api.v2x
|
||||
|
||||
interface IMoGoVipSetListener {
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.mogo.eagle.core.function.api.v2x
|
||||
|
||||
import com.mogo.eagle.core.data.enums.WarningDirectionEnum
|
||||
|
||||
interface IV2XEventListener {
|
||||
|
||||
fun show(v2xType: String, direction: WarningDirectionEnum, time: Long)
|
||||
|
||||
fun dismiss(direction: WarningDirectionEnum)
|
||||
}
|
||||
Reference in New Issue
Block a user