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

[Update]升级ARouter，解决了assemble同时打包的问题

Browse Source 
增加自动驾驶状态回掉日志输出

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2021-11-25 15:48:33 +08:00
parent 93c647a198
commit 628aeab66d
5 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/regroup.gradle
View File

@@ -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)) {

2
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

@@ -33,7 +33,7 @@ public class MogoApplication extends MainMoGoApplication {
@Override
protected void initCloudClientConfig() {
// todo 使用旧Socket链路
// todo 使用旧Socket链路 true = 旧链路，false = 新链路
//clientConfig.setUseOriginSocket(true);
}

5
build.gradle
View File

@@ -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'
// }
}

4
config.gradle
View File

@@ -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',

3
modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java
View File

@@ -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<TrajectoryInfo> trajectoryList) {
Logger.d(TAG, "onAutopilotTrajectory : " + trajectoryList);
ArrayList<ADASTrajectoryInfo> 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