yangyakun
|
1607c60435
|
Merge branch 'master' into dev_robouiadapter_1062_221117_1.6.2
# Conflicts:
# OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
# OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
# OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
# OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
# OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml
# app/src/main/java/com/mogo/launcher/MogoApplication.java
# core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
# core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
# core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml
# gradle.properties
|
2022-11-18 10:36:15 +08:00 |
|
pangfan
|
2b38bf67c0
|
Merge remote-tracking branch 'origin/release_robotaxi-d-app-module_2120_221017_2.12.0.1'
# Conflicts:
# core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
# core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
# libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
|
2022-11-15 11:23:39 +08:00 |
|
zhongchao
|
900213d694
|
[2.12.0]find the wu yu zi code and update log version
|
2022-11-11 19:16:53 +08:00 |
|
lixiaopeng
|
9707137c21
|
修改设置速度按钮
|
2022-11-11 17:11:22 +08:00 |
|
yangyakun
|
0aadcd8763
|
[2.8.0-f] 资源整理
|
2022-11-11 15:12:17 +08:00 |
|
yangyakun
|
e75db415e7
|
[2.8.0-f] 方向盘向左时竖线bug
|
2022-11-10 10:45:05 +08:00 |
|
yangyakun
|
4cdcd9bad2
|
[2.8.0-f] 版本号修改、background影响paddin、图片适配
|
2022-11-09 17:15:00 +08:00 |
|
lianglihui
|
e2d90821eb
|
2.12.0 revert 小地图修改 213再处理
|
2022-11-09 14:49:54 +08:00 |
|
xinfengkun
|
59710530fe
|
Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2120_221017_2.12.0
|
2022-11-09 14:22:11 +08:00 |
|
xinfengkun
|
8ba6f22c19
|
[change] 统计回调添加注册取消注册
|
2022-11-09 14:22:00 +08:00 |
|
lianglihui
|
d4b800e89e
|
2.12.0 fix ADCU 全局路径数据和自动驾驶状态不一致导致的 小地图轨迹被清除
|
2022-11-08 16:55:18 +08:00 |
|
lianglihui
|
594859bf01
|
2.12.0 fix ADCU 全局路径数据和自动驾驶状态不一致导致的 小地图轨迹被清除
|
2022-11-08 16:41:32 +08:00 |
|
lianglihui
|
620d1f8c3c
|
2.12.0 fix ADCU 全局路径数据和自动驾驶状态不一致导致的 小地图轨迹被清除
|
2022-11-08 16:41:11 +08:00 |
|
xinfengkun
|
67a2c13b21
|
Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2120_221017_2.12.0_launch_autopilot_fail
|
2022-11-07 15:01:07 +08:00 |
|
xinfengkun
|
773e8e57a6
|
[change] 添加启动自动驾驶失败回调，以及启动自动驾驶统计回调，启动自动驾驶统计回调注册形式分发
|
2022-11-07 14:56:52 +08:00 |
|
xuxinchao
|
907c909542
|
修复自定义BadCase模板Topic列表设置弹窗搜索Bug
|
2022-11-04 17:38:20 +08:00 |
|
yangyakun
|
7af1c2de2b
|
[2.8.0-f] 图标适配
|
2022-11-04 16:00:33 +08:00 |
|
chenfufeng
|
9f74e72cbc
|
[Opt]语音TTS授权时机提前
|
2022-11-04 15:02:34 +08:00 |
|
xuxinchao
|
592e7a90c8
|
BadCase自定义录包兼容老MAP版本
|
2022-11-03 18:51:33 +08:00 |
|
xuxinchao
|
6378115949
|
BadCase自定义录包兼容老MAP版本
|
2022-11-03 16:25:25 +08:00 |
|
zhongchao
|
39ececd4d7
|
fit android 10 about window focus in bar status
|
2022-11-03 15:34:03 +08:00 |
|
xuxinchao
|
1cba06d724
|
修改变道速度阈值限制文案
|
2022-11-03 15:27:07 +08:00 |
|
xuxinchao
|
73babfabe1
|
修复自定义录包，每次重新保存的时候，会把上次自定义的topic也会下发Bug
|
2022-11-03 15:26:32 +08:00 |
|
renwj
|
a1dddbcf92
|
[状态栏]去掉定时请求topic状态的逻辑
|
2022-11-03 12:10:13 +08:00 |
|
renwj
|
ced7a9c76d
|
[V2X][Road]地图气泡tag过滤优化
|
2022-11-03 10:59:43 +08:00 |
|
lixiaopeng
|
aaf71ba91a
|
修改bug
|
2022-11-02 19:32:49 +08:00 |
|
renwj
|
73838f6bf8
|
[V2X][Road]解决取消订单后,道路施工绘制消失
|
2022-11-02 16:59:39 +08:00 |
|
renwj
|
fa8b121fc4
|
[状态栏]循迹状态逻辑优化
|
2022-11-02 16:25:58 +08:00 |
|
xuxinchao
|
bddb6a46ba
|
运营面板增加是否展示工控机异常上报弹窗控制按钮
|
2022-11-01 17:58:39 +08:00 |
|
yangyakun
|
0bc581a394
|
[2.8.0-f] bus busp taxi 适配完成
|
2022-11-01 17:21:42 +08:00 |
|
xuxinchao
|
b3cc052612
|
BadCase自定义录包Topic选择，选中后自动置顶
|
2022-11-01 17:03:15 +08:00 |
|
zhongchao
|
7adb83e252
|
fit ui
|
2022-11-01 10:50:35 +08:00 |
|
yangyakun
|
baf5a1f168
|
[2.8.0-f] him ui适配
|
2022-10-31 21:27:10 +08:00 |
|
yangyakun
|
222a669502
|
[2.8.0-f] 加速度字体修改、
|
2022-10-31 19:39:18 +08:00 |
|
zhongchao
|
7ab9116e72
|
fix status bar problem
|
2022-10-31 19:31:22 +08:00 |
|
yangyakun
|
f83b962e6f
|
[2.8.0-f] 屏幕适配 删除废弃代码
|
2022-10-31 15:03:14 +08:00 |
|
pangfan
|
a676ea93c9
|
opt:merge conflict resolved(清扫车司机端app修改引入)
|
2022-10-31 14:23:20 +08:00 |
|
pangfan
|
a68463a813
|
Merge branch 'master' into 'release_robotaxi-d-app-module_2110_220915_2.11.0.1'
# Conflicts:
# app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
# core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
|
2022-10-31 03:08:24 +00:00 |
|
yangyakun
|
79e4606461
|
土司 AlertDialog 修改
|
2022-10-30 23:44:10 +08:00 |
|
yangyakun
|
20509fce0c
|
[2.8.0-f] 屏幕适配
|
2022-10-28 20:44:07 +08:00 |
|
zhongchao
|
375d0fe5fd
|
remove log and test code
|
2022-10-28 19:34:35 +08:00 |
|
yangyakun
|
27f40d2d2c
|
[2.8.0-f] 屏幕适配
|
2022-10-28 16:36:56 +08:00 |
|
renwj
|
bc87e347d7
|
[V2X]弱势交通参与者下发后没有解析
|
2022-10-28 16:00:37 +08:00 |
|
zhongchao
|
30b3432cb1
|
..
|
2022-10-28 14:38:53 +08:00 |
|
renwj
|
c365bc85c6
|
[V2X][Road]优化超时消失逻辑
|
2022-10-28 12:07:12 +08:00 |
|
zhongchao
|
aac8940caa
|
fix ui problem and wait to addnew ui
|
2022-10-27 19:48:00 +08:00 |
|
wangmingjun
|
704035eee3
|
Revert "Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into…"
This reverts merge request !315
|
2022-10-27 11:20:05 +00:00 |
|
renwj
|
ccee8bd5e0
|
[V2X][Road]添加施工占道数据10秒未收到消失逻辑
|
2022-10-27 18:20:50 +08:00 |
|
xuxinchao
|
b31cbc58b1
|
运营面板布局修改
|
2022-10-27 17:04:50 +08:00 |
|
xuxinchao
|
45eddf619c
|
BadCase自定义录包
|
2022-10-27 16:51:04 +08:00 |
|