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

Merge branch 'dev_robotaxi-d_230912_6.1.0' into base_3.4.0-map-sdk

Browse Source
This commit is contained in:
zhongchao
2023-09-26 19:07:49 +08:00
parent 3dd35d082d bbf1f1dc18
commit 2238cb64e0
6 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ import androidx.core.view.MenuCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import chassis.Chassis import chassis.Chassis
import com.mogo.cloud.network.cronet.QuicConfig
import com.mogo.cloud.passport.MoGoAiCloudClient import com.mogo.cloud.passport.MoGoAiCloudClient
import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.constants.SharedPrefsConstants import com.mogo.commons.constants.SharedPrefsConstants
@@ -762,6 +763,9 @@ internal class DebugSettingView @JvmOverloads constructor(
tbObuWarningFusionUnion.setOnCheckedChangeListener { _, isChecked -> tbObuWarningFusionUnion.setOnCheckedChangeListener { _, isChecked ->
FunctionBuildConfig.isObuWarningFusionUnion = isChecked FunctionBuildConfig.isObuWarningFusionUnion = isChecked
} }
tbCronet.setOnCheckedChangeListener { _, isChecked ->
QuicConfig.setEnable(context, isChecked)
}
//重启工控机所有节点 //重启工控机所有节点
btnIpcReboot.onClick { btnIpcReboot.onClick {
@@ -813,6 +817,7 @@ internal class DebugSettingView @JvmOverloads constructor(
// update tracker provider view // update tracker provider view
trackerIPCProvider.visibility = View.VISIBLE trackerIPCProvider.visibility = View.VISIBLE
} }
R.id.trackerProviderObu -> { R.id.trackerProviderObu -> {
FunctionBuildConfig.debugTrackerProvider = 1 FunctionBuildConfig.debugTrackerProvider = 1
// update tracker provider view // update tracker provider view
@@ -859,16 +864,16 @@ internal class DebugSettingView @JvmOverloads constructor(
ToastUtils.showShort("功能开发中") ToastUtils.showShort("功能开发中")
} }
if(FunctionBuildConfig.isDrawPointCloudData){ if (FunctionBuildConfig.isDrawPointCloudData) {
//如果点云效果是打开的，则自车光圈也跟随打开 //如果点云效果是打开的，则自车光圈也跟随打开
tbCarAperture.isChecked = true tbCarAperture.isChecked = true
}else{ } else {
tbCarAperture.isChecked = FunctionBuildConfig.isDisplayAnimEnable tbCarAperture.isChecked = FunctionBuildConfig.isDisplayAnimEnable
} }
tbCarAperture.setOnCheckedChangeListener { compoundButton, isChecked -> tbCarAperture.setOnCheckedChangeListener { compoundButton, isChecked ->
CallerMapUIServiceManager.getMapUIController()?.setDisplayAnimEnable(isChecked) CallerMapUIServiceManager.getMapUIController()?.setDisplayAnimEnable(isChecked)
CallerSopSettingManager.invokeCarApertureListener(isChecked) CallerSopSettingManager.invokeCarApertureListener(isChecked)
if(!compoundButton.isPressed){ if (!compoundButton.isPressed) {
return@setOnCheckedChangeListener return@setOnCheckedChangeListener
} }
FunctionBuildConfig.isDisplayAnimEnable = isChecked FunctionBuildConfig.isDisplayAnimEnable = isChecked
@@ -882,9 +887,9 @@ internal class DebugSettingView @JvmOverloads constructor(
return@setOnCheckedChangeListener return@setOnCheckedChangeListener
} }
//打开点云效果时，如果自车光圈是关闭状态，则自动打开自车光圈（点云是跟随光圈的 默认没有光圈就不显示点云的） //打开点云效果时，如果自车光圈是关闭状态，则自动打开自车光圈（点云是跟随光圈的 默认没有光圈就不显示点云的）
if(isChecked && !FunctionBuildConfig.isDisplayAnimEnable){ if (isChecked && !FunctionBuildConfig.isDisplayAnimEnable) {
tbCarAperture.isChecked = true tbCarAperture.isChecked = true
}else{ } else {
tbCarAperture.isChecked = FunctionBuildConfig.isDisplayAnimEnable tbCarAperture.isChecked = FunctionBuildConfig.isDisplayAnimEnable
} }
CallerAutoPilotControlManager.setIsDrawPointCloud(isChecked) CallerAutoPilotControlManager.setIsDrawPointCloud(isChecked)
@@ -932,6 +937,7 @@ internal class DebugSettingView @JvmOverloads constructor(
btnConnectServerIp.visibility = View.GONE btnConnectServerIp.visibility = View.GONE
etConnectServerIp.visibility = View.GONE etConnectServerIp.visibility = View.GONE
} }
else -> { else -> {
brakeThresholdDivider.visibility = View.VISIBLE brakeThresholdDivider.visibility = View.VISIBLE
btnConnectServerIp.visibility = View.VISIBLE btnConnectServerIp.visibility = View.VISIBLE
@@ -1112,32 +1118,41 @@ internal class DebugSettingView @JvmOverloads constructor(
R.id.group_hy -> { R.id.group_hy -> {
return@setOnMenuItemClickListener false return@setOnMenuItemClickListener false
} }
R.id.group_bj -> { R.id.group_bj -> {
return@setOnMenuItemClickListener false return@setOnMenuItemClickListener false
} }
R.id.env_reset -> R.id.env_reset ->
CallerDevaToolsManager.envConfigReset() CallerDevaToolsManager.envConfigReset()
R.id.hy_product -> R.id.hy_product ->
CallerDevaToolsManager.envConfigChange( CallerDevaToolsManager.envConfigChange(
"0734", "0734",
DebugConfig.NET_MODE_RELEASE DebugConfig.NET_MODE_RELEASE
) )
R.id.hy_qa -> R.id.hy_qa ->
CallerDevaToolsManager.envConfigChange("0734", DebugConfig.NET_MODE_QA) CallerDevaToolsManager.envConfigChange("0734", DebugConfig.NET_MODE_QA)
R.id.hy_demo -> R.id.hy_demo ->
CallerDevaToolsManager.envConfigChange( CallerDevaToolsManager.envConfigChange(
"0734", "0734",
DebugConfig.NET_MODE_DEMO DebugConfig.NET_MODE_DEMO
) )
R.id.bj_product -> R.id.bj_product ->
CallerDevaToolsManager.envConfigChange( CallerDevaToolsManager.envConfigChange(
"010", "010",
DebugConfig.NET_MODE_RELEASE DebugConfig.NET_MODE_RELEASE
) )
R.id.bj_qa -> R.id.bj_qa ->
CallerDevaToolsManager.envConfigChange("010", DebugConfig.NET_MODE_QA) CallerDevaToolsManager.envConfigChange("010", DebugConfig.NET_MODE_QA)
R.id.bj_demo -> R.id.bj_demo ->
CallerDevaToolsManager.envConfigChange("010", DebugConfig.NET_MODE_DEMO) CallerDevaToolsManager.envConfigChange("010", DebugConfig.NET_MODE_DEMO)
else -> else ->
throw AssertionError("invalid item: $item") throw AssertionError("invalid item: $item")
} }
@@ -1594,11 +1609,13 @@ internal class DebugSettingView @JvmOverloads constructor(
AppConfigInfo.isDriver = true AppConfigInfo.isDriver = true
AppConfigInfo.isConnectedNetty = CallerTelematicManager.getServerStarted() AppConfigInfo.isConnectedNetty = CallerTelematicManager.getServerStarted()
} }
AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) -> { AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) -> {
AppConfigInfo.isDriver = false AppConfigInfo.isDriver = false
AppConfigInfo.isConnectedNetty = CallerTelematicManager.getClientConnStatus() AppConfigInfo.isConnectedNetty = CallerTelematicManager.getClientConnStatus()
AppConfigInfo.serverSn = CallerTelematicManager.getServerToken() AppConfigInfo.serverSn = CallerTelematicManager.getServerToken()
} }
else -> { else -> {
} }
} }
@@ -1654,12 +1671,15 @@ internal class DebugSettingView @JvmOverloads constructor(
2 -> { 2 -> {
"测试环境" "测试环境"
} }
3 -> { 3 -> {
"生产环境" "生产环境"
} }
4 -> { 4 -> {
"演示环境" "演示环境"
} }
else -> { else -> {
"未知环境" "未知环境"
} }
@@ -1710,6 +1730,7 @@ internal class DebugSettingView @JvmOverloads constructor(
AppConfigInfo.isDriver -> { AppConfigInfo.isDriver -> {
"司机端Server启动" "司机端Server启动"
} }
else -> { else -> {
"乘客端${"(司机屏SN是:${AppConfigInfo.serverSn})"}连接" "乘客端${"(司机屏SN是:${AppConfigInfo.serverSn})"}连接"
} }
@@ -1729,6 +1750,7 @@ internal class DebugSettingView @JvmOverloads constructor(
AppConfigInfo.isDriver -> { AppConfigInfo.isDriver -> {
"司机屏发送数据" "司机屏发送数据"
} }
else -> "乘客屏接收数据" else -> "乘客屏接收数据"
} }
}的最新时间为:<font color='red'>${simpleDateFormat.format(AppConfigInfo.teleTimeStamp)}" }的最新时间为:<font color='red'>${simpleDateFormat.format(AppConfigInfo.teleTimeStamp)}"
@@ -1904,6 +1926,7 @@ internal class DebugSettingView @JvmOverloads constructor(
} }
tbIsDemoMode.setPadding(left, top, right, bottom) tbIsDemoMode.setPadding(left, top, right, bottom)
} }
BIZ_RAIN_MODE -> { BIZ_RAIN_MODE -> {
tbIsRainMode.isClickable = !lock tbIsRainMode.isClickable = !lock
val (left, top, right, bottom) = tbIsRainMode.currentPadding() val (left, top, right, bottom) = tbIsRainMode.currentPadding()
@@ -1916,6 +1939,7 @@ internal class DebugSettingView @JvmOverloads constructor(
} }
tbIsRainMode.setPadding(left, top, right, bottom) tbIsRainMode.setPadding(left, top, right, bottom)
} }
BIZ_WARNING_UPLOAD -> { BIZ_WARNING_UPLOAD -> {
tbReportWarning.isClickable = !lock tbReportWarning.isClickable = !lock
val (left, top, right, bottom) = tbReportWarning.currentPadding() val (left, top, right, bottom) = tbReportWarning.currentPadding()
@@ -1927,6 +1951,7 @@ internal class DebugSettingView @JvmOverloads constructor(
} }
tbReportWarning.setPadding(left, top, right, bottom) tbReportWarning.setPadding(left, top, right, bottom)
} }
BIZ_BAG_RECORD -> { BIZ_BAG_RECORD -> {
val (left, top, right, bottom) = btnRecordBag.currentPadding() val (left, top, right, bottom) = btnRecordBag.currentPadding()
if (lock) { if (lock) {
@@ -1940,6 +1965,7 @@ internal class DebugSettingView @JvmOverloads constructor(
} }
btnRecordBag.setPadding(left, top, right, bottom) btnRecordBag.setPadding(left, top, right, bottom)
} }
BIZ_FULL_LOG -> { BIZ_FULL_LOG -> {
val (left, top, right, bottom) = tbLogCatch.currentPadding() val (left, top, right, bottom) = tbLogCatch.currentPadding()
if (lock) { if (lock) {

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

@@ -349,8 +349,6 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
CallerAutoPilotStatusListenerManager.removeListener(TAG) CallerAutoPilotStatusListenerManager.removeListener(TAG)
CallerRequestActivityHandleManager.removeListener(TAG) CallerRequestActivityHandleManager.removeListener(TAG)
mogoMapListenerHandler.unregisterHostMapListener(TAG) mogoMapListenerHandler.unregisterHostMapListener(TAG)
val mapUIController = getMapUIController()
mapUIController?.destroy()
MogoStatusManager.getInstance().setMainPageIsBackgroundStatus(TAG, false) MogoStatusManager.getInstance().setMainPageIsBackgroundStatus(TAG, false)
d(SceneConstant.M_HMI + TAG, "destroy.") d(SceneConstant.M_HMI + TAG, "destroy.")
ContextHolderUtil.releaseContext() ContextHolderUtil.releaseContext()

12
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
View File

@@ -290,6 +290,18 @@
android:textOn="关闭obu预警融合" android:textOn="关闭obu预警融合"
android:textSize="@dimen/dp_24" /> android:textSize="@dimen/dp_24" />
<ToggleButton
android:id="@+id/tbCronet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_10"
android:padding="@dimen/dp_20"
android:background="@drawable/radio_button_normal_background_right"
android:textColor="#000"
android:textOff="开启QUIC协议(网络信号差时)"
android:textOn="关闭QUIC协议"
android:textSize="@dimen/dp_24" />
<!-- APP升级数据 start --> <!-- APP升级数据 start -->
<ToggleButton <ToggleButton
android:id="@+id/tbAppUpgrade" android:id="@+id/tbAppUpgrade"

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HdMapBuildConfig.kt
View File

@@ -16,7 +16,7 @@ object HdMapBuildConfig {
var currentCarVrIconRes = R.raw.hq_h9 var currentCarVrIconRes = R.raw.hq_h9
/** /**
* 地图是否加载成功 * 地图 DEFAULT 是否加载成功
* false-没有。true-成功 * false-没有。true-成功
*/ */
@JvmField @JvmField

18
gradle.properties
View File

@@ -61,23 +61,23 @@ bytex.ASM_API=ASM7
LOGLIB_VERSION=1.9.12 LOGLIB_VERSION=1.9.12
######## MogoAiCloudSDK Version ######## ######## MogoAiCloudSDK Version ########
# 网络请求LOGLIB_VERSION # 网络请求LOGLIB_VERSION
MOGO_NETWORK_VERSION=1.4.7.16 MOGO_NETWORK_VERSION=1.4.7.17
# 鉴权 # 鉴权
MOGO_PASSPORT_VERSION=1.4.7.16 MOGO_PASSPORT_VERSION=1.4.7.17
# 常链接 # 常链接
MOGO_SOCKET_VERSION=1.4.7.16 MOGO_SOCKET_VERSION=1.4.7.17
# 数据采集 # 数据采集
MOGO_REALTIME_VERSION=1.4.7.16 MOGO_REALTIME_VERSION=1.4.7.17
# 探路，道路事件发布，获取 # 探路，道路事件发布，获取
MOGO_TANLU_VERSION=1.4.7.16 MOGO_TANLU_VERSION=1.4.7.17
# 直播推流 # 直播推流
MOGO_LIVE_VERSION=1.4.7.16 MOGO_LIVE_VERSION=1.4.7.17
# 直播拉流 # 直播拉流
MOGO_TRAFFICLIVE_VERSION=1.4.7.16 MOGO_TRAFFICLIVE_VERSION=1.4.7.17
# 定位服务 # 定位服务
MOGO_LOCATION_VERSION=1.4.7.16 MOGO_LOCATION_VERSION=1.4.7.17
# 远程通讯模块 # 远程通讯模块
MOGO_TELEMATIC_VERSION=1.4.7.16 MOGO_TELEMATIC_VERSION=1.4.7.17
######## MogoAiCloudSDK Version ######## ######## MogoAiCloudSDK Version ########
# 自研地图 # 自研地图
MAP_SDK_VERSION=3.2.0.15 MAP_SDK_VERSION=3.2.0.15

1
libraries/mogo-map-api/src/main/java/com/mogo/map/MogoMap.kt
View File

@@ -47,6 +47,7 @@ class MogoMap private constructor() {
fun clear(instance: String = DEFAULT) { fun clear(instance: String = DEFAULT) {
if (mapCache.containsKey(instance)) { if (mapCache.containsKey(instance)) {
mapCache[instance]?.uiController?.destroy()
mapCache.remove(instance) mapCache.remove(instance)
} else { } else {
CallerLogger.e( CallerLogger.e(