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

Merge branch 'refs/heads/dev_robotaxi-d_241202_6.8.2' into dev_robotaxi-d_241211_6.8.6

Browse Source
This commit is contained in:
xinfengkun
2024-12-20 13:37:21 +08:00
parent 72442211b6 5e0ca38820
commit 17257c7d85
9 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_fragment.xml
View File

@@ -146,16 +146,16 @@
app:layout_constraintBottom_toTopOf="@+id/video_fragment"
app:layout_constraintEnd_toEndOf="parent" />
<!-- 事件弹框 -->
<com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventWindowView
android:id="@+id/roadV2NEventWindowView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-70dp"
android:layout_marginRight="14dp"
app:layout_constraintBottom_toTopOf="@+id/zv_msg_pop_bottom"
app:layout_constraintRight_toRightOf="parent"
android:visibility="gone"/>
<!-- &lt;!&ndash; 事件弹框 &ndash;&gt;-->
<!-- <com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventWindowView-->
<!-- android:id="@+id/roadV2NEventWindowView"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginBottom="-70dp"-->
<!-- android:layout_marginRight="14dp"-->
<!-- app:layout_constraintBottom_toTopOf="@+id/zv_msg_pop_bottom"-->
<!-- app:layout_constraintRight_toRightOf="parent"-->
<!-- android:visibility="gone"/>-->
<!--红绿灯提醒-->
<com.mogo.eagle.core.function.hmi.ui.notice.traffic.TrafficLightPromptView

2
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java
View File

@@ -134,7 +134,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
);
CallerHmiManager.INSTANCE.warningV2X(poiType, alarmText,
ttsText, this,WarningDirectionEnum.ALERT_WARNING_TOP,
TimeUnit.SECONDS.toMillis(5), AIAssist.LEVEL2, false);
TimeUnit.SECONDS.toMillis(5), AIAssist.NEW_LEVEL_2, false);
//消息埋点
V2XEventAnalyticsManager.INSTANCE.triggerV2XEvent(poiType,alarmText,ttsText, DataSourceType.AICLOUD, CommunicationType.V2N);
}

2
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java
View File

@@ -88,7 +88,7 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoChas
CallerHmiManager.INSTANCE.warningV2X(v2xType + "",
getAlertContentForFrontWarning(mMarkerEntity), mMarkerEntity.getTts(),
this,getDirection(),
TimeUnit.SECONDS.toMillis(5), AIAssist.LEVEL2, false);
TimeUnit.SECONDS.toMillis(5), AIAssist.NEW_LEVEL_2, false);
//消息埋点
V2XEventAnalyticsManager.INSTANCE.triggerV2XEvent(v2xType,getAlertContentForFrontWarning(mMarkerEntity).toString(),
mMarkerEntity.getTts(), DataSourceType.AICLOUD, CommunicationType.V2N);

1
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
View File

@@ -31,6 +31,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListene
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotControlProvider
import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.FUNC_MODE_RAIN
import com.mogo.eagle.core.function.api.map.collect.IMoGoMapDataCollectProvider
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager
import com.mogo.eagle.core.function.call.autopilot.CallerIpcConnectStateToastManager
import com.mogo.eagle.core.function.call.cloud.CallerCloudCertManager

2
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
View File

