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-09-27 14:13:59 +08:00
parent 18b047c611 d7a52f7f8c
commit a8afcf68c3
17 changed files with 80 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt
View File

@@ -183,8 +183,6 @@ class MsgBoxTabAdapter(private val activity: Activity) :
//时间显示
holder.tvFmTime.text =
"时间：${fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1) }}"
holder.tvFmTime.text =
fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1,getHourMinFormat()) }
//建议操作
if(fmInfoMsg.fmInfoList.isNullOrEmpty()){
//建议操作暂无
@@ -361,8 +359,6 @@ class MsgBoxTabAdapter(private val activity: Activity) :
holder.tvReportTime.text =
"时间：${TimeUtils.millis2String(it[position].timestamp)}"
holder.tvReportShowTime.text =
TimeUtils.millis2String(it[position].timestamp, getHourMinFormat())
var resultStr = "类型："
for (result in reportEntity.resultList) {
resultStr =
@@ -612,7 +608,6 @@ class MsgBoxTabAdapter(private val activity: Activity) :
class FmInfoHolder(itemView: View) : RecyclerView.ViewHolder(itemView){
var ivFmImage: ImageView = itemView.findViewById(R.id.ivFmImage) //故障级别图标
var tvFmTitle: TextView = itemView.findViewById(R.id.tvFmTitle) //标题展示故障策略
var tvFmShowTime: TextView = itemView.findViewById(R.id.tvFmShowTime) //展示时间
var tvFmShowStatus: TextView = itemView.findViewById(R.id.tvFmShowStatus) //折叠状态
var tvFmTime: TextView = itemView.findViewById(R.id.tvFmTime) //发生时间
var tvFmAction: TextView = itemView.findViewById(R.id.tvFmAction) //建议操作
@@ -630,7 +625,6 @@ class MsgBoxTabAdapter(private val activity: Activity) :
var tvReportReason: TextView = itemView.findViewById(R.id.tvReportReason)
var tvReportSrc: TextView = itemView.findViewById(R.id.tvReportSrc)
var tvReportAction: TextView = itemView.findViewById(R.id.tvReportAction)
var tvReportShowTime: TextView = itemView.findViewById(R.id.tvReportShowTime)
var tvReportShowStatus: TextView = itemView.findViewById(R.id.tvReportShowStatus)
}

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

@@ -301,7 +301,7 @@ class OperatePanelLayout : LinearLayout {
companion object {
private const val KEY_V2X_TOTAL_SWITCH = "v2x_total_switch"
private const val KEY_V2N_TOTAL_SWITCH = "v2n_total_switch"
private const val KEY_V2N_NEW_LINKED = "v2n_new_linked"
// private const val KEY_V2N_NEW_LINKED = "v2n_new_linked"
private const val KEY_V2N_NEW_LINKED_TO_PNC = "v2n_new_linked_to_pnc"
private const val KEY_V2N_NEW_LINKED_GREEN_WAVE = "v2n_new_linked_green_wave"
private const val KEY_V2I_TOTAL_SWITCH = "v2i_total_switch"
@@ -324,9 +324,9 @@ class OperatePanelLayout : LinearLayout {
KEY_V2N_TOTAL_SWITCH -> {
return FunctionBuildConfig.v2nTotalSwitch
}
KEY_V2N_NEW_LINKED -> {
return FunctionBuildConfig.v2nNewLinked
}
// KEY_V2N_NEW_LINKED -> {
// return FunctionBuildConfig.v2nNewLinked
// }
KEY_V2N_NEW_LINKED_TO_PNC -> {
return FunctionBuildConfig.v2nNewLinkedToPNC
}
@@ -382,19 +382,19 @@ class OperatePanelLayout : LinearLayout {
hmiAction("V2N总开关, ", isChecked)
clickEventAnalytics("V2N总开关", isChecked)
if (!isChecked) {
preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(KEY_V2N_NEW_LINKED)?.also { changeValue(it, false) }
// preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(KEY_V2N_NEW_LINKED)?.also { changeValue(it, false) }
preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(KEY_V2N_NEW_LINKED_TO_PNC)?.also { changeValue(it, false) }
preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(KEY_V2N_NEW_LINKED_GREEN_WAVE)?.also { changeValue(it, false) }
}
return true
}
KEY_V2N_NEW_LINKED -> {
val isChecked = newValue as? Boolean ?: false
FunctionBuildConfig.v2nNewLinked = isChecked
hmiAction("V2N新链路", isChecked)
clickEventAnalytics("V2N新链路", isChecked)
return true
}
// KEY_V2N_NEW_LINKED -> {
// val isChecked = newValue as? Boolean ?: false
// FunctionBuildConfig.v2nNewLinked = isChecked
// hmiAction("V2N新链路", isChecked)
// clickEventAnalytics("V2N新链路", isChecked)
// return true
// }
KEY_V2N_NEW_LINKED_TO_PNC -> {
val isChecked = newValue as? Boolean ?: false
FunctionBuildConfig.v2nNewLinkedToPNC = isChecked

34
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
View File

@@ -199,8 +199,8 @@ internal class SOPSettingView @JvmOverloads constructor(
clickEventAnalytics("V2N总开关",isChecked)
if (isChecked) {
//V2N新链路
scNewV2NData.isChecked = FunctionBuildConfig.v2nNewLinked
hmiAction("SOP 是否是V2N新链路(云->工控机->App)", FunctionBuildConfig.v2nNewLinked)
// scNewV2NData.isChecked = FunctionBuildConfig.v2nNewLinked
hmiAction("SOP 是否是V2N新链路(云->工控机->App)", true)
//V2N场景进PNC
scV2nPnc.isChecked = FunctionBuildConfig.v2nNewLinkedToPNC
hmiAction("SOP V2N场景进PNC, ", FunctionBuildConfig.v2nNewLinkedToPNC)
@@ -237,7 +237,6 @@ internal class SOPSettingView @JvmOverloads constructor(
FunctionBuildConfig.v2nTotalSwitch = isChecked
val map = HashMap<String, Boolean>().also {
it["f1"] = isChecked
it["f2"] = FunctionBuildConfig.v2nNewLinked
}
CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray())
}
@@ -291,21 +290,20 @@ internal class SOPSettingView @JvmOverloads constructor(
}
//V2N新链路
scNewV2NData.isChecked = FunctionBuildConfig.v2nNewLinked
scNewV2NData.setOnCheckedChangeListener { compoundButton, isChecked ->
if (!compoundButton.isPressed) {
return@setOnCheckedChangeListener
}
clickEventAnalytics("V2N新链路",isChecked)
hmiAction("SOP 是否是V2N新链路(云->工控机->App)", isChecked)
FunctionBuildConfig.v2nNewLinked = isChecked
val map = HashMap<String, Boolean>().also {
it["f1"] = FunctionBuildConfig.v2nTotalSwitch
it["f2"] = isChecked
}
CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray())
}
scNewV2NData.isEnabled = false
// scNewV2NData.setOnCheckedChangeListener { compoundButton, isChecked ->
// if (!compoundButton.isPressed) {
// return@setOnCheckedChangeListener
// }
// clickEventAnalytics("V2N新链路",isChecked)
// hmiAction("SOP 是否是V2N新链路(云->工控机->App)", isChecked)
// FunctionBuildConfig.v2nNewLinked = isChecked
//
// val map = HashMap<String, Boolean>().also {
// it["f1"] = FunctionBuildConfig.v2nTotalSwitch
// }
// CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray())
// }
//V2N场景进PNC
scV2nPnc.isChecked = FunctionBuildConfig.v2nNewLinkedToPNC

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

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<com.mogo.eagle.core.widget.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layoutBadCase"
android:layout_width="@dimen/dp_773"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_180"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_gravity="center_horizontal"

31
core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_fm.xml
View File

@@ -22,34 +22,26 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/ivFmImage"
app:layout_constraintLeft_toRightOf="@id/ivFmImage"
app:layout_constraintRight_toLeftOf="@id/tvFmShowTime"
app:layout_constraintRight_toLeftOf="@id/tvFmShowStatus"
android:layout_marginStart="@dimen/dp_30"
android:textSize="@dimen/sp_38"
android:textColor="@color/white"
/>
<!--展示时间-->
<TextView
android:id="@+id/tvFmShowTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/tvFmTitle"
app:layout_constraintBottom_toBottomOf="@id/tvFmTitle"
app:layout_constraintRight_toRightOf="parent"
android:textColor="#999999"
android:textSize="@dimen/sp_32"
/>
<!--折叠状态-->
<TextView
android:id="@+id/tvFmShowStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="@id/tvFmTitle"
app:layout_constraintBottom_toBottomOf="@id/tvFmTitle"
app:layout_constraintRight_toRightOf="parent"
android:text="@string/fm_open"
android:textSize="@dimen/sp_32"
android:textColor="#2EACFF"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_20"
android:paddingStart="@dimen/dp_30"
/>
<!--发生时间-->
@@ -59,7 +51,7 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/tvFmTitle"
app:layout_constraintLeft_toLeftOf="@id/tvFmTitle"
app:layout_constraintRight_toLeftOf="@id/tvFmShowTime"
app:layout_constraintRight_toRightOf="@id/tvFmShowStatus"
android:textColor="#CCCCCC"
android:textSize="@dimen/sp_32"
/>
@@ -71,7 +63,7 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/tvFmTime"
app:layout_constraintLeft_toLeftOf="@id/tvFmTime"
app:layout_constraintRight_toLeftOf="@id/tvFmShowTime"
app:layout_constraintRight_toRightOf="@id/tvFmShowStatus"
android:textColor="#CCCCCC"
android:textSize="@dimen/sp_32"
/>
@@ -83,7 +75,7 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/tvFmAction"
app:layout_constraintLeft_toLeftOf="@id/tvFmAction"
app:layout_constraintRight_toLeftOf="@id/tvFmShowTime"
app:layout_constraintRight_toRightOf="@id/tvFmShowStatus"
android:textColor="#CCCCCC"
android:textSize="@dimen/sp_32"
android:visibility="gone"
@@ -96,7 +88,7 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/tvFmFault"
app:layout_constraintLeft_toLeftOf="@id/tvFmFault"
app:layout_constraintRight_toLeftOf="@id/tvFmShowTime"
app:layout_constraintRight_toRightOf="@id/tvFmShowStatus"
android:textColor="#CCCCCC"
android:textSize="@dimen/sp_32"
android:visibility="gone"
@@ -109,7 +101,8 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/tvFmReason"
app:layout_constraintLeft_toLeftOf="@id/tvFmReason"
app:layout_constraintRight_toLeftOf="@id/tvFmShowTime"
app:layout_constraintRight_toRightOf="@id/tvFmShowStatus"
android:paddingBottom="@dimen/dp_30"
android:textColor="#CCCCCC"
android:textSize="@dimen/sp_32"
android:visibility="gone"

28
core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_ipc_report.xml
View File

@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/ivReportImage"
app:layout_constraintLeft_toRightOf="@id/ivReportImage"
app:layout_constraintRight_toLeftOf="@id/tvReportShowTime"
app:layout_constraintRight_toLeftOf="@id/tvReportShowStatus"
android:textColor="@color/white"
android:textSize="@dimen/sp_38"
android:layout_marginStart="@dimen/dp_30"
@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/tvReportLevel"
app:layout_constraintLeft_toLeftOf="@id/tvReportLevel"
app:layout_constraintRight_toLeftOf="@id/tvReportShowTime"
app:layout_constraintRight_toRightOf="@id/tvReportShowStatus"
android:textSize="@dimen/sp_32"
android:textColor="#CCCCCC"
/>
@@ -43,7 +43,7 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/tvReportTime"
app:layout_constraintLeft_toLeftOf="@id/tvReportTime"
app:layout_constraintRight_toLeftOf="@id/tvReportShowTime"
app:layout_constraintRight_toRightOf="@id/tvReportShowStatus"
android:textSize="@dimen/sp_32"
android:textColor="#CCCCCC"
/>
@@ -54,7 +54,7 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/tvReportType"
app:layout_constraintLeft_toLeftOf="@id/tvReportType"
app:layout_constraintRight_toLeftOf="@id/tvReportShowTime"
app:layout_constraintRight_toRightOf="@id/tvReportShowStatus"
android:textSize="@dimen/sp_32"
android:textColor="#CCCCCC"
android:visibility="gone"
@@ -66,7 +66,7 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/tvReportReason"
app:layout_constraintLeft_toLeftOf="@id/tvReportReason"
app:layout_constraintRight_toLeftOf="@id/tvReportShowTime"
app:layout_constraintRight_toRightOf="@id/tvReportShowStatus"
android:textSize="@dimen/sp_32"
android:textColor="#CCCCCC"
android:visibility="gone"
@@ -78,32 +78,26 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/tvReportSrc"
app:layout_constraintLeft_toLeftOf="@id/tvReportSrc"
app:layout_constraintRight_toLeftOf="@id/tvReportShowTime"
app:layout_constraintRight_toRightOf="@id/tvReportShowStatus"
android:paddingBottom="@dimen/dp_30"
android:textSize="@dimen/sp_32"
android:textColor="#CCCCCC"
android:visibility="gone"
/>
<TextView
android:id="@+id/tvReportShowTime"
android:id="@+id/tvReportShowStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/tvReportLevel"
app:layout_constraintBottom_toBottomOf="@id/tvReportLevel"
app:layout_constraintRight_toRightOf="parent"
android:textColor="#999999"
android:textSize="@dimen/sp_32"
/>
<TextView
android:id="@+id/tvReportShowStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:text="@string/report_open"
android:textSize="@dimen/sp_32"
android:textColor="#2EACFF"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_20"
android:paddingLeft="@dimen/dp_30"
/>
</androidx.constraintlayout.widget.ConstraintLayout>

16
core/function-impl/mogo-core-function-hmi/src/main/res/xml/operate_panel_preference_details_v2x.xml
View File

@@ -18,14 +18,14 @@
android:defaultValue="@bool/v2n_total_switch"
android:layout="@layout/layout_operate_panel_preference_switch_compat"
android:widgetLayout="@layout/layout_operate_panel_preference_widget_switch_compat"/>
<SwitchPreferenceCompat
android:key="v2n_new_linked"
android:title="V2N新链路"
android:persistent="false"
android:dependency="v2n_total_switch"
android:defaultValue="@bool/v2n_new_linked"
android:layout="@layout/layout_operate_panel_preference_switch_compat_dependee"
android:widgetLayout="@layout/layout_operate_panel_preference_widget_switch_compat"/>
<!-- <SwitchPreferenceCompat-->
<!-- android:key="v2n_new_linked"-->
<!-- android:title="V2N新链路"-->
<!-- android:persistent="false"-->
<!-- android:dependency="v2n_total_switch"-->
<!-- android:defaultValue="@bool/v2n_new_linked"-->
<!-- android:layout="@layout/layout_operate_panel_preference_switch_compat_dependee"-->
<!-- android:widgetLayout="@layout/layout_operate_panel_preference_widget_switch_compat"/>-->
<SwitchPreferenceCompat
android:key="v2n_new_linked_to_pnc"
android:title="V2N场景进PNC"