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

[8.0.0]调整TTS语音+下架V2N绿波通行

Browse Source
This commit is contained in:
xuxinchao
2025-04-24 11:21:14 +08:00
parent 400154bf38
commit 5d12752125
7 changed files with 104 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt
View File

@@ -14,7 +14,6 @@ import androidx.constraintlayout.widget.ConstraintLayout
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.mogo.commons.voice.AIAssist
import com.mogo.eagle.core.data.autopilot.AutopilotSummaryInfo
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.data.msgbox.MsgBoxBean
import com.mogo.eagle.core.data.msgbox.MsgBoxType
@@ -27,7 +26,6 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.skin.utils.SkinResources
/**
@@ -162,8 +160,7 @@ open class AutomaticExplorationView @JvmOverloads constructor(
rotationAnim?.cancel()
//语音播放，只在司机端播放
if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
AIAssist.getInstance(context).speakTTSVoice("道路畅通一切正常${SkinResources.getInstance().getString(
R.string.operation_platform_name)}型车助手将持续守候您的出行")
AIAssist.getInstance(context).speakTTSVoice("正为您探查道路情况")
}
//5秒后关闭弹窗
val hideViewTimer =object: CountDownTimer(EXPLORATION_HIDE_TIME,EXPLORATION_HIDE_TIME){

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

@@ -327,7 +327,6 @@ class OperatePanelLayout : LinearLayout {
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_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"
private const val KEY_V2I_TO_PNC = "v2i_to_pnc"
private const val KEY_V2I_RED_LIGHT_WARNING = "v2i_red_light_warning"
@@ -351,9 +350,6 @@ class OperatePanelLayout : LinearLayout {
KEY_V2N_NEW_LINKED_TO_PNC -> {
return FunctionBuildConfig.v2nNewLinkedToPNC
}
KEY_V2N_NEW_LINKED_GREEN_WAVE -> {
return FunctionBuildConfig.v2nGreenWave
}
KEY_V2I_TOTAL_SWITCH -> {
return HmiBuildConfig.v2iTotalSwitch
}
@@ -404,7 +400,6 @@ class OperatePanelLayout : LinearLayout {
clickEventAnalytics("V2N总开关", isChecked)
if (!isChecked) { // 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) }
}
val map = HashMap<String, Boolean>().also {
it["f1"] = isChecked
@@ -420,14 +415,6 @@ class OperatePanelLayout : LinearLayout {
CallerAutoPilotControlManager.sendV2nToPncCmd(isChecked)
return true
}
KEY_V2N_NEW_LINKED_GREEN_WAVE -> {
val isChecked = newValue as? Boolean ?: false
FunctionBuildConfig.v2nGreenWave = isChecked
hmiAction("绿波通行", isChecked)
clickEventAnalytics("绿波通行", isChecked)
CallerTelematicManager.sendMsgToAllClients(TelematicConstant.OBU_GREENWAVE_WARNING, (if (isChecked) "1" else "0").toByteArray())
return true
}
KEY_V2I_TOTAL_SWITCH -> {
val isChecked = newValue as? Boolean ?: false
HmiBuildConfig.v2iTotalSwitch = isChecked

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

@@ -34,14 +34,6 @@
android:defaultValue="@bool/v2n_new_linked_to_pnc"
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_green_wave"
android:title="绿波通行"
android:persistent="false"
android:defaultValue="@bool/v2n_green_wave"
android:dependency="v2n_total_switch"
android:layout="@layout/layout_operate_panel_preference_switch_compat_dependee"
android:widgetLayout="@layout/layout_operate_panel_preference_widget_switch_compat"/>
<SwitchPreferenceCompat
android:key="v2i_total_switch"
android:title="V2I总开关"