yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0

Browse Source 
# Conflicts:
#	OCH/mogo-och-sweeper/build.gradle
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	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/fragment/SweeperFragment.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/presenter/SweeperPresenter.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
#	OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
This commit is contained in:
donghongyu
2023-02-08 14:40:42 +08:00
parent 4e2dee116a a1506c731c
commit f4507a7d0f
314 changed files with 5403 additions and 6632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotActionsListener.kt
View File

@@ -1,7 +1,5 @@
package com.mogo.eagle.core.function.api.autopilot
import com.zhidao.support.adas.high.bean.AutopilotAbility
/**
* pnc actions 决策 驾驶的意图
@@ -11,5 +9,5 @@ interface IMoGoAutopilotActionsListener {
/**
* pnc actions 决策 驾驶的意图
*/
fun onAutopilotAbility(ability: AutopilotAbility?)
fun onAutopilotAbility(isAutopilotAbility: Boolean, unableAutopilotReason: String?)
}

9
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt → core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotControlProvider.kt
View File

@@ -10,7 +10,7 @@ import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
* @date 2021/9/22 8:27 下午
* 自动驾驶节点
*/
interface IMoGoAutopilotProvider : IMoGoFunctionServerProvider {
interface IMoGoAutopilotControlProvider : IMoGoFunctionServerProvider {
/**
* 重新连接自动驾驶域控制器，指定IP地址
*
@@ -283,4 +283,11 @@ interface IMoGoAutopilotProvider : IMoGoFunctionServerProvider {
* 福田清扫车业务指令下发
*/
fun sendSweeperFuTianTaskCmd(fuTianTaskCmd: SpecialVehicleTaskCmdOuterClass.RoboSweeperFuTianTaskCmd)
/**
* 打开点云绘制
*
* @param isDrawPointCloud 是否绘制点云
*/
fun setIsDrawPointCloud(isDrawPointCloud: Boolean)
}

18
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoChassisGnssListener.kt Normal file
View File

@@ -0,0 +1,18 @@
package com.mogo.eagle.core.function.api.autopilot
import mogo.telematics.pad.MessagePad
/**
* 车辆定位 WGS84 坐标系-高精度坐标系 数据 回调监听
* @author donghongyu
* @date 2023/1/11 2:06 下午
*/
interface IMoGoChassisGnssListener {
/**
* 车辆定位 GCJ02 坐标系-高德坐标系 数据
*
* @param gnssInfo
*/
fun onChassisGnss(gnssInfo: MessagePad.GnssInfo)
}

4
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoChassisLocationGCJ02Listener.kt
View File

@@ -1,6 +1,6 @@
package com.mogo.eagle.core.function.api.autopilot
import mogo.telematics.pad.MessagePad
import com.mogo.eagle.core.data.map.MogoLocation
/**
* @author donghongyu
@@ -14,5 +14,5 @@ interface IMoGoChassisLocationGCJ02Listener {
*
* @param gnssInfo
*/
fun onChassisLocationGCJ02(gnssInfo: MessagePad.GnssInfo?)
fun onChassisLocationGCJ02(mogoLocation: MogoLocation?)
}

6
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoChassisLocationWGS84Listener.kt
View File

