Commit Graph

12455 Commits

Author SHA1 Message Date
wangmingjun
500ee49449 [2.11.0/1.6.0] bus司机端/乘客端路线面板绿点闪烁调整 2022-09-28 17:52:57 +08:00
yangyakun
7ad9ebcb30 [fix] 登录界面和影音娱乐页面隐藏底部状态栏 2022-09-28 17:45:47 +08:00
renwj
1d0f1422d5 [V2X][Road]优化道路标记颜色逻辑
[V2X][Road]优化道路标记颜色逻辑2
2022-09-28 17:23:42 +08:00
zhongchao
86ea6c9d3d remove test code 2022-09-28 16:12:02 +08:00
zhongchao
6f5a63655b test 2022-09-28 16:12:02 +08:00
lixiaopeng
95e8d54ad6 add log 2022-09-28 16:07:23 +08:00
chenfufeng
b7c4e718f8 [Feat]修改obu v2i颜色值 2022-09-28 15:54:27 +08:00
yangyakun
625f246bc9 [2110] 地图版本回归等待高精地图发布 2022-09-28 15:38:27 +08:00
lixiaopeng
fcf1a1e482 黑夜模式行人模型可移动 2022-09-28 15:26:28 +08:00
lixiaopeng
9c6e50b5bf 修改obu sdk版本 2022-09-28 14:40:06 +08:00
renwj
06b66354f8 [地图SDK]升级至2.6.0.3-增加获取道路名称接口 2022-09-28 11:00:38 +08:00
chenfufeng
26b6eaa51d [Fix]乘客屏先不传sn给工控机 2022-09-28 10:27:35 +08:00
wangmingjun
47e6249300 Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into 'test_robotaxi-d-app-module_2110_220915_2.11.0.1'
Dev robotaxi d app module 2110 220915 2.11.0

See merge request zhjt/AndroidApp/MoGoEagleEye!223
2022-09-27 11:52:39 +00:00
wangmingjun
581771a395 Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2110_220915_2.11.0 2022-09-27 19:50:06 +08:00
wangmingjun
bcfc108b49 [2.11.0/1.6.0] 1、bus司机端点击开启自动驾驶去除语音 2、bus司机端路线面板优化 3、taxi司机端文字:安全模式 2022-09-27 19:49:58 +08:00
yangyakun
980f3c635b [2110] Fragment 重复问题 2022-09-27 18:52:04 +08:00
zhongchao
0135f5dd1a ui 2022-09-27 18:38:22 +08:00
zhongchao
e5a47871ad add logic of biz pull when get car config mac 2022-09-27 18:33:23 +08:00
yangyakun
54543fcf7b [2110] 样式修改 2022-09-27 18:23:45 +08:00
yangyakun
6b7a8a7485 [2110] 评价顺序临时修改、评论页面调整 2022-09-27 17:29:12 +08:00
zhongchao
b7f7a5f3d3 add test code of biz config 2022-09-27 17:04:40 +08:00
wangmingjun
9164d00ccb Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into 'test_robotaxi-d-app-module_2110_220915_2.11.0.1'
Dev robotaxi d app module 2110 220915 2.11.0

See merge request zhjt/AndroidApp/MoGoEagleEye!220
2022-09-27 04:06:24 +00:00
renwj
0a34234f8b [V2X][Road]优化代码逻辑 2022-09-27 11:32:19 +08:00
wangmingjun
03f21e6dd8 [2.11.0/1.6.0] bus乘客屏删除detachWindow 2022-09-27 11:24:02 +08:00
zhongchao
89e56a2376 add biz 2022-09-27 10:49:53 +08:00
wangmingjun
ac0fdbe376 Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into 'test_robotaxi-d-app-module_2110_220915_2.11.0.1'
[2.11.0/1.6.0]bus 司机端查询乘客条件修改

See merge request zhjt/AndroidApp/MoGoEagleEye!219
2022-09-27 02:34:15 +00:00
wangmingjun
20608e8e03 [2.11.0/1.6.0]bus 司机端查询乘客条件修改 2022-09-27 10:33:04 +08:00
wangmingjun
33a3ca7e65 Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into 'test_robotaxi-d-app-module_2110_220915_2.11.0.1'
Dev robotaxi d app module 2110 220915 2.11.0

