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

Merge remote-tracking branch 'origin/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.0

Browse Source
This commit is contained in:
yangyakun
2024-09-29 15:08:28 +08:00
parent 8334079c08 c9178d6749
commit 54a860b3cf
24 changed files with 130 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
View File

@@ -36,7 +36,6 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxType
import com.mogo.eagle.core.data.msgbox.MsgCategory
import com.mogo.eagle.core.data.msgbox.RecordBagMsg
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatisticsListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisStatesListener
@@ -84,7 +83,7 @@ import kotlin.math.abs
internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordListener,
IMoGoChassisLocationGCJ02Listener, IMsgBoxListener, IMoGoDevaToolsListener,
IMogoStatusChangedListener, IMoGoMapScreenListener , IMoGoFsm2024Listener,
IMoGoAutopilotStatisticsListener, IMoGoChassisStatesListener, IMoGoAutopilotStatusListener,
IMoGoChassisStatesListener, IMoGoAutopilotStatusListener,
IDataCenterBizListener {
const val TAG = "BadCase"
@@ -127,7 +126,6 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis
.registerStatusChangedListener(TAG, StatusDescriptor.CLOUD_SOCKET, this)
if(ProjectUtils.isSaas()){
// CallerFsm2024ListenerManager.addListener(TAG,this)
CallerAutopilotStatisticsListenerManager.addListener(TAG,this)
CallerDataCenterBizListener.addListener(TAG,this)
CallerAutoPilotStatusListenerManager.addListener("RecordViewManager",this)
CallerChassisStatesListenerManager.addListener(TAG,this)
@@ -601,36 +599,6 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis
// }
}
/**
* 启动自动驾驶状态统计
* 触发机制：下发启动自动驾驶命令，根据MAP返回状态判断成功或失败
* 统计四种状态：成功 失败 取消 超时
* @param statistics 统计数据
*/
override fun onAutopilotStatistics(statistics: AutopilotStatistics?) {
statistics?.let {
Log.i(TAG,"onAutopilotStatistics status = "+ it.status)
// if(it.status == AutopilotStatistics.AUTOPILOT_START_STATUS.FAILED){
//触发一键上报
// ThreadUtils.runOnUiThread{
// val activity = AppStateManager.currentActivity()
// if (activity !is AppCompatActivity) {
// return@runOnUiThread
// }
// if(reportTypeWindow == null){
// reportTypeWindow = ReportTypeWindow(activity)
// reportTypeWindow?.setClickListener(object: ReportTypeWindow.ClickListener{
// override fun closeWindow() {
// reportTypeWindow?.hideFloatWindow()
// reportTypeWindow = null
// }
// })
// }
// reportTypeWindow?.showOneClickReportWindow(xPosition,yPosition)
// }
// }
}
}
/**
* 刹车

1
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt
View File

@@ -153,6 +153,7 @@ class BoneTabLayout @JvmOverloads constructor(
reportTypeView.showTypeSelectView()
} else {
reportTypeView.visibility = GONE
reportTypeView.hideTypeSelectView()
}
}

16
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/MsgBoxTabView.kt
View File

@@ -75,7 +75,7 @@ class MsgBoxTabView @JvmOverloads constructor(
badCaseList = badCaseList?.let { ArrayList(it.reversed()) }
//通知
tvMsgNotice.setOnClickListener {
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
@@ -96,7 +96,7 @@ class MsgBoxTabView @JvmOverloads constructor(
//FM信息
tvMsgFm.setOnClickListener {
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgNotice.background = null
@@ -116,7 +116,7 @@ class MsgBoxTabView @JvmOverloads constructor(
tvMsgIpcReport.setOnClickListener {
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgNotice.background = null
tvMsgFm.background = null
@@ -137,7 +137,7 @@ class MsgBoxTabView @JvmOverloads constructor(
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgNotice.background = null
tvMsgFm.background = null
tvMsgIpcReport.background = null
@@ -159,7 +159,7 @@ class MsgBoxTabView @JvmOverloads constructor(
when(MsgBoxConfig.getUserRecord()){
//通知消息
0 ->{
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
@@ -178,7 +178,7 @@ class MsgBoxTabView @JvmOverloads constructor(
//FM消息
1->{
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgNotice.background = null
@@ -197,7 +197,7 @@ class MsgBoxTabView @JvmOverloads constructor(
2 ->{
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgNotice.background = null
tvMsgFm.background = null
@@ -216,7 +216,7 @@ class MsgBoxTabView @JvmOverloads constructor(
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgNotice.background = null
tvMsgFm.background = null
tvMsgIpcReport.background = null

60
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ReportTypeView.kt
View File

@@ -6,6 +6,7 @@ import android.os.Handler
import android.os.Looper
import android.os.SystemClock
import android.util.AttributeSet
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
@@ -20,17 +21,18 @@ import com.mogo.eagle.core.data.app.AppConfigInfo
import com.mogo.eagle.core.data.deva.report.CategoryInfo
import com.mogo.eagle.core.data.deva.report.PadAddProblemReq
import com.mogo.eagle.core.data.deva.report.PadProblemInfo
import com.mogo.eagle.core.function.api.autopilot.IMoGoTakeoverListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatisticsListener
import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotStatisticsListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerTakeoverListenerManager
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.zhjt.mogo.adas.data.bean.AutopilotStatistics
import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig
import kotlinx.android.synthetic.main.view_report_type.view.ivOneClickReport
import kotlinx.android.synthetic.main.view_report_type.view.oneClickGroup
@@ -52,11 +54,10 @@ class ReportTypeView @JvmOverloads constructor(
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : ConstraintLayout(context, attrs, defStyleAttr),
IMoGoDevaToolsListener {
IMoGoDevaToolsListener, IMoGoAutopilotStatisticsListener {
private val TAG = "ReportTypeView"
private var isOneClickType: Boolean = false //是否是一键上报类型
private var hasReportOperate: Boolean = false //是否点击了一键上报按钮
private var oneClickTimer: CountDownTimer?= null
@@ -74,6 +75,7 @@ class ReportTypeView @JvmOverloads constructor(
private var level: Int = 1
private var canOneReport: Boolean = false //是否可以一键上报
private var typeSelectStatus: Boolean = false //当前视图是否是类型选择视图
init {
LayoutInflater.from(context).inflate(R.layout.view_report_type, this, true)
@@ -81,12 +83,6 @@ class ReportTypeView @JvmOverloads constructor(
}
private fun initView(){
CallerDevaToolsListenerManager.addListener(TAG, this)
if(isOneClickType){
showOneCLickReportView()
}else{
showTypeSelectView()
}
//一键上报
ivOneClickReport.setOnClickListener {
if(!canOneReport){
@@ -156,14 +152,28 @@ class ReportTypeView @JvmOverloads constructor(
}
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
CallerDevaToolsListenerManager.addListener(TAG, this)
CallerAutopilotStatisticsListenerManager.addListener(TAG,this)
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
CallerDevaToolsListenerManager.removeListener(TAG)
CallerAutopilotStatisticsListenerManager.removeListener(TAG)
}
/**
* 展示一键上报视图
*/
private fun showOneCLickReportView(){
this@ReportTypeView.visibility = View.VISIBLE
oneClickGroup.visibility = View.VISIBLE
reportTypeGroup.visibility = View.GONE
tvReportSuccess.visibility = View.GONE
tvOneClickReportTitle.text = String.format(resources.getString(R.string.identified_vehicle_malfunction),5)
oneClickTimer?.cancel()
oneClickTimer = object : CountDownTimer(5000, 1000) {
override fun onTick(count: Long) {
ThreadUtils.runOnUiThread {
@@ -176,7 +186,6 @@ class ReportTypeView @JvmOverloads constructor(
if(!hasReportOperate){
ThreadUtils.runOnUiThread {
this@ReportTypeView.visibility = View.GONE
clickListener?.closeReportView()
}
}
}
@@ -191,6 +200,15 @@ class ReportTypeView @JvmOverloads constructor(
oneClickGroup.visibility = View.GONE
reportTypeGroup.visibility = View.VISIBLE
tvReportSuccess.visibility = View.GONE
oneClickTimer?.cancel()
typeSelectStatus = true
}
/**
* 隐藏类型选择视图
*/
fun hideTypeSelectView(){
typeSelectStatus = false
}
/**
@@ -267,4 +285,24 @@ class ReportTypeView @JvmOverloads constructor(
this.clickListener = clickListener
}
/**
* 启动自动驾驶状态统计
* 触发机制：下发启动自动驾驶命令，根据MAP返回状态判断成功或失败
* 统计四种状态：成功 失败 取消 超时
* @param statistics 统计数据
*/
override fun onAutopilotStatistics(statistics: AutopilotStatistics?) {
statistics?.let{
Log.i(TAG,"onAutopilotStatistics status = "+ it.status)
if(it.status == AutopilotStatistics.AUTOPILOT_START_STATUS.FAILED){
//触发一键上报
ThreadUtils.runOnUiThread {
if(!typeSelectStatus){
showOneCLickReportView()
}
}
}
}
}
}

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt
View File

@@ -172,7 +172,7 @@ class CameraListView : FrameLayout {
}
})
progressBar.indeterminateDrawable.colorFilter = PorterDuffColorFilter(
ContextCompat.getColor(context, R.color.notice_blue),
ContextCompat.getColor(context, R.color.color_2B6EFF),
PorterDuff.Mode.MULTIPLY
)
// 后期可改为动态获取3s起始位置，暂时写死

3
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadCrossLiveView.kt
View File

@@ -20,7 +20,6 @@ import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP
import com.mogo.eagle.core.utilcode.util.ThreadUtils
@@ -73,7 +72,7 @@ class RoadCrossLiveView @JvmOverloads constructor(
LayoutInflater.from(context).inflate(res, this, true)
initVideoPlayer()
roadCrossLivePB.indeterminateDrawable.colorFilter = PorterDuffColorFilter(
ContextCompat.getColor(context, R.color.notice_blue),
ContextCompat.getColor(context, R.color.color_2B6EFF),
PorterDuff.Mode.MULTIPLY
)
roadCrossLiveClose.setOnClickListener {

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt
View File

@@ -63,7 +63,7 @@ class RoadVideoDialog(context: Context) : BaseFloatDialog(context), LifecycleObs
init {
setContentView(R.layout.road_video_dialog)
roadVideoPB.indeterminateDrawable.colorFilter = PorterDuffColorFilter(
ContextCompat.getColor(context, R.color.notice_blue),
ContextCompat.getColor(context, R.color.color_2B6EFF),
PorterDuff.Mode.MULTIPLY
)
setCanceledOnTouchOutside(false)

16
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt
View File

@@ -68,7 +68,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
badCaseList = badCaseList?.let { ArrayList(it.reversed()) }
//通知
tvMsgNotice.setOnClickListener {
tvMsgNotice.setTextColor(resources.getColor(R.color.msg_box_title_color))
tvMsgNotice.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
@@ -89,7 +89,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
//FM信息
tvMsgFm.setOnClickListener {
tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgFm.setTextColor(resources.getColor(R.color.msg_box_title_color))
tvMsgFm.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
viewNoticeDivider.visibility = View.GONE
@@ -109,7 +109,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
tvMsgIpcReport.setOnClickListener {
tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.msg_box_title_color))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
viewNoticeDivider.visibility = View.GONE
viewFmDivider.visibility = View.GONE
@@ -130,7 +130,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(resources.getColor(R.color.msg_box_title_color))
tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
viewNoticeDivider.visibility = View.GONE
viewFmDivider.visibility = View.GONE
viewIpcReportDivider.visibility = View.GONE
@@ -152,7 +152,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
when(MsgBoxConfig.getUserRecord()){
//通知消息
0 ->{
tvMsgNotice.setTextColor(resources.getColor(R.color.msg_box_title_color))
tvMsgNotice.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
@@ -171,7 +171,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
//FM消息
1->{
tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgFm.setTextColor(resources.getColor(R.color.msg_box_title_color))
tvMsgFm.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
viewNoticeDivider.visibility = View.GONE
@@ -190,7 +190,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
2 ->{
tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.msg_box_title_color))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
viewNoticeDivider.visibility = View.GONE
viewFmDivider.visibility = View.GONE
@@ -209,7 +209,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(resources.getColor(R.color.msg_box_title_color))
tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
viewNoticeDivider.visibility = View.GONE
viewFmDivider.visibility = View.GONE
viewIpcReportDivider.visibility = View.GONE

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt
View File

@@ -161,7 +161,7 @@ class NoticeTrafficDialog : BaseFloatDialog, LifecycleObserver {
mRecyclerView?.layoutManager = staggeredGridLayoutManager
val gridLayoutDivider = NoticeTrafficInfoGridItemDivider(
1,
mContext!!.resources.getColor(R.color.notice_check_dialog_bg_color)
mContext!!.resources.getColor(R.color.color_E63B4577)
)
mRecyclerView?.addItemDecoration(gridLayoutDivider)
} catch (e: Exception) {

13
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.kt
View File

@@ -10,7 +10,6 @@ import android.widget.ImageView
import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout
import chassis.Chassis.GearPosition
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisStatesListener
@@ -65,18 +64,18 @@ class SteeringWheelView : ConstraintLayout, IMoGoChassisStatesListener {
tapPositionView = findViewById(R.id.tap_position)
steeringCircularV = findViewById(R.id.steering_circular)
steeringCircularV?.setBackWidth(8)
steeringCircularV?.setBackColor(R.color.hmi_light_back_bg)
steeringCircularV?.setBackColor(R.color.color_1EBBCFF6)
steeringCircularV?.setProgress((0 * 100) / 360, 20)
steeringCircularV?.setProgColor(R.color.hmi_light_blue, R.color.hmi_dark_blue)
steeringCircularV?.setProgColor(R.color.color_45D3FF, R.color.color_1B5BFF)
if (isTaxi(FunctionBuildConfig.appIdentityMode)) {
steeringCircularVAlpha = findViewById(R.id.steering_circular_alpha)
steeringCircularVAlpha?.setProgress((0 * 100) / 360, 20)
steeringCircularV?.setProgColor(R.color.hmi_dark_blue, R.color.hmi_light_blue)
steeringCircularV?.setProgColor(R.color.color_1B5BFF, R.color.color_45D3FF)
steeringCircularVAlpha?.setBackWidth(8)
steeringCircularVAlpha?.setBackColor(R.color.hmi_clear_00)
steeringCircularVAlpha?.setBackColor(R.color.color_00FFFFFF)
steeringCircularVAlpha?.setProgColor(
R.color.hmi_light_blue_alpha_ff,
R.color.hmi_light_blue_alpha_00
R.color.color_D93261B6,
R.color.color_D945D3FF
)
steeringCircularVAlpha?.setBlurMaskFilter(BlurMaskFilter.Blur.NORMAL, 12f)
}

2
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_dialog_btn.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/color_4D_000000"/>
<solid android:color="@color/color_4D000000"/>
<corners android:radius="@dimen/dp_30"/>
</shape>

2
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_outer_taxi.xml
View File

@@ -6,7 +6,7 @@
android:shape="ring"
android:thickness="7.2dp"
android:useLevel="false">
<solid android:color="#1EBBCFF6" />
<solid android:color="@color/color_1EBBCFF6" />
</shape>
</item>

2
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_tab_car_no.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/color_4D_000000" />
<solid android:color="@color/color_4D000000" />
<corners android:radius="@dimen/dp_10" />
</shape>

2
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_connect.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/notice_blue" />
<solid android:color="@color/color_2B6EFF" />
<corners android:radius="@dimen/dp_50" />
</shape>

2
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_dialog_check_background.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/notice_check_dialog_bg_color" />
<solid android:color="@color/color_E63B4577" />
<corners android:radius="@dimen/notice_dialog_check_bg_corner" />
</shape>

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_list.xml
View File

@@ -11,7 +11,7 @@
android:layout_width="@dimen/dp_216"
android:layout_height="@dimen/dp_90"
android:text="通知"
android:textColor="@color/msg_box_title_color"
android:textColor="@color/color_FF1BB7FF"
android:textSize="@dimen/sp_38"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"

6
core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml
View File

@@ -98,7 +98,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginBottom="@dimen/dp_150"
android:background="@color/notice_traffic_line"
android:background="@color/color_555C7E"
app:layout_constraintBottom_toBottomOf="parent"
app:riv_corner_radius="@dimen/dp_20" />
@@ -106,7 +106,7 @@
android:id="@+id/traffic_middle_line"
android:layout_width="2dp"
android:layout_height="@dimen/dp_150"
android:background="@color/notice_traffic_line"
android:background="@color/color_555C7E"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
@@ -118,7 +118,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="接 受"
android:textColor="@color/notice_text_blue"
android:textColor="@color/color_1F9BFE"
android:textSize="@dimen/dp_50"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_push_top_banner.xml
View File

@@ -85,7 +85,7 @@
android:focusable="true"
android:gravity="center"
android:text="查看"
android:textColor="@color/notice_banner_blue"
android:textColor="@color/color_5A8EFD"
android:textSize="@dimen/dp_42"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@+id/notice_banner_line"

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_acceleration_float.xml
View File

@@ -16,7 +16,7 @@
<com.mogo.eagle.core.widget.RoundConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/dialog_bg_color"
android:background="@color/color_3B4577"
app:roundLayoutRadius="10dp">
<androidx.recyclerview.widget.RecyclerView

26
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml
View File

@@ -33,18 +33,6 @@
app:layout_constraintTop_toTopOf="parent"
/>
<com.mogo.eagle.core.function.hmi.bone.tab.ReportTypeView
android:id="@+id/reportTypeView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="@dimen/dp_270"
android:layout_marginBottom="@dimen/dp_170"
/>
<com.mogo.eagle.core.function.hmi.bone.tab.FaultReasonView
android:id="@+id/faultReasonView"
android:layout_width="@dimen/dp_960"
@@ -76,6 +64,20 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.eagle.core.function.hmi.bone.tab.ReportTypeView
android:id="@+id/reportTypeView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="@dimen/dp_270"
android:layout_marginBottom="@dimen/dp_170"
android:elevation="@dimen/dp_100"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_camera_list.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/notice_check_dialog_bg_color"
android:background="@color/color_E63B4577"
android:minWidth="882dp"
android:minHeight="550dp"
app:roundLayoutRadius="30dp">

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_msg_box_tab.xml
View File

@@ -20,7 +20,7 @@
android:layout_width="@dimen/dp_154"
android:layout_height="@dimen/dp_113"
android:text="@string/msg_box_title_notice"
android:textColor="@color/msg_box_tab_title_color"
android:textColor="@color/color_FF2EACFF"
android:textSize="@dimen/sp_40"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"

68
core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
View File

@@ -1,50 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="module_main_window_background_color">#212831</color>
<color name="notice_blue">#2B6EFF</color>
<color name="notice_text_blue">#1F9BFE</color>
<color name="notice_banner_blue">#5A8EFD</color>
<color name="notice_check_dialog_bg_color">#E63B4577</color>
<color name="notice_traffic_line">#555C7E</color>
<color name="notice_video_progressbar_loading_color">#256BFF</color>
<color name="msg_box_title_color">#FF1BB7FF</color>
<color name="msg_box_tab_title_color">#FF2EACFF</color>
<color name="colorPrimary">#6200EE</color>
<color name="colorPrimaryDark">#3700B3</color>
<color name="colorAccent">#03DAC5</color>
<color name="color_000000">#000000</color>
<color name="color_4D_000000">#4D000000</color>
<color name="color_3B4577">#3B4577</color>
<color name="color_8F0005">#8F0005</color>
<color name="color_1C1C1C">#1C1C1C</color>
<color name="color_161618">#161618</color>
<color name="color_2EACFF">#2EACFF</color>
<color name="color_FF0006">#FF0006</color>
<color name="color_0099dd">#0099dd</color>
<color name="color_FFFFFF">#FFFFFF</color>
<color name="color_1C1C1C">#1C1C1C</color>
<color name="color_131415">#131415</color>
<color name="color_161618">#161618</color>
<color name="color_1B5BFF">#1B5BFF</color>
<color name="color_2B6EFF">#2B6EFF</color>
<color name="color_2C2E30">#2C2E30</color>
<color name="color_2D3E5F">#2D3E5F</color>
<color name="color_D4D8DC">#D4D8DC</color>
<color name="color_50E8E4">#50E8E4</color>
<color name="color_2E323A">#2E323A</color>
<color name="color_2EACFF">#2EACFF</color>
<color name="color_252B3F">#252B3F</color>
<color name="color_131415">#131415</color>
<color name="color_3B3D44">#3B3D44</color>
<color name="color_3B4577">#3B4577</color>
<color name="color_45D3FF">#45D3FF</color>
<color name="color_50E8E4">#50E8E4</color>
<color name="color_5A8EFD">#5A8EFD</color>
<color name="color_555C7E">#555C7E</color>
<color name="color_8F0005">#8F0005</color>
<color name="color_FF0006">#FF0006</color>
<color name="color_FFFFFF">#FFFFFF</color>
<color name="color_D4D8DC">#D4D8DC</color>
<color name="color_B2BED9">#B2BED9</color>
<color name="color_FF1943">#FF1943</color>
<color name="color_3B3D44">#3B3D44</color>
<color name="color_2E323A">#2E323A</color>
<color name="color_00FFFFFF">#00FFFFFF</color>
<color name="color_FF1BB7FF">#FF1BB7FF</color>
<color name="color_FF2EACFF">#FF2EACFF</color>
<color name="color_E63B4577">#E63B4577</color>
<color name="color_FF6E8EC9">#FF6E8EC9</color>
<color name="color_666C6C6C">#666C6C6C</color>
<color name="color_27FFFFFF">#27FFFFFF</color>
<color name="color_1E111111">#1E111111</color>
<color name="color_1EBBCFF6">#1EBBCFF6</color>
<color name="color_FF213757">#FF213757</color>
<color name="color_CC5C71AB">#335C71AB</color>
<color name="color_FF384D6E">#FF384D6E</color>
<color name="color_80FFFFFF">#80FFFFFF</color>
<color name="color_CCFFFFFF">#CCFFFFFF</color>
<color name="color_E6FFFFFF">#E6FFFFFF</color>
<color name="color_D945D3FF">#D945D3FF</color>
<color name="color_D93261B6">#D93261B6</color>
<color name="background_wtf">#FF999900</color>
<color name="background_error">#FFCC0000</color>
@@ -60,28 +59,11 @@
<color name="foreground_info">#FF333333</color>
<color name="foreground_warn">#FFCCCCCC</color>
<color name="dialog_bg_color">#3B4577</color>
<color name="turn_light_bg_taxi_p">#FFCEDCF7</color>
<color name="hmi_traffic_light_red_color_up">#FFFFA28B</color>
<color name="hmi_traffic_light_red_color_down">#FFDA1100</color>
<color name="hmi_traffic_light_green_color_up">#FF60FFD3</color>
<color name="hmi_traffic_light_green_color_down">#FF006D43</color>
<color name="hmi_traffic_light_yellow_color_up">#FFFFE198</color>
<color name="hmi_traffic_light_yellow_color_down">#FFFF9B00</color>
<color name="hmi_light_blue">#45D3FF</color>
<color name="hmi_dark_blue">#1B5BFF</color>
<color name="hmi_light_back_bg">#1EBBCFF6</color>
<color name="hmi_light_blue_alpha_00">#D945D3FF</color>
<color name="hmi_light_blue_alpha_ff">#D93261B6</color>
<color name="hmi_clear_00">#00FFFFFF</color>
<color name="acc_default_txt_color">#FF343C63</color>
<color name="bus_p_select_txt_color">#0043FF</color>
<color name="hmi_check_keyboard_input_field">#FF282F62</color>
<color name="bus_autopilot_text_color_normal">#FFFFFF</color>
<color name="dialog_bg_color_90_percent">#E63B4577</color>
<color name="voice_user_start">#FF005EA0</color>
<color name="voice_user_end">#FF1E32D9</color>
@@ -97,7 +79,7 @@
<color name="summary_tip">#6A758D</color>
<color name="summary_tip_p">#42464F</color>
<color name="light_prompt_content">#131415 </color>
<color name="light_prompt_content">#131415</color>
<color name="light_prompt_red">#FF3B2D</color>
<color name="light_prompt_green">#31FF56</color>
<color name="light_prompt_yellow">#FFCD3D</color>

2
core/mogo-core-res/src/main/res/layout/item_notice_video.xml
View File

@@ -90,7 +90,7 @@
android:layout_height="@dimen/notice_loading_bt"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:indeterminateTint="#256BFF"
android:indeterminateTint="@color/color_256BFF"
android:visibility="gone" />
</RelativeLayout>