From 10c309d5e3286ef6ffc78252c4029b2f19a50422 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 20 Sep 2022 15:21:42 +0800 Subject: [PATCH] test --- .../mogo/launcher/stageone/HttpDnsStartUp.kt | 2 +- .../hmi/ui/setting/DebugSettingView.kt | 59 +++++++++++++++---- .../main/res/layout/view_debug_setting.xml | 38 ++++++++++++ .../network/TrafficLightNetWorkModel.kt | 2 +- .../core/function/v2x/vip/VipCarManager.kt | 22 +++---- .../core/data/config/FunctionBuildConfig.kt | 11 +--- 6 files changed, 99 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt index 6b4cd129b3..fb7f1b09c9 100644 --- a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt @@ -111,7 +111,7 @@ class HttpDnsStartUp : AndroidStartup() { // 设置是否输出日志 clientConfig.isShowDebugLog = true // 设置是否输出网络日志 - clientConfig.isShowNetDebugLog = false + clientConfig.isShowNetDebugLog = true //todo test // 设置是否是直播推流的主播 clientConfig.isAnchor = true when (DebugConfig.getCarMachineType()) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 69c8390db5..036391e977 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -62,6 +62,7 @@ import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.logcatch.ILogViewListener import com.mogo.eagle.core.function.hmi.ui.logcatch.LogInfoView import com.mogo.eagle.core.function.hmi.ui.upgrade.UpgradeListAdapter +import com.mogo.eagle.core.function.v2x.vip.VipCarManager import com.mogo.eagle.core.network.* import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils @@ -439,15 +440,27 @@ class DebugSettingView @JvmOverloads constructor( /** * 日志中心 */ +// tbLogcatCenter.setOnCheckedChangeListener { buttonView, isChecked -> +// if (isChecked) { +// buttonView.setCompoundDrawables(null, null, iconDown, null) +// //展示日志中心 +// logcatCenterLayout.visibility = View.VISIBLE +// } else { +// buttonView.setCompoundDrawables(null, null, iconRight, null) +// //隐藏日志中心 +// logcatCenterLayout.visibility = View.GONE +// } +// } + //todo test tbLogcatCenter.setOnCheckedChangeListener { buttonView, isChecked -> if (isChecked) { buttonView.setCompoundDrawables(null, null, iconDown, null) - //展示日志中心 logcatCenterLayout.visibility = View.VISIBLE + VipCarManager.INSTANCE.turnLight(30) } else { buttonView.setCompoundDrawables(null, null, iconRight, null) - //隐藏日志中心 logcatCenterLayout.visibility = View.GONE + VipCarManager.INSTANCE.turnLight(30) } } @@ -666,12 +679,8 @@ class DebugSettingView @JvmOverloads constructor( // 初始化 tracker感知数据源 数据 trackerProvider.check( when (FunctionBuildConfig.debugTrackerProvider) { - 0 -> { - R.id.trackerProviderOrigin - } - 1 -> { - R.id.trackerProviderObu - } + 0 -> R.id.trackerProviderOrigin + 1 -> R.id.trackerProviderObu else -> R.id.trackerProviderOrigin } ) @@ -680,14 +689,38 @@ class DebugSettingView @JvmOverloads constructor( R.id.trackerProviderOrigin -> { FunctionBuildConfig.debugTrackerProvider = 0 // update tracker provider view + trackerIPCProvider.visibility = View.VISIBLE } R.id.trackerProviderObu -> { FunctionBuildConfig.debugTrackerProvider = 1 // update tracker provider view + trackerIPCProvider.visibility = View.GONE } } } + // 初始化 trackerIPC 感知数据源 数据 + trackerIPCProvider.check( + when (FunctionBuildConfig.trackerIPCProvider) { + 0 -> R.id.trackerIPCUnion + 1 -> R.id.trackerIPCObu + 2 -> R.id.trackerIPCV2N + else -> R.id.trackerIPCUnion + } + ) + trackerProvider.setOnCheckedChangeListener{ _, checkedId -> + when(checkedId){ + R.id.trackerIPCUnion -> { + FunctionBuildConfig.trackerIPCProvider = 0 + } + R.id.trackerIPCObu -> { + FunctionBuildConfig.trackerIPCProvider = 1 + } + R.id.trackerIPCV2N -> { + FunctionBuildConfig.trackerIPCProvider = 2 + } + } + } // 初始化 ADAS感知数据是否绘制 选择情况 tbIsDrawIdentifyData.isChecked = FunctionBuildConfig.isDrawIdentifyData @@ -1855,13 +1888,13 @@ class DebugSettingView @JvmOverloads constructor( override fun updateBizData(type: String, state: Boolean, lock: Boolean, data: String?) { when (type) { - BIZ_BEAUTY_MODE -> tbIsDemoMode.isClickable = !lock - BIZ_RAIN_MODE -> tbIsRainMode.isClickable = !lock + BIZ_BEAUTY_MODE -> tbIsDemoMode.isClickable = !lock + BIZ_RAIN_MODE -> tbIsRainMode.isClickable = !lock BIZ_WARNING_UPLOAD -> tbReportWarning.isClickable = !lock - BIZ_BAG_RECORD -> { - if(lock){ + BIZ_BAG_RECORD -> { + if (lock) { btnRecordBag.isClickable = false - }else{ + } else { btnRecordBag.isClickable = true btnRecordBag.requestFocus() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 38e38c551a..13f392ed35 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -1783,6 +1783,44 @@ + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt index f9a30eeb9a..68651a6f14 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt @@ -120,7 +120,7 @@ class TrafficLightNetWorkModel { } loader { apiCall { - getNetWorkApi().changeLight(map) + getNetWorkApi("http://dzt-test.zhidaozhixing.com").changeLight(map) } } onSuccess { diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt index 0b005c3e4f..38fdfe5a27 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt @@ -192,15 +192,17 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe } } - private fun turnLight(controlTime: Int) { - if (result == null || mContext == null) return - val locationClient = CallerMapUIServiceManager.getSingletonLocationClient(mContext!!) - if (locationClient != null) { - val bearing = - locationClient.lastKnowLocation.bearing.toDouble() - CallerLogger.d("$M_V2X$TAG", "turnLight -- bearing : $bearing") + fun turnLight(controlTime: Int) { + //todo test note +// if (result == null || mContext == null) return +// val locationClient = CallerMapUIServiceManager.getSingletonLocationClient(mContext!!) +// if (locationClient != null) { +// val bearing = +// locationClient.lastKnowLocation.bearing.toDouble() + CallerLogger.d("$M_V2X$TAG", "-- turnLight -- ") MogoTrafficLightManager.INSTANCE.turnLightToGreen( - result!!.lightId, result!!.crossId, bearing, controlTime, +// result!!.lightId, result!!.crossId, bearing, controlTime, + 100530, "10008", 6.403929233551025, controlTime, { if (it.sn == MoGoAiCloudClientConfig.getInstance().sn && it.code == 0) { CallerLogger.d("$M_V2X$TAG", "变灯请求成功") @@ -211,7 +213,7 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe EventTypeEnum.TYPE_VIP_IDENTIFICATION.poiType ) } else { - val time = if (it.countDown / 60 > 1) { + val time = if (it.countDown / 60 >= 1) { "${it.countDown / 60}分${it.countDown % 60}秒后重试" } else { "${it.countDown}秒后重试" @@ -228,7 +230,7 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe CallerLogger.e("$M_V2X$TAG", "变灯请求失败 msg : $errorMsg") ToastUtils.showLong("服务异常，请稍后重试") }) - } +// } } private fun showWarning( diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt index 1a50cabba3..4f12272c8f 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt @@ -84,7 +84,7 @@ object FunctionBuildConfig { */ @Volatile @JvmField - var trackerProvider = 0 + var trackerIPCProvider = 0 /** * 地图是否绘制Adas识别回调的Marker @@ -104,15 +104,6 @@ object FunctionBuildConfig { @JvmField var isDrawUnknownIdentifyData = false - /** - * 地图是否绘制 OBU 识别回调的Marker - * true - 绘制 - * false - 不绘制 - */ - @Volatile - @JvmField - var isDrawObuIdentifyData = true - /** * 地图是否绘制 点云数据 * true - 绘制