Commit Graph

8608 Commits

Author SHA1 Message Date
zhongchao
74fd7e762c remove build cache 2022-03-15 11:18:52 +08:00
zhongchao
288500fbb0 merge 2022-03-15 11:18:51 +08:00
zhongchao
06f3cfdd8b merge 2022-03-15 11:18:51 +08:00
pangfan
c41a813389 [Taxi Passenger v1.1.0]乘客端红绿灯呈现 2022-03-15 09:25:53 +08:00
wangmingjun
733b7ad481 [Taxi Passenger v1.1.0] taxi-p 代码调整 2022-03-14 21:18:03 +08:00
lixiaopeng
747d5388f9 opt 2022-03-14 16:03:32 +08:00
lixiaopeng
80368a1300 opt turn ligth ui and logic 2022-03-14 15:28:58 +08:00
pangfan
129732e68e Merge branch 'dev_robotaxi-p-app_110_220304_1.1.0' into 'dev_robotaxi-d-app-module_260_220304_2.6.0'
Dev robotaxi p app 110 220304 1.1.0

See merge request zhjt/AndroidApp/MoGoEagleEye!10
2022-03-14 07:25:44 +00:00
wangmingjun
6b5f0aafd0 [Taxi Passenger v1.1.0] taxi-p orderNo调整 2022-03-14 15:02:37 +08:00
wangmingjun
9c76bdbff1 [Taxi Passenger v1.1.0] taxi/bus-d taxi-p 接口调整,需求开发 2022-03-14 14:58:05 +08:00
donghongyu
c5b559fec5 [Change]
修复冲突

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-11 19:55:59 +08:00
donghongyu
9a44d03347 Merge branch 'dev_robotaxi-p-app_110_220304_1.1.0' into dev_robotaxi-d-app-module_260_220304_2.6.0
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
#	core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt
2022-03-11 19:45:27 +08:00
donghongyu
90b2f095e4 [Change]
增加限速监听
CallLimitingVelocityListenerManager.addListener(LimitingVelocityListener)

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-11 19:33:43 +08:00
donghongyu
839df02f43 [Change]
增加HMI中红绿灯View代理设置,setProxyTrafficLightView,代理View需要实现IViewTrafficLight抽象类

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-11 19:04:03 +08:00
renwj
6d98a9391a [BadCase]修正UI 2022-03-11 17:49:39 +08:00
renwj
cc38a7509c [BadCase]增加case间的间距 2022-03-10 19:34:43 +08:00
renwj
c456a230d8 [Code]无用代码,用于测试 2022-03-10 11:49:41 +08:00
donghongyu
c840d992a7 Merge branch 'dev_robotaxi-d-app-module_255_220303_2.5.5' into dev_robotaxi-d-app-module_260_220304_2.6.0 2022-03-09 17:42:37 +08:00
donghongyu
6f6da8d6f3 [Change]
兼容小巴车更换
192.168.1.102
192.168.8.102

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-09 17:22:12 +08:00
renwj
a6267114d4 [BadCase]BadCase业务移植到DevaTools模块
[BadCase]入口展示和入口隐藏回调添加

[BadCase]移除之前无用的逻辑

[BadCase]code
2022-03-09 16:46:30 +08:00
wangmingjun
33f804c705 [Taxi -d v2.5.5] MAP_SDK_VERSION 升级到 2.0.5.3,解决绘制起终点问题 2022-03-09 16:09:28 +08:00
renwj
6a17ee9f68 [Chat]车聊聊架构升级 2022-03-09 11:18:30 +08:00
lixiaopeng
8a6a72bc13 opt 2022-03-08 17:19:53 +08:00
chenfufeng
9ca2a852d6 [Fix]取消悬浮窗权限 2022-03-08 16:39:32 +08:00
lixiaopeng
eae15c21e8 opt draw line 2022-03-08 15:40:25 +08:00
wangmingjun
b1299cf805 Merge branch 'dev_robotaxi-p-app_110_220304_1.1.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-p-app_110_220304_1.1.0 2022-03-08 15:17:29 +08:00
wangmingjun
608b62ba6c [Taxi Passenger v1.1.0] taxi/bus-d taxi-p 部分接口整理 2022-03-08 15:17:21 +08:00
pangfan
8be4764e37 Merge remote-tracking branch 'origin/dev_robotaxi-p-app_110_220304_1.1.0' into dev_robotaxi-p-app_110_220304_1.1.0 2022-03-08 14:28:48 +08:00
wangmingjun
06d05af963 [Taxi Passenger v1.1.0] taxi passenger 代码整理 2022-03-08 14:28:14 +08:00
lixiaopeng
2d13c1e1f8 opt 2022-03-08 13:57:52 +08:00
wangmingjun
44c7599c6a [Taxi -d v2.5.5] MAP_SDK_VERSION 升级到 2.0.5.2 2022-03-07 19:43:54 +08:00
zhongchao
339a33bdff add log 2022-03-07 17:24:08 +08:00
chenfufeng
2754dda02f [Fix]关闭工控机传输过来的数据的日志输出 2022-03-07 17:07:37 +08:00
wangmingjun
b79ee44239 [Taxi Passenger v1.1.0] taxi passenger 代码整理 2022-03-07 11:21:11 +08:00
lixiaopeng
ea62d0eae3 fixed bug 2022-03-07 11:12:32 +08:00
donghongyu
a1d717ad81 Merge branch 'dev_robotaxi-d-app-module_255_220303_2.5.5' into local_change 2022-03-04 16:59:11 +08:00
donghongyu
3cc9fbe4bf [Change]
合并小地图到地图模块

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-04 16:58:57 +08:00
chenfufeng
02bdba7832 [Update]离线TTS支持语音播报完成的回调和停止语音播报 2022-03-04 16:05:10 +08:00
donghongyu
b02481462e [Change]
完成main转移

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-04 14:57:03 +08:00
wangmingjun
b382c54612 [Taxi -d v2.5.5] versionName -> 2.5.5 2022-03-03 20:24:49 +08:00
donghongyu
1ff9beb200 [Change]
修复网约车模块加载异常

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-03 19:50:23 +08:00
chenfufeng
1656d7f688 [Fix]解决合并代码时乘客端初始化参数错误的问题 2022-03-03 18:28:18 +08:00
chenfufeng
b8b705e8a2 [Update]启用多屏功能 2022-03-03 17:51:02 +08:00
donghongyu
f2e8608e08 Merge branch 'dev_robotaxi-p-app_254_220228_2.5.4' 2022-03-03 16:51:50 +08:00
xinfengkun
9b7f04d015 Merge branch 'dev_robotaxi-p-app_254_220228_2.5.4' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-p-app_254_220228_2.5.4 2022-03-03 16:29:06 +08:00
xinfengkun
ba720c405b [fixed]修复正在连接时断开失败问题,修复主动端看连接时固定IP轮序未停止问题 2022-03-03 16:28:58 +08:00
donghongyu
93b0a23b8d Merge branch 'dev_robotaxi-p-app_254_220228_2.5.4' 2022-03-03 16:21:30 +08:00
donghongyu
7a5d86bad4 [Change]
更改未知类型的模型

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-03 16:21:09 +08:00
donghongyu
2a71dd3ba6 Merge branch 'test_robotaxi-d-app-module_251_220125_2.5.1.1' into dev_robotaxi-p-app_254_220228_2.5.4 2022-03-03 10:28:37 +08:00
donghongyu
a086268748 Merge branch 'dev_robotaxi-p-app_254_220228_2.5.4' 2022-03-02 20:21:25 +08:00