See merge request zhjt/AndroidApp/MoGoEagleEye!217
2022-09-26 13:14:16 +00:00
wangmingjun
2826307539 [2.11.0/1.6.0]司机端修改版本号2.11.0 2022-09-26 21:13:30 +08:00
wangmingjun
efcd23555b Merge branch 'dev_robotaxi-p-app_160_220926_1.6.0' into 'dev_robotaxi-d-app-module_2110_220915_2.11.0'
# Conflicts:
#   gradle.properties
2022-09-26 13:07:19 +00:00
wangmingjun
841f790790 Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into 'test_robotaxi-d-app-module_2110_220915_2.11.0.1'
[2.11.0/1.6.0]司机端修改版本号2.11.0

See merge request zhjt/AndroidApp/MoGoEagleEye!214
2022-09-26 13:06:36 +00:00
wangmingjun
57a532814f [2.11.0/1.6.0]司机端修改版本号2.11.0 2022-09-26 21:06:09 +08:00
wangmingjun
bb0b779bbb [2.11.0/1.6.0]乘客屏修改版本号1.6.0 2022-09-26 21:05:12 +08:00
wangmingjun
6241c4bf4a Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into 'test_robotaxi-d-app-module_2110_220915_2.11.0.1'
[2.11.0/1.6.0]bus司机端播报去"站"

See merge request zhjt/AndroidApp/MoGoEagleEye!213
2022-09-26 13:03:20 +00:00
wangmingjun
081506f92c [2.11.0/1.6.0]bus司机端播报去"站" 2022-09-26 21:02:47 +08:00
aibingbing
0b84e309f8 Merge branch 'release_robosweeper-d_100-sweeper_220830_1.0.0.1_merge' into 'master'
清扫车司机屏V1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!211
2022-09-26 12:47:11 +00:00
aibingbing
fa090ed8ba [清扫车][merge]: 合并清扫车司机端V1.0.0代码时,对比master分支代码,reset 无关的代码修改; 2022-09-26 20:44:00 +08:00
wangmingjun
a23edef1c7 Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into 'test_robotaxi-d-app-module_2110_220915_2.11.0.1'
[2.11.0/1.6.0]taxi乘客屏绑定司机端sn

See merge request zhjt/AndroidApp/MoGoEagleEye!212
2022-09-26 12:35:19 +00:00
wangmingjun
e15d14088a [2.11.0/1.6.0]taxi乘客屏绑定司机端sn 2022-09-26 20:30:35 +08:00
wangmingjun
26f381aa2c [2.11.0/1.6.0]bus乘客端UI走查,图片调整 2022-09-26 19:49:57 +08:00
wangmingjun
bc93b06dc2 [2.11.0/1.6.0]bus司机端/乘客端动画调整,bus司机端语音播报调整 2022-09-26 19:47:37 +08:00
yangyakun
6ce6a01de5 [2110] 透明度修改 2022-09-26 19:27:24 +08:00
aibingbing
6a21e175b4 Merge branch 'master' into release_robosweeper-d_100-sweeper_220830_1.0.0.1_merge
# 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/MoGoAutopilotProvider.kt
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
#	core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapPointCloudSubscriber.kt
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
#	gradle.properties
#	libraries/mogo-adas-data/src/main/proto/message_pad.proto
#	libraries/mogo-adas-data/src/main/proto/special_vehicle_task_cmd.proto
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
2022-09-26 19:16:37 +08:00
renwj
e2b1a7d925 [线程优化]将版本声明成全局变量 2022-09-26 18:52:01 +08:00
zhongchao
4b07a4c98b fix bug and add biz lock state of view 2022-09-26 17:45:28 +08:00
wangmingjun
b113afe827 Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2110_220915_2.11.0
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
2022-09-26 17:43:22 +08:00
wangmingjun
a952be6f5c Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2110_220915_2.11.0 2022-09-26 17:41:59 +08:00
zhongchao
01a245d37e change the vip biz loc 2022-09-26 16:43:13 +08:00
renwj
32c26e73f9 [V2X][Road]优化代码逻辑 2022-09-26 16:41:34 +08:00
yangyakun
bdb274fca2 [2110] 打开状态下自动清理过期选中的线路和 2022-09-26 16:04:16 +08:00