From 3f7773c781ac0ba039c44350914cdf282f3387b2 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Tue, 15 Mar 2022 10:59:11 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adas/client/ui/mian/VersionFragment.java | 14 +++++--------- .../src/main/res/layout/item_config.xml | 3 ++- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 2 +- libraries/mogo-adas/README.md | 4 ++-- libraries/mogo-adas/build.gradle | 18 ++++++++++-------- .../zhidao/support/adas/high/AdasManager.java | 8 ++++---- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/VersionFragment.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/VersionFragment.java index d8afbd403f..66df8cc7cf 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/VersionFragment.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/mian/VersionFragment.java @@ -19,13 +19,11 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.SimpleItemAnimator; -import com.mogo.eagle.core.utilcode.util.AppUtils; import com.zhidao.adas.client.BuildConfig; import com.zhidao.adas.client.R; import com.zhidao.adas.client.bean.CarConfigResp; import com.zhidao.adas.client.bean.Config; import com.zhidao.support.adas.high.AdasManager; -import com.zhidao.support.adas.high.common.Constants; import com.zhidao.support.adas.high.common.CupidLogUtils; import org.greenrobot.eventbus.EventBus; @@ -155,7 +153,7 @@ public class VersionFragment extends Fragment { tvTitle.setText("版本"); } // if (AdasManager.getInstance().getIpcConnectionStatus() != Constants.IPC_CONNECTION_STATUS.CONNECTED) - showVersion(null); + showVersion(null); } @@ -165,12 +163,11 @@ public class VersionFragment extends Fragment { List list = new ArrayList<>(); if (!BuildConfig.IS_CLIENT) { String ip = AdasManager.getInstance().getIpcConnectedIp(); + String temp = ""; if (!TextUtils.isEmpty(ip)) { - if (!ip.contains(":")) { - ip = ip + ":" + Constants.DEFAULT_PORT; - } + temp = ip + ":" + AdasManager.getInstance().getIpcConnectedPort(); } - list.add(new Config("工控机IP:", ip)); + list.add(new Config("工控机IP:", temp)); list.add(new Config("工控机版本:", adasConfig == null ? null : adasConfig.bean.getDockVersion())); list.add(new Config("车牌号:", adasConfig == null ? null : adasConfig.bean.getPlateNumber())); list.add(new Config("MAC地址:", adasConfig == null ? null : adasConfig.bean.getMacAddress())); @@ -181,8 +178,7 @@ public class VersionFragment extends Fragment { list.add(new Config("IPC通信协议版本:", adasConfig == null ? null : String.valueOf(adasConfig.bean.getProtocolVersion().getNumber()))); list.add(new Config("APP通信协议版本:", String.valueOf(AdasManager.getInstance().getProtocolVersion()))); } - list.add(new Config("软件版本:", com.zhidao.support.adas.high.BuildConfig.VERSION_NAME)); - list.add(new Config("MAP版本:", AdasManager.getInstance().getAPVersion())); + list.add(new Config("ADAS LIB版本:", AdasManager.getInstance().getAdasVersion())); adapter.setData(list); } diff --git a/app_ipc_monitoring/src/main/res/layout/item_config.xml b/app_ipc_monitoring/src/main/res/layout/item_config.xml index d3a8c192a0..c9a1417d8e 100644 --- a/app_ipc_monitoring/src/main/res/layout/item_config.xml +++ b/app_ipc_monitoring/src/main/res/layout/item_config.xml @@ -15,5 +15,6 @@ + android:layout_height="wrap_content" + android:layout_marginStart="5dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt index a70930c467..f35d23bac2 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -167,7 +167,7 @@ class MoGoAdasListenerImpl : OnAdasListener { autopilotStatusInfo.rtk = autopilotState.rtk autopilotStatusInfo.radar = autopilotState.radar autopilotStatusInfo.speed = autopilotState.speed.toFloat() - autopilotStatusInfo.version = AdasManager.getInstance().apVersion + autopilotStatusInfo.version = AdasManager.getInstance().adasVersion if (autopilotStatusInfo.connectIP == null) { autopilotStatusInfo.connectIP = AdasManager.getInstance().ipcConnectedIp } diff --git a/libraries/mogo-adas/README.md b/libraries/mogo-adas/README.md index 6289055e1e..2262f03885 100644 --- a/libraries/mogo-adas/README.md +++ b/libraries/mogo-adas/README.md @@ -44,11 +44,11 @@ publicBase64=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANduxRb7j6JWsWEwYOcJMgyKxG3DSl6CI39 ~~~ ~~~java /** - * MoGo-AP 版本 + * ADAS LIB 版本 * * @return 版本 */ - AdasManager.getInstance().getAPVersion(); + AdasManager.getInstance().getAdasVersion(); ~~~ ~~~java /** diff --git a/libraries/mogo-adas/build.gradle b/libraries/mogo-adas/build.gradle index d95ed2967b..a5f1761ddc 100644 --- a/libraries/mogo-adas/build.gradle +++ b/libraries/mogo-adas/build.gradle @@ -3,10 +3,10 @@ plugins { id 'com.google.protobuf' // id 'maven' } -ext { - //自动驾驶产品版本号 - AP_VERSION = "2.6.0" -} +//ext { +// //自动驾驶产品版本号 +// AP_VERSION = "2.6.0" +//} android { compileSdkVersion rootProject.ext.android.compileSdkVersion // buildToolsVersion rootProject.ext.android.buildToolsVersion @@ -14,10 +14,12 @@ android { defaultConfig { minSdkVersion rootProject.ext.android.minSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion - versionCode Integer.valueOf(VERSION_CODE) - versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") - - buildConfigField "String", "AP_VERSION", "\"${AP_VERSION}\"" +// versionCode Integer.valueOf(VERSION_CODE) +// versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") +// +// buildConfigField "String", "AP_VERSION", "\"${AP_VERSION}\"" + versionCode rootProject.versionCode as int + versionName rootProject.versionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java index 5beee029da..ddf7bd8c37 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java @@ -31,7 +31,7 @@ public class AdasManager implements IAdasNetCommApi { */ private static final int PROTOCOL_VERSION = MessagePad.ProtocolVersion.CurrentVersion.getNumber(); private MessagePad.CarConfigResp carConfig; - private static final String AP_VERSION = BuildConfig.AP_VERSION; + private static final String ADAS_VERSION = BuildConfig.VERSION_NAME; private AdasChannel mChannel; @@ -89,12 +89,12 @@ public class AdasManager implements IAdasNetCommApi { } /** - * MoGo-AP 版本 + * ADAS LIB 版本 * * @return 版本 */ - public String getAPVersion() { - return AP_VERSION; + public String getAdasVersion() { + return ADAS_VERSION; } /**