Commit Graph

46 Commits

Author SHA1 Message Date
chenfufeng
0f7a2453d8 [Update]Adas多屏代码更改、Netty框架自定义协议并解决粘包/拆包问题 2022-02-14 16:06:37 +08:00
donghongyu
1565cfacf4 Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge 2022-02-11 19:05:19 +08:00
donghongyu
73df669bc1 [Change]
解决adas冲突

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-11 17:34:28 +08:00
donghongyu
32c3ea9c3e [Change]
回滚adas版本

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-11 16:37:17 +08:00
donghongyu
991d68ec54 [Change]
增加对工控机美化模式的调用

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-11 16:12:06 +08:00
donghongyu
36a9a73df8 [Change]
打开ADAS日志相关

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-11 14:56:36 +08:00
donghongyu
e8a0ce84f7 [Change]
修复合并异常

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-09 11:43:24 +08:00
donghongyu
ff1a06268b Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge
# Conflicts:
#	app/build.gradle
#	core/function-impl/mogo-core-function-autopilot/build.gradle
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java
#	modules/mogo-module-adas/build.gradle
2022-02-09 10:59:31 +08:00
donghongyu
4dc06e5817 [Change]
完成mogo-module-adas合并到MoGoEagleEye.core.function-impl.mogo-core-function-autopilot

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-08 20:26:15 +08:00
donghongyu
117897d576 [Change]
整理ADAS相关代码

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-08 19:07:28 +08:00
donghongyu
e8e375f5ae Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge
# Conflicts:
#	app/build.gradle
2022-02-07 19:15:11 +08:00
zhongchao
435f511416 add new func of track process of adas 2022-02-04 18:32:37 +08:00
xuxinchao
ff77a2eeb4 ad upgrade
ad upgrade confirm and cancel instructions issued
2022-01-29 16:19:38 +08:00
donghongyu
71898883e5 [Upload]
//是否是演示(美化)模式,会存在SP中,方便做现场恢复
FunctionBuildConfig.isDemoMode
当前APP的身份模式
0 = 司机模式(默认)
1 = 乘客模式(部分功能受到影响)
FunctionBuildConfig.appIdentityMode

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-01-25 17:42:43 +08:00
renwj
4d4a200e38 [BadCase]更新Adas版本号 2022-01-20 19:24:39 +08:00
renwenjie
48d9baa3bb [BadCase]代码提交 2022-01-19 15:54:30 +08:00
renwenjie
63b99ee896 [Adas]版本升级 2022-01-19 15:38:01 +08:00
zhongchao
0926a8b399 add system operation view 2022-01-11 19:42:03 +08:00
donghongyu
cee45c4fb4 [Add]
增加了设置连接工控机IP的调用

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2021-12-21 18:03:55 +08:00
chenfufeng
113cc80c2d [Update]调整交互和修复键盘Bug 2021-12-11 22:34:10 +08:00
chenfufeng
d4a9ccede9 [Feat]添加自动驾驶设置车速功能 2021-12-10 16:14:49 +08:00
donghongyu
26d1dfb20a [Add]DebugSettingView增加动态控制日志输出
Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2021-11-19 19:06:42 +08:00
donghongyu
528a4ae7c2 [Fix]修复无法开启自动驾驶,原因是传给工控机的action写错,正确的json如下
{"action":"aiCloudToStartAutopilot","result":{"endLatLon":{"lat":40.19925515953876,"lon":116.73274535677977},"isSpeakVoice":false,"speedLimit":0.0,"startLatLon":{"lat":40.19915728944592,"lon":116.73675895051454},"vehicleType":10,"wayLatLons":null}}

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2021-11-16 16:26:08 +08:00
zhongchao
8580551598 add new func of send data to adas 2021-11-10 11:40:32 +08:00
donghongyu
cde1338251 [Add function]增加了同步数据给域控制器的方法,TODO需要 @钟超 修改下
Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2021-11-09 19:58:03 +08:00
董宏宇
7807cff6df 防止歧义已将gradle.properties 中RELEASE改为USE_MAVEN_PACKAGE
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-11-02 16:43:52 +08:00
董宏宇
7fd5b7e9d6 抽离自车状态回调监听
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-11-02 14:21:03 +08:00
董宏宇
adc973bbfc 将工控机感知数据回调与状态信息回调分离
CallerAutoPilotManager增加开启、停止自动驾驶方法

Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-11-01 18:49:13 +08:00
董宏宇
8c1ed9f97f 完成 Maven 发布
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-29 20:51:15 +08:00
董宏宇
a70eed4475 合并dev_MogoAP_eagle-930_210926_8.0.12分支,并将规划全局路径以及引导线按照新架构中的监听合并,测试可用,在工控机上执行sh roadPlanning.sh 使用带有引导线的数据包
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-28 15:25:26 +08:00
董宏宇
79a99b4202 增加子线程更新地图识别元素的功能
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-20 13:21:57 +08:00
董宏宇
b585c4fd2e 修复
java.lang.NoClassDefFoundError: Failed resolution of: Lcom/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider$DefaultImpls;
	at com.mogo.eagle.core.function.autopilot.MoGoAutopilotProvider.onDestroy(MoGoAutopilotProvider.kt:19)
	at com.mogo.module.main.cards.MogoModulesManager.onDestroy(MogoModulesManager.java:320)
	at com.mogo.module.main.MainActivity.onDestroy(MainActivity.java:416)
	at com.zhidao.mogo.module.main.launcher.MainLauncherActivity.onDestroy(MainLauncherActivity.java:152)

Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-19 17:34:17 +08:00
董宏宇
b31f2b64c7 修改类文件名称大小写问题2
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-18 20:01:06 +08:00
董宏宇
cf9767436f 修改类文件名称大小写问题2
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-18 19:53:42 +08:00
董宏宇
1f4f906748 修改类文件名称大小写问题
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-18 19:50:39 +08:00
董宏宇
3bb1f8aa84 完成新架构的域控制器的监听及数据改造
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-18 19:35:58 +08:00
董宏宇
f7c3686ddb 尝试提交没成功的代码
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-18 19:31:45 +08:00
董宏宇
8a3e122518 完成新架构的域控制器的监听及数据改造
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-18 19:16:41 +08:00
董宏宇
da955835a2 修复 模块加载 类型转换异常
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-15 18:57:07 +08:00
董宏宇
b1bb68d57b 升级ADAS版本,控制台输出adas版本信息
开始重构ADAS的相关内容

Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-14 14:51:05 +08:00
董宏宇
ef0c6da1d8 规范自动驾驶命名
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-13 15:01:01 +08:00
董宏宇
78daacaae7 迁移MogoServicePaths位置到com.mogo.eagle.core.data.constants
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-13 14:46:34 +08:00
董宏宇
fb2e96f996 Rename .java to .kt
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-13 14:46:34 +08:00
董宏宇
9802124169 完成了自动驾驶状态信息回传
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-12 21:24:58 +08:00
董宏宇
aa01a90a6a 修改AndroidManifest.xml中的包名
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-26 14:42:22 +08:00
董宏宇
808e772cce 准备抽离AutoPilot调用逻辑,有些多,放在10月份进行
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-22 21:14:08 +08:00