@@ -1,11 +1,11 @@
package com.mogo.eagle.core.function.api.autopilot
import mogo.telematics.pad.MessagePad
import com.mogo.eagle.core.data.map.MogoLocation
/**
* 车辆定位 WGS84 坐标系-高精度坐标系 数据 回调监听
* @author donghongyu
* @date 2023/1/11 2:06 下午
* 车辆定位 WGS84 坐标系-高精度坐标系 数据 回调监听
*/
interface IMoGoChassisLocationWGS84Listener {
@@ -14,5 +14,5 @@ interface IMoGoChassisLocationWGS84Listener {
*
* @param gnssInfo
*/
fun onChassisLocationWGS84(gnssInfo: MessagePad.GnssInfo)
fun onChassisLocationWGS84(gnssInfo: MogoLocation)
}

7
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt
View File

@@ -1,5 +1,6 @@
package com.mogo.eagle.core.function.api.biz
import android.content.Context
import com.mogo.eagle.core.data.camera.CameraEntity
import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
@@ -51,4 +52,10 @@ interface IMoGoFuncBizProvider : IMoGoFunctionServerProvider {
*/
fun closeCameraLive()
/*----------------------------------------全览模式----------------------------------------*/
fun fetchInfStructures()
fun getAllV2XEvents()
fun initOverViewDb(context: Context)
}

12
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt
View File

@@ -22,6 +22,8 @@ interface IDevaToolsProvider : IProvider {
*/
fun initBiz()
fun checkMonitorDb()
/**
* 开始抓取日志，默认10min
*/
@@ -160,4 +162,14 @@ interface IDevaToolsProvider : IProvider {
fun queryAppUpgrade()
fun getEnvConfig(): EnvConfig?
fun getEnvCityName():String
fun getEnvNetMode():String
fun envConfigReset()
fun envConfigChange(cityCode: String, netMode: Int)
fun dockerVersion(dockerVersion: String?)
}

104
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt
View File

@@ -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,53 +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?, tag: String?, listener: IMoGoWarningStatusListener?, playTts: Boolean, expireTime: Long)
/**
* 关闭指定floatTag 的 VR下V2X预警弹窗
* @param tag 弹窗标识
*/
fun disableWarningV2X(tag: String?)
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)
/**
* 主动消失边框预警
@@ -80,40 +47,35 @@ interface IMoGoHmiProvider {
*/
fun showNoticeNormalData(normalData: NoticeNormalData?)
/**
* 路侧直播，超视距感知
*/
fun startRoadCameraLive(flvUrl: String)
/**
* 超视距感知关闭
*/
fun showNoSignView()
/**
* 展示工具栏
*/
fun showToolsView()
/**
* 关闭工具栏
*/
fun hideToolsView()
/**
* 加载全览模式图层
*/
fun showSmallFragment()
fun hideSmallFragment()
/**
* 展示转向灯
*/
fun showTurnLight(light: Int)
/**
* 展示刹车灯
*/
fun showBrakeLight(brakeLight: Int)
/**
* 展示绑定车辆弹框
*/
fun showToBindingcarDialog()
fun showToBindingCarDialog()
/**
* 展示修改绑定车辆弹框
*/
fun showModifyBindingcarDialog()
fun showModifyBindingCarDialog()
/**
* 展示升级app弹框
@@ -130,13 +92,6 @@ interface IMoGoHmiProvider {
*/
fun showAdUpgradeStatus(ipcUpgradeStateInfo: IPCUpgradeStateInfo)
/**
* 工控机重启返回结果
* @param code
* @param msg
*/
fun showDockerRebootResult(code: Int,msg: String)
/**
* 展示工控机监控上报数据
* @param errorReportList 错误级别上报数据列表
@@ -145,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
@@ -173,14 +141,4 @@ interface IMoGoHmiProvider {
*/
fun updateMfStatus(tag: String, status: Boolean)
/**
* 调度弹窗展示
*/
fun showDispatchDialog(msgData: DispatchAdasAutoPilotLocReceiverBean)
/**
* 隐藏调度弹窗
*/
fun dismissDispatchDialog()
}

74
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/hd/IMoGoMapFragmentProvider.kt
View File

@@ -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)
}

2
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/setting/MoGoUiSettingProvider.kt
View File

@@ -25,7 +25,7 @@ interface MoGoUiSettingProvider {
/**
* 退出 皮肤 白天 模式
*/
fun stepOutDayMode()
fun stepInNightMode()
/**
* 获取 皮肤 模式

16
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IFuncBizProvider.kt Normal file
View File

@@ -0,0 +1,16 @@
package com.mogo.eagle.core.function.api.v2x
import com.mogo.eagle.core.data.map.Infrastructure
import com.mogo.eagle.core.data.v2x.V2XEvent
interface IFuncBizProvider {
/**
* 查询衡阳所有的摄像头数据
*/
fun onInfStructures(map: HashMap<String, ArrayList<Infrastructure>>?) {}
/**
* 根据lineId获取整条道路的V2X事件
*/
fun onV2XEvents(v2xEvents: List<V2XEvent>?) {}
}

5
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/ILimitingVelocityListener.kt
View File

@@ -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){}
}

4
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/trafficlight/IMoGoTrafficLightListener.kt → core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IMoGoTrafficLightListener.kt
View File

@@ -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){}
/**
* 展示红绿灯预警

2
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/vip/IMoGoVipSetListener.kt → core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IMoGoVipSetListener.kt
View File

@@ -1,4 +1,4 @@
package com.mogo.eagle.core.function.api.vip
package com.mogo.eagle.core.function.api.v2x
interface IMoGoVipSetListener {

10
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IV2XEventListener.kt Normal file
View File

@@ -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)
}