From 628aeab66d7393e58372a2a0e805235165dad3f5 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Thu, 25 Nov 2021 15:48:33 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=E5=8D=87=E7=BA=A7ARouter=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86assemble=E5=90=8C=E6=97=B6=E6=89=93?= =?UTF-8?q?=E5=8C=85=E7=9A=84=E9=97=AE=E9=A2=98=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6=E7=8A=B6=E6=80=81=E5=9B=9E?= =?UTF-8?q?=E6=8E=89=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- app/regroup.gradle | 20 ------------------- .../com/mogo/launcher/MogoApplication.java | 2 +- build.gradle | 5 +++++ config.gradle | 4 ++-- .../module/adas/OnAdasListenerAdapter.java | 3 ++- 5 files changed, 10 insertions(+), 24 deletions(-) diff --git a/app/regroup.gradle b/app/regroup.gradle index 01bff408c2..8d6313ec6e 100644 --- a/app/regroup.gradle +++ b/app/regroup.gradle @@ -1,23 +1,12 @@ // 将 install 和 assemble 任务按功能分组 - afterEvaluate { - def independent = ["bydauto", "phone"] def launcher = ["f80x", "f8xx", "f8amap", "fochtaxi", "fochbus", "fPadLenovo", "fPadLenovoOchTaxi", "fPadLenovoOchBus"] it.getTasks().iterator().forEachRemaining { def task = it def taskName = task.name if (taskName.startsWith("assemble") - && taskName.contains("Independent") - && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) { - independent.forEach { - if (taskName.toLowerCase().contains(it)) { - task.group = "assembleIndependent" - } - } - } else if (taskName.startsWith("assemble") - && taskName.contains("Launcher") && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) { launcher.forEach { if (taskName.toLowerCase().contains(it)) { @@ -25,15 +14,6 @@ afterEvaluate { } } } else if (taskName.startsWith("install") - && taskName.contains("Independent") - && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) { - independent.forEach { - if (taskName.toLowerCase().contains(it)) { - task.group = "installIndependent" - } - } - } else if (taskName.startsWith("install") - && taskName.contains("Launcher") && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) { launcher.forEach { if (taskName.toLowerCase().contains(it)) { diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 6261723584..5cb6af19d8 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -33,7 +33,7 @@ public class MogoApplication extends MainMoGoApplication { @Override protected void initCloudClientConfig() { - // todo 使用旧Socket链路 + // todo 使用旧Socket链路 true = 旧链路，false = 新链路 //clientConfig.setUseOriginSocket(true); } diff --git a/build.gradle b/build.gradle index 96e8020948..e0905d9fd8 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,11 @@ buildscript { // classpath ("com.tencent.matrix:matrix-gradle-plugin:0.6.6") { changing = true } } + // 遇无法更新依赖情况（针对Snapshot无法刷新）然后sync project即可，刷新完成注释该代码 +// configurations.all { +// // 缓存时间设置为0，立即更新 +// resolutionStrategy.cacheChangingModulesFor 0, 'seconds' +// } } diff --git a/config.gradle b/config.gradle index c1d826e5b9..d5e6c91d1c 100644 --- a/config.gradle +++ b/config.gradle @@ -50,8 +50,8 @@ ext { rxjava : "io.reactivex.rxjava2:rxjava:2.2.2", rxandroid : "io.reactivex.rxjava2:rxandroid:2.1.1", // arouter - arouter : "com.alibaba:arouter-api:1.0.9-mogo", - aroutercompiler : "com.alibaba:arouter-compiler:1.0.9-mogo", + arouter : "com.alibaba:arouter-api:1.0.12-mogo", + aroutercompiler : "com.alibaba:arouter-compiler:1.0.12-mogo", // glide glide : 'com.github.bumptech.glide:glide:4.8.0', glideokhttp3 : 'com.github.bumptech.glide:okhttp3-integration:4.8.0', diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java index 80040e80c6..5628b10a52 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java @@ -87,6 +87,7 @@ public class OnAdasListenerAdapter implements OnAdasListener { @Override public void autopilotArrive(AutopilotWayArrive autopilotWayArrive) { + Logger.d(TAG, "autopilotArrive : " + autopilotWayArrive); if (autopilotWayArrive != null) { AutopilotWayArrive.ResultBean result = autopilotWayArrive.getResult(); if (result != null) { @@ -109,6 +110,7 @@ public class OnAdasListenerAdapter implements OnAdasListener { @Override public void onAutopilotTrajectory(List trajectoryList) { + Logger.d(TAG, "onAutopilotTrajectory : " + trajectoryList); ArrayList trajectoryInfoArrayList = new ArrayList<>(); if (trajectoryList != null && trajectoryList.size() > 0) { for (TrajectoryInfo trajectory : trajectoryList) { @@ -161,7 +163,6 @@ public class OnAdasListenerAdapter implements OnAdasListener { public void onWarnMessage(WarnMessageInfo warnMessageInfo) { final AutopilotWarnMessage warnMessage = AdasObjectUtils.INSTANCE.fromAdasObject(warnMessageInfo); CallerAutopilotIdentifyListenerManager.INSTANCE.invokeAutopilotWarnMessage(warnMessage); - } @Override