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 # OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java # OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.java # OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java # OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml # app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt # core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt # core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
This commit is contained in:
donghongyu
@@ -17,6 +17,6 @@ interface IMoGoChassisLamplightListener {
|
||||
* 车辆刹车灯 数据
|
||||
* @param brakeLight
|
||||
*/
|
||||
fun onAutopilotBrakeLightData(brakeLight: Boolean)
|
||||
fun onAutopilotBrakeLightData(brakeLight: Boolean){}
|
||||
|
||||
}
|
||||
@@ -9,13 +9,6 @@ import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight
|
||||
*/
|
||||
interface IMoGoHmiViewProxy {
|
||||
|
||||
|
||||
/**
|
||||
* 设置 V2X预警 代理View
|
||||
* @param view
|
||||
*/
|
||||
fun setViewNotificationProvider(provider: IViewNotificationProvider)
|
||||
|
||||
/**
|
||||
* 设置 红绿灯 代理View
|
||||
* @param view
|
||||
@@ -28,9 +21,4 @@ interface IMoGoHmiViewProxy {
|
||||
*/
|
||||
fun setProxyLimitingSpeedView(view: IViewLimitingVelocity)
|
||||
|
||||
|
||||
interface IViewNotificationProvider {
|
||||
|
||||
fun getNotificationView() : IViewNotification?
|
||||
}
|
||||
}
|
||||
@@ -1,16 +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 IOchBusView(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) :
|
||||
LinearLayout(context, attrs, defStyleAttr) {
|
||||
|
||||
open fun showBusOperation(){}
|
||||
|
||||
open fun changerOperationStatus(isOut:Boolean){}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.mogo.eagle.core.function.api.hmi.view
|
||||
|
||||
import android.view.ViewGroup
|
||||
|
||||
interface IViewControlListener {
|
||||
|
||||
companion object{
|
||||
const val SpeedPanelView_TAG = "SpeedPanelView_TAG"
|
||||
const val AutoPilotStatusView_TAG = "AutoPilotStatusView_TAG"
|
||||
const val PerspectiveSwitchView_TAG = "PerspectiveSwitchView_TAG"
|
||||
const val CameraView_TAG = "CameraView_TAG"
|
||||
const val ToolsView_TAG = "ToolsView_TAG"
|
||||
const val TrafficLightView_TAG = "TrafficLightView_TAG"
|
||||
}
|
||||
|
||||
/** --------- View --------- **/
|
||||
fun visible(v:Int){
|
||||
|
||||
}
|
||||
|
||||
/** --------- StatusBar --------- **/
|
||||
/**
|
||||
* 设置状态栏暗夜或明亮模式
|
||||
* 默认 light
|
||||
*/
|
||||
fun setStatusBarDarkOrLight(light: Boolean){}
|
||||
|
||||
/**
|
||||
* 更新(添加/删除)状态栏右侧元素
|
||||
*/
|
||||
fun updateStatusBarRightView(insert: Boolean, tag: String, viewGroup: ViewGroup){}
|
||||
|
||||
/**
|
||||
* 更新(添加/删除)状态栏左侧元素
|
||||
*/
|
||||
fun updateStatusBarLeftView(insert: Boolean, tag: String, viewGroup: ViewGroup){}
|
||||
|
||||
/**
|
||||
* 更新(添加/删除)下载进度
|
||||
*/
|
||||
fun updateStatusBarDownloadView(insert: Boolean, tag: String, progress: Int){}
|
||||
|
||||
/**
|
||||
* 更新魔方的连接状态
|
||||
*/
|
||||
fun updateMfStatus(tag: String, status: Boolean){}
|
||||
|
||||
}
|
||||
@@ -13,6 +13,7 @@ abstract class IViewLimitingVelocity(context: Context?, attrs: AttributeSet?, de
|
||||
/**
|
||||
* 更新限速数据
|
||||
* @param limitingSpeed 限速值，单位：km/h
|
||||
* @param limitSource 限速来源 1:MAP, 2:RSU
|
||||
*/
|
||||
open fun updateLimitingSpeed(limitingSpeed: Int) {}
|
||||
open fun updateLimitingSpeed(limitingSpeed: Int, limitSource: Int) {}
|
||||
}
|
||||
@@ -10,7 +10,6 @@ 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
|
||||
import com.mogo.eagle.core.function.api.hmi.view.IOchBusView
|
||||
|
||||
/**
|
||||
* @author xiaoyuzhou
|
||||
@@ -80,26 +79,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
|
||||
*/
|
||||
fun setCloudWeaknessTraffic(isOpen: Boolean)
|
||||
|
||||
/**
|
||||
* 开关DebugView
|
||||
*/
|
||||
fun toggleDebugView()
|
||||
|
||||
/**
|
||||
* 开关SOPSettingView
|
||||
*/
|
||||
fun toggleSOPView()
|
||||
|
||||
/**
|
||||
* 展示VR下V2X预警
|
||||
*
|
||||
* @param poiType V2X类型
|
||||
* @param alertContent 提醒文本
|
||||
* @param ttsContent tts语音播报消息
|
||||
* @param tag tag绑定弹窗的标志
|
||||
*/
|
||||
fun showWarningV2X(v2xType: String, alertContent: CharSequence?, ttsContent: String?, tag: String?, listener: IMoGoWarningStatusListener?, playTts: Boolean, expireTime: Long)
|
||||
|
||||
/**
|
||||
* 不展示顶部弹窗，其它保留
|
||||
*/
|
||||
@@ -160,8 +139,9 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
|
||||
* 展示限速预警
|
||||
*
|
||||
* @param limitingSpeed 限速速度
|
||||
* @param limitSpeedSource 限速来源 1:MAP, 2:RSU
|
||||
*/
|
||||
fun showLimitingVelocity(limitingSpeed: Int)
|
||||
fun showLimitingVelocity(limitingSpeed: Int, limitSpeedSource: Int)
|
||||
|
||||
/**
|
||||
* 关闭限速预警
|
||||
@@ -202,11 +182,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
|
||||
*/
|
||||
fun showNoticeNormalData(normalData: NoticeNormalData?)
|
||||
|
||||
/**
|
||||
* 展示VIP标识
|
||||
*/
|
||||
fun vipIdentification(visible: Boolean)
|
||||
|
||||
fun startRoadCameraLive(flvUrl: String)
|
||||
|
||||
fun showNoSignView()
|
||||
@@ -215,10 +190,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
|
||||
|
||||
fun hideToolsView()
|
||||
|
||||
fun showMaskView()
|
||||
|
||||
fun hideMaskView()
|
||||
|
||||
/**
|
||||
* 加载全览模式图层
|
||||
*/
|
||||
@@ -261,12 +232,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
|
||||
*/
|
||||
fun showAdUpgradeStatus(ipcUpgradeStateInfo: IPCUpgradeStateInfo)
|
||||
|
||||
/**
|
||||
*注册工控机升级提示圆点View的回调
|
||||
* @param 提示圆点View
|
||||
*/
|
||||
fun registerUpgradeTipsCallback(tipsView: () -> View)
|
||||
|
||||
/**
|
||||
* 工控机重启返回结果
|
||||
* @param code
|
||||
@@ -284,8 +249,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
|
||||
|
||||
fun showVideoDialog(infList: List<Infrastructure>)
|
||||
|
||||
fun setBusOperationView(view:IOchBusView)
|
||||
|
||||
/**
|
||||
* 设置状态栏暗夜或明亮模式
|
||||
* 默认 light
|
||||
@@ -302,16 +265,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
|
||||
*/
|
||||
fun updateStatusBarLeftView(insert: Boolean, tag: String, viewGroup: ViewGroup)
|
||||
|
||||
/**
|
||||
* 设置司机端消息盒子是否展示
|
||||
*/
|
||||
fun updateDriverMsgBoxTipView(show: Boolean)
|
||||
|
||||
/**
|
||||
* 设置乘客端消息盒子是否展示
|
||||
*/
|
||||
fun updatePassengerMsgBoxTipView(show: Boolean)
|
||||
|
||||
/**
|
||||
* 更新(添加/删除)下载进度
|
||||
*/
|
||||
@@ -322,6 +275,16 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
|
||||
*/
|
||||
fun updateMfStatus(tag: String, status: Boolean)
|
||||
|
||||
/**
|
||||
* 设置司机端消息盒子是否展示
|
||||
*/
|
||||
fun updateDriverMsgBoxTipView(show: Boolean)
|
||||
|
||||
/**
|
||||
* 设置乘客端消息盒子是否展示
|
||||
*/
|
||||
fun updatePassengerMsgBoxTipView(show: Boolean)
|
||||
|
||||
/**
|
||||
* 调度弹窗展示
|
||||
*/
|
||||
|
||||
@@ -5,7 +5,6 @@ import android.content.Context;
|
||||
import com.alibaba.android.arouter.facade.template.IProvider;
|
||||
import com.mogo.eagle.core.function.api.map.marker.IMogoMarkerService;
|
||||
import com.mogo.map.location.IMogoGDLocationClient;
|
||||
import com.mogo.map.location.IMogoLocationClient;
|
||||
import com.mogo.map.marker.IMogoMarkerManager;
|
||||
import com.mogo.map.overlay.IMogoOverlayManager;
|
||||
import com.mogo.map.uicontroller.IMogoMapUIController;
|
||||
@@ -17,15 +16,6 @@ import com.mogo.map.uicontroller.IMogoMapUIController;
|
||||
* 地图对外接口
|
||||
*/
|
||||
public interface IMogoMapService extends IProvider {
|
||||
|
||||
/**
|
||||
* 获取定位服务实例，全局唯一
|
||||
*
|
||||
* @param context
|
||||
* @return
|
||||
*/
|
||||
IMogoLocationClient getSingletonLocationClient(Context context);
|
||||
|
||||
/**
|
||||
* marker 操作
|
||||
*
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.mogo.eagle.core.function.api.obu
|
||||
|
||||
|
||||
/**
|
||||
* @author lixiaopeng
|
||||
* @date 2022/1/30 10：28 下午
|
||||
* OBU 灯态信息
|
||||
*/
|
||||
interface IMoGoObuTrafficLightListener {
|
||||
/**
|
||||
* @param light 灯的信息
|
||||
*/
|
||||
fun onObuTrafficLight(light: Int){}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.mogo.eagle.core.function.api.obucombine
|
||||
|
||||
import mogo.v2x.ObuWarningEvent
|
||||
|
||||
/**
|
||||
* obu和dc 通道打通融合
|
||||
*/
|
||||
interface IMoGoObuDcCombineListener {
|
||||
|
||||
/**
|
||||
* obu透传v2i数据，（标牌，弱势交通，红绿灯，限速，道路危险状况）
|
||||
* @param obuWarningData
|
||||
*/
|
||||
fun onMoGoObuDcCombineData(obuWarningData: ObuWarningEvent.ObuWarningData?)
|
||||
|
||||
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
package com.mogo.eagle.core.function.api.trafficlight
|
||||
|
||||
import android.content.Context
|
||||
import com.mogo.eagle.core.data.trafficlight.TrafficLightControl
|
||||
import com.mogo.eagle.core.data.trafficlight.TrafficLightDetail
|
||||
import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
|
||||
|
||||
interface ITrafficLightProvider : IMoGoFunctionServerProvider {
|
||||
|
||||
fun initTrafficLightServer(context: Context)
|
||||
|
||||
/**
|
||||
* 获取当前红绿灯数据状态
|
||||
*/
|
||||
fun getTrafficLightCurrentState(): TrafficLightDetail?
|
||||
|
||||
/**
|
||||
* 变灯
|
||||
*/
|
||||
fun turnLightToGreen(
|
||||
lightId: Int,
|
||||
crossingNo: String,
|
||||
heading: Double,
|
||||
controlTime:Int,
|
||||
onSuccess: ((TrafficLightControl) -> Unit),
|
||||
onError: ((String) -> Unit)
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.mogo.eagle.core.function.api.v2x
|
||||
|
||||
import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
|
||||
|
||||
interface IV2XEventProvider: IMoGoFunctionServerProvider {
|
||||
fun queryWholeRoadEvents()
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package com.mogo.eagle.core.function.api.v2x
|
||||
|
||||
/**
|
||||
* 限速信息
|
||||
*/
|
||||
interface ObuLimitingSpeedListener {
|
||||
fun onObuLimitingSpeedChange(limitingSpeed: Int)
|
||||
}
|
||||
Reference in New Issue
Block a user