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

Merge branch 'dev_robotaxi-d_240912_6.7.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_240912_6.7.0

Browse Source
This commit is contained in:
aibingbing
2024-10-28 19:27:28 +08:00
parent ba24ee88d6 3e91c144d6
commit c38f988d85
13 changed files with 146 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -544,6 +544,7 @@ class FaultReasonView @JvmOverloads constructor(
override fun onVisibilityAggregated(isVisible: Boolean) {
super.onVisibilityAggregated(isVisible)
if(visibility == View.VISIBLE){
CallerDevaToolsListenerManager.addListener(TAG, this)
//获取一级分类
CallerDevaToolsManager.getCategories(BadCaseConfig.tenantId, 1, 0, type, 0)
//弹窗展示时间
@@ -585,4 +586,14 @@ class FaultReasonView @JvmOverloads constructor(
}
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
CallerDevaToolsListenerManager.addListener(TAG, this)
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
CallerDevaToolsListenerManager.removeListener(TAG)
}
}

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

@@ -344,6 +344,7 @@ class WorkOrderView @JvmOverloads constructor(
override fun onVisibilityChanged(changedView: View, visibility: Int) {
super.onVisibilityChanged(changedView, visibility)
if(visibility == View.VISIBLE){
CallerDevaToolsListenerManager.addListener(TAG, this)
//弹窗展示时间
tv_work_order_time.text =
millis2String(System.currentTimeMillis(), TimeUtils.getHourMinSecondFormat())
@@ -364,7 +365,16 @@ class WorkOrderView @JvmOverloads constructor(
//重置工单问题类型
workOrderType = ""
}
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
CallerDevaToolsListenerManager.addListener(TAG, this)
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
CallerDevaToolsListenerManager.removeListener(TAG)
}
}

10
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt
View File

@@ -534,7 +534,7 @@ class OperatePanelLayout : LinearLayout {
val isPressed = preference.extras.getBoolean("is_pressed", true)
if (!isPressed) {
preference.extras.remove("is_pressed")
return true
return false
}
val isChecked = newValue as? Boolean ?: false
hmiAction("SOP 演示模式开关, ", !FunctionBuildConfig.isDemoMode)
@@ -545,18 +545,21 @@ class OperatePanelLayout : LinearLayout {
if (!FunctionBuildConfig.isDemoMode) { //关闭美化模式时，通知工控机
CallerAutoPilotControlManager.setIPCDemoMode(FunctionBuildConfig.isDemoMode)
}
return true
}
KEY_RECORD_BAG_DIALOG -> {
val isChecked = newValue as? Boolean ?: false
FunctionBuildConfig.isShowBagRecordWindow = isChecked
hmiAction("SOP 是否展示录包弹窗, ", isChecked)
clickEventAnalytics("录包弹窗", isChecked)
return true
}
KEY_TAKE_OVER_WAKE -> {
val isChecked = newValue as? Boolean ?: false
FunctionBuildConfig.isTakeoverRemind = isChecked
hmiAction("SOP 是否展示接管提醒, ", isChecked)
clickEventAnalytics("接管提醒", isChecked)
return true
}
}
return super.onPreferenceChange(preference, newValue)
@@ -810,6 +813,7 @@ class OperatePanelLayout : LinearLayout {
CallerLogger.d(TAG, "发送开关数据:${isChecked}到乘客屏")
CallerTelematicManager.sendMsgToAllClients(TelematicConstant.WEATHER_SWITCH_STATUS, (if (isChecked) "1" else "0").toByteArray())
clickEventAnalytics("天气效果开关", isChecked)
return true
}
KEY_SYSTEM_BOOT_STATUS_SHOW -> {
val isChecked = newValue as? Boolean ?: false
@@ -817,6 +821,7 @@ class OperatePanelLayout : LinearLayout {
clickEventAnalytics("系统启动状态展示", isChecked)
HmiBuildConfig.isShowConnectionProgressView = isChecked
CallerHmiViewControlListenerManager.updateConnectionProgressView(isChecked)
return true
}
KEY_SWEEPER_CLOUD_CONTROL -> {
val isChecked = newValue as? Boolean ?: false
@@ -836,6 +841,7 @@ class OperatePanelLayout : LinearLayout {
confirmDialog.showSweeperModeChangeConfirmDialog()
}
clickEventAnalytics("清扫云控业务", isChecked)
return true
}
}
return super.onPreferenceChange(preference, newValue)
@@ -1217,7 +1223,7 @@ class OperatePanelLayout : LinearLayout {
val isPressed = preference.extras.getBoolean("is_pressed", true)
if (!isPressed) {
preference.extras.remove("is_pressed")
return true
return false
}
val isChecked = newValue as? Boolean ?: false
hmiAction("SOP 雨天模式开关, ", isChecked)

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

@@ -416,6 +416,9 @@ class ColdStartView @JvmOverloads constructor(
//域控连接成功埋点统计
reason = "域控连接成功"
ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.ipcConnectSuccess,reason)
ssmConnectStatus = false
coldStartStatus = false
newColdStart = false
}
/**
@@ -630,7 +633,7 @@ class ColdStartView @JvmOverloads constructor(
fun coldStartFail()
}
fun setColdStartResultListener(listener: ColdStartResultListener){
fun setColdStartResultListener(listener: ColdStartResultListener?){
coldStartResultListener = listener
}

8
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/travelreality/TravelRealityModel.kt
View File

@@ -141,20 +141,20 @@ class TravelRealityModel private constructor() {
fun cancelAllRequest() {
if (eventKey.isNotEmpty()) {
eventKey = ""
cancel(eventKey)
eventKey = ""
}
if (deviceKey.isNotEmpty()) {
deviceKey = ""
cancel(deviceKey)
deviceKey = ""
}
if (trackKey.isNotEmpty()) {
trackKey = ""
cancel(trackKey)
trackKey = ""
}
if (liveKey.isNotEmpty()) {
liveKey = ""
cancel(liveKey)
liveKey = ""
}
clearDownload()
}

5
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapRoamView.kt
View File

@@ -146,6 +146,11 @@ class MapRoamView(context: Context?, attrs: AttributeSet?) : MogoMapView(context
getUI()?.setVisible(false)
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
CallerMapAiCloudDataManager.removeListener(RoadCrossRoamView.TAG)
}
@ChainLog(
linkChainLog = ChainConstant.CHAIN_TYPE_STATUS,
linkCode = ChainConstant.CHAIN_SOURCE_ADAS,