From 90da3537a65ebaf2d9c0b3260b5145f279832f5c Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Thu, 21 Apr 2022 14:24:34 +0800 Subject: [PATCH] =?UTF-8?q?[change]=E7=A7=BB=E9=99=A4adas=E6=97=A0?= =?UTF-8?q?=E6=95=88=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_ipc_monitoring/build.gradle | 7 +++--- .../zhidao/adas/client/ui/MainActivity.java | 23 ++++++------------- .../src/main/res/values/styles.xml | 3 +++ .../mogo-core-function-v2x/build.gradle | 1 + libraries/mogo-adas/build.gradle | 6 ++--- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/app_ipc_monitoring/build.gradle b/app_ipc_monitoring/build.gradle index 3690d79c72..48474f2987 100644 --- a/app_ipc_monitoring/build.gradle +++ b/app_ipc_monitoring/build.gradle @@ -44,13 +44,14 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.1' + implementation rootProject.ext.dependencies.material + implementation rootProject.ext.dependencies.androidxconstraintlayout + implementation rootProject.ext.dependencies.androidxappcompat implementation 'androidx.recyclerview:recyclerview:1.2.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - implementation "com.google.code.gson:gson:2.8.9" + implementation rootProject.ext.dependencies.gson implementation project(':libraries:mogo-adas') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java index c44ba91b5e..5a61091fe3 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java @@ -76,7 +76,6 @@ import com.zhidao.support.adas.high.common.Constants.IPC_CONNECTION_STATUS; import com.zhidao.support.adas.high.common.CupidLogUtils; import com.zhidao.support.adas.high.common.ProtocolStatus; import com.zhidao.support.adas.high.common.ReceiveTimeoutManager; -import com.zhidao.support.recorder.RecordDataManager; import java.net.Inet4Address; import java.net.InetAddress; @@ -278,7 +277,6 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas etIp.setSelection(ip.length()); } -// infoTitleList.add("录音测试"); //初始化fragment manager = getSupportFragmentManager(); transaction = manager.beginTransaction(); @@ -446,7 +444,6 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas titleBtnData.add("数据采集5秒"); titleBtnData.add("数据采集start"); titleBtnData.add("数据采集end"); - titleBtnData.add("录音测试"); titleBtnData.add("发送信号灯"); titleBtnData.add("自动驾驶限速"); titleBtnData.add("重启Docker"); @@ -1012,12 +1009,6 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas CupidLogUtils.w(TAG, "AutopilotRecord===>send:" + bEnd); break; case 6: - //录音测试 - CupidLogUtils.w(TAG, "录音测试"); - RecordDataManager.getInstance().init(MainActivity.this, "1234567", "", 22, "", ""); - RecordDataManager.getInstance().record(); - break; - case 7: //发送信号灯 MessagePad.TrafficLightStatus left = MessagePad.TrafficLightStatus.newBuilder() .setPhaseNo("1") @@ -1041,7 +1032,7 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas .build(); AdasManager.getInstance().sendTrafficLightData("10038", 26.848153, 112.574883, "180.0", "SN", 100413, -4, 201, 0, detail); break; - case 8: + case 7: //速度设置 AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle("自动驾驶限速"); @@ -1068,27 +1059,27 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas builder.show();//显示Dialog对话框 break; - case 9: + case 8: //重启Docker AdasManager.getInstance().rebootAPDocker(); break; - case 10: + case 9: //重启IPC AdasManager.getInstance().rebootIPC(); break; - case 11: + case 10: //关机 AdasManager.getInstance().shutdownIPC(); break; - case 12: + case 11: //采集类型 AdasManager.getInstance().sendRecordCause(recordKey, recordFileName, "1", "变道有干扰"); break; - case 13: + case 12: //打开演示模式 AdasManager.getInstance().sendDemoModeReq(1); break; - case 14: + case 13: //关闭演示模式 AdasManager.getInstance().sendDemoModeReq(0); break; diff --git a/app_ipc_monitoring/src/main/res/values/styles.xml b/app_ipc_monitoring/src/main/res/values/styles.xml index 725f5b6689..71a18efd24 100644 --- a/app_ipc_monitoring/src/main/res/values/styles.xml +++ b/app_ipc_monitoring/src/main/res/values/styles.xml @@ -28,4 +28,7 @@ true +