@@ -143,6 +143,8 @@ class MoGoAdasMsgConnectStatusListenerImpl :
CallerAutoPilotControlManager.setRainMode(FunctionBuildConfig.isRainMode)
// 6.6.2 版本默认开启，与海江确认过，默认发盲区模式
CallerAutoPilotControlManager.sendFusionMode(2)
CallerAutoPilotControlManager.sendV2iToPncCmd(FunctionBuildConfig.v2iToPNC)
CallerAutoPilotControlManager.sendV2nToPncCmd(FunctionBuildConfig.v2nTotalSwitch)
}
AdasConstants.IpcConnectionStatus.CONNECTING -> {

3
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt
View File

@@ -5,6 +5,7 @@ import android.os.CountDownTimer
import android.os.Handler
import android.util.Log
import com.mogo.commons.voice.AIAssist
import com.mogo.commons.voice.AIAssist.NEW_LEVEL_2
import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult
import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightStatus
import com.mogo.eagle.core.data.biz.trafficlight.currentRoadTrafficLight
@@ -232,7 +233,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
if((light.state == FusionTrafficLightOuterClass.FusionLightState.STATE_YELLOW_FUSION || light.state ==FusionTrafficLightOuterClass.FusionLightState.STATE_RED_FUSION)
&& light.duration < 5 && light.nextState == FusionTrafficLightOuterClass.FusionLightState.STATE_GREEN_FUSION){
//语音播放:红灯即将变绿
AIAssist.getInstance(mContext).speakTTSVoice("红灯即将变绿")
AIAssist.getInstance(mContext).speakTTSVoiceWithLevel("红灯即将变绿", NEW_LEVEL_2)
isTurnGreen = true
}
}

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

@@ -484,7 +484,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor(
"更新时间：${DateTimeUtils.getTimeText(dataBean.timestamp, DateTimeUtils.HH_mm_ss)}"
if (dataBean.isNeedTTS && !TextUtils.isEmpty(dataBean.ttsStr)) {
AIAssist.getInstance(context)
.speakTTSVoiceWithLevel(dataBean.ttsStr, AIAssist.LEVEL0)
.speakTTSVoiceWithLevel(dataBean.ttsStr, AIAssist.NEW_LEVEL_2)
}
when (dataBean.eventType) {
RoadV2NEventType.TEXT -> {

16
gradle.properties
View File

@@ -64,21 +64,21 @@ bytex.ASM_API=ASM7
LOGLIB_VERSION=1.10.18
######## MogoAiCloudSDK Version ########
# 网络请求LOGLIB_VERSION
MOGO_NETWORK_VERSION=1.4.7.58
MOGO_NETWORK_VERSION=1.4.7.59
# 鉴权
MOGO_PASSPORT_VERSION=1.4.7.58
MOGO_PASSPORT_VERSION=1.4.7.59
# 长链接
MOGO_SOCKET_VERSION=1.4.7.58
MOGO_SOCKET_VERSION=1.4.7.59
# 数据采集
MOGO_REALTIME_VERSION=1.4.7.58
MOGO_REALTIME_VERSION=1.4.7.59
# 直播推流
MOGO_LIVE_VERSION=1.4.7.58
MOGO_LIVE_VERSION=1.4.7.59
# 直播拉流
MOGO_TRAFFICLIVE_VERSION=1.4.7.58
MOGO_TRAFFICLIVE_VERSION=1.4.7.59
# 定位服务
MOGO_LOCATION_VERSION=1.4.7.58
MOGO_LOCATION_VERSION=1.4.7.59
# 远程通讯模块
MOGO_TELEMATIC_VERSION=1.4.7.58
MOGO_TELEMATIC_VERSION=1.4.7.59
# 动态换肤SDK
MOGO_SKIN_VERSION=1.4.7.49.19
######## MogoAiCloudSDK Version ########

8
tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java
View File

@@ -401,7 +401,13 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack {
List<LangTtsEntity> ttsEntityList = new ArrayList<>();
ttsEntityList.add(new LangTtsEntity(tts, LanguageType.CHINESE));
MultiLangTtsEntity ttsEntity = new MultiLangTtsEntity(ttsEntityList);
speakMultiLangTTSWithLevel(ttsEntity, level);
if (Thread.currentThread() != Looper.getMainLooper().getThread()) {
UiThreadHandler.post(() -> {
speakMultiLangTTSWithLevel(ttsEntity, level);
}, QUEUE);
} else {
speakMultiLangTTSWithLevel(ttsEntity, level);
}
}
private void speakMultiLangTTSWithLevel(MultiLangTtsEntity ttsEntity,int ttsLevel) {