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/view/SweeperLimitingVelocityView.kt # OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java # OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
package com.mogo.eagle.core.function.api.autopilot
|
||||
|
||||
import chassis.ChassisStatesOuterClass
|
||||
import chassis.VehicleStateOuterClass
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.mogo.eagle.core.function.api.datacenter
|
||||
|
||||
import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
|
||||
|
||||
interface IDataCenterProvider: IMoGoFunctionServerProvider {
|
||||
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import android.content.Context
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import com.alibaba.android.arouter.facade.template.IProvider
|
||||
import com.mogo.eagle.core.data.EnvConfig
|
||||
import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo
|
||||
import com.mogo.eagle.core.data.deva.chain.ChainLogParam
|
||||
import com.mogo.eagle.core.data.deva.scene.SceneModule
|
||||
@@ -157,4 +158,6 @@ interface IDevaToolsProvider : IProvider {
|
||||
* 查询app是否有更新
|
||||
*/
|
||||
fun queryAppUpgrade()
|
||||
|
||||
fun getEnvConfig(): EnvConfig?
|
||||
}
|
||||
@@ -1,7 +1,5 @@
|
||||
package com.mogo.eagle.core.function.api.hmi
|
||||
|
||||
import com.mogo.eagle.core.function.api.hmi.view.IViewLimitingVelocity
|
||||
import com.mogo.eagle.core.function.api.hmi.view.IViewNotification
|
||||
import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight
|
||||
|
||||
/**
|
||||
@@ -15,10 +13,4 @@ interface IMoGoHmiViewProxy {
|
||||
*/
|
||||
fun setProxyTrafficLightView(view: IViewTrafficLight)
|
||||
|
||||
/**
|
||||
* 设置 限速 代理View
|
||||
* @param view
|
||||
*/
|
||||
fun setProxyLimitingSpeedView(view: IViewLimitingVelocity)
|
||||
|
||||
}
|
||||
@@ -5,12 +5,8 @@ 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"
|
||||
const val LimitingVelocityView_TAG = "LimitingVelocityView_TAG"
|
||||
}
|
||||
|
||||
/** --------- View --------- **/
|
||||
|
||||
@@ -1,19 +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 IViewLimitingVelocity(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) :
|
||||
LinearLayout(context, attrs, defStyleAttr) {
|
||||
|
||||
/**
|
||||
* 更新限速数据
|
||||
* @param limitingSpeed 限速值,单位:km/h
|
||||
* @param limitSource 限速来源 1:MAP, 2:RSU
|
||||
*/
|
||||
open fun updateLimitingSpeed(limitingSpeed: Int, limitSource: Int) {}
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.mogo.eagle.core.function.api.hmi.warning
|
||||
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
|
||||
import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean
|
||||
@@ -22,38 +21,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
|
||||
*/
|
||||
fun displayEffects()
|
||||
|
||||
/**
|
||||
* 隐藏 脉速表
|
||||
* @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
|
||||
*/
|
||||
fun setSpeedChartViewVisibility(visibility: Int)
|
||||
|
||||
/**
|
||||
* 隐藏 红绿灯UI
|
||||
* @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
|
||||
*/
|
||||
fun setTrafficLightVrVisibility(visibility: Int)
|
||||
|
||||
/**
|
||||
* 隐藏 自动驾驶触发 按钮
|
||||
* @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
|
||||
*/
|
||||
fun setAutopilotStatusViewVisibility(visibility: Int)
|
||||
|
||||
/**
|
||||
* 隐藏 切换视角 按钮
|
||||
* @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
|
||||
*/
|
||||
fun setPerspectiveSwitchViewVisibility(visibility: Int)
|
||||
|
||||
/**
|
||||
* 隐藏 工具箱 按钮
|
||||
* @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
|
||||
*/
|
||||
fun setToolsViewVisibility(visibility: Int)
|
||||
|
||||
fun setCameraViewVisibility(visibility: Int)
|
||||
|
||||
/**
|
||||
* 控制转向灯
|
||||
*/
|
||||
@@ -135,19 +102,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
|
||||
*/
|
||||
fun changeCountdownTrafficLightNum(readNum: Int, yellowNum: Int, greenNum: Int)
|
||||
|
||||
/**
|
||||
* 展示限速预警
|
||||
*
|
||||
* @param limitingSpeed 限速速度
|
||||
* @param limitSpeedSource 限速来源 1:MAP, 2:RSU
|
||||
*/
|
||||
fun showLimitingVelocity(limitingSpeed: Int, limitSpeedSource: Int)
|
||||
|
||||
/**
|
||||
* 关闭限速预警
|
||||
*/
|
||||
fun disableLimitingVelocity()
|
||||
|
||||
/**
|
||||
* 展示指定方位上的红框预警
|
||||
* @param direction
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.mogo.eagle.core.function.api.msgbox
|
||||
/**
|
||||
* @author XuXinChao
|
||||
* @date 2023/1/16
|
||||
* 消息盒子事件监听回调
|
||||
*/
|
||||
interface IMsgBoxEventListener {
|
||||
fun onSummaryClickEvent()
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.mogo.eagle.core.function.api.startup
|
||||
|
||||
import com.alibaba.android.arouter.facade.template.IProvider
|
||||
|
||||
interface IStartUpProvider: IProvider {
|
||||
fun initStageOne()
|
||||
|
||||
fun initStageTwo()
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.mogo.eagle.core.function.api.v2x
|
||||
|
||||
import com.mogo.eagle.core.data.enums.DataSourceType
|
||||
|
||||
/**
|
||||
* 限速信息回掉
|
||||
*/
|
||||
interface ILimitingVelocityListener {
|
||||
fun onLimitingVelocityChange(limitingVelocity: Int,sourceType: DataSourceType)
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
package com.mogo.eagle.core.function.api.v2x
|
||||
|
||||
/**
|
||||
* 限速信息回掉
|
||||
*/
|
||||
interface LimitingVelocityListener {
|
||||
fun onLimitingVelocityChange(limitingVelocity: Int)
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
package com.mogo.eagle.core.function.api.v2x
|
||||
|
||||
/**
|
||||
* 限速信息
|
||||
*/
|
||||
interface ObuLimitingSpeedListener {
|
||||
fun onObuLimitingSpeedChange(limitingSpeed: Int)
|
||||
}
|
||||
Reference in New Issue
Block a user