Commit Graph

12455 Commits

Author SHA1 Message Date
wangmingjun
cea43608dc [2.13.0] bus乘客端轨迹index到站清空 2022-12-05 18:45:19 +08:00
wangmingjun
bd010af76e Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into 'test_robotaxi-d-app-module_2130_221116_2.13.0.1'
[2.13.0] bus乘客端算路bug处理

See merge request zhjt/AndroidApp/MoGoEagleEye!392
2022-12-05 10:18:47 +00:00
wangmingjun
136a014287 [2.13.0] bus乘客端算路bug处理 2022-12-05 18:16:49 +08:00
wangmingjun
84783d64ba Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into 'test_robotaxi-d-app-module_2130_221116_2.13.0.1'
[2.13.0] revert the layout of test

See merge request zhjt/AndroidApp/MoGoEagleEye!389
2022-12-05 09:15:13 +00:00
zhongchao
2784611f37 [2.13.0] revert the layout of test 2022-12-05 17:13:31 +08:00
wangmingjun
6afa31580f Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into 'test_robotaxi-d-app-module_2130_221116_2.13.0.1'
Dev robotaxi d app module 2130 221116 2.13.0

See merge request zhjt/AndroidApp/MoGoEagleEye!386
2022-12-05 08:34:25 +00:00
zhongchao
22ce501516 [2.13.0] fix bug of vip warning of hmi tts 2022-12-05 16:22:54 +08:00
zhongchao
d06d928464 [2.13.0] update aicloud sdk verion of socket update 2022-12-05 16:14:48 +08:00
xuxinchao
0d2e5877a5 [2.13.0]fix消息盒子列表数据重复和排序错乱问题 2022-12-05 15:49:14 +08:00
zhongchao
701136d9e4 [2.13.0]remove unuse 2022-12-05 14:52:30 +08:00
wangmingjun
1634a298a2 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into 'test_robotaxi-d-app-module_2130_221116_2.13.0.1'
Dev robotaxi d app module 2130 221116 2.13.0

See merge request zhjt/AndroidApp/MoGoEagleEye!383
2022-12-05 03:41:12 +00:00
pangfan
b6f884a201 Merge branch 'release_robobus-d-app-module_2120-hotfix_221121_2.12.2.1121150300' into 'master'
Release robobus d app module 2120 hotfix 221121 2.12.2.1121150300

See merge request zhjt/AndroidApp/MoGoEagleEye!382
2022-12-05 03:37:23 +00:00
donghongyu
6450d49bde Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 2022-12-05 11:33:24 +08:00
xuxinchao
a71aaa2a41 Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_2130_221116_2.13.0' into dev_robotaxi-d-app-module_2130_221116_2.13.0 2022-12-05 11:32:42 +08:00
donghongyu
21024bb7b8 [2.13.0]
[Change]
[Catch 地图初始化crash]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-12-05 11:30:14 +08:00
xuxinchao
e4055dbcb9 [2.13.0]fix消息盒子闪退 2022-12-05 11:26:20 +08:00
donghongyu
09bf91e2f2 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 2022-12-05 11:15:07 +08:00
donghongyu
85706ada0c [2.13.0]
[Change]
[修复单屏幕,在第二个屏幕启动act]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-12-05 10:57:17 +08:00
renwj
c57d307f87 [2.13.0]修正leakcanary在monkey测试中出现的崩溃 2022-12-05 10:47:54 +08:00
donghongyu
078cb8a024 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 2022-12-05 10:40:31 +08:00
renwj
03ef756253 [v2.13.0]误合代码恢复 2022-12-05 10:11:29 +08:00
donghongyu
66b52b65bb Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 2022-12-05 09:52:42 +08:00
donghongyu
7fed49aed7 [2.13.0]
[Change]
[修复merge]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-12-05 09:51:03 +08:00
xuxinchao
1e6580c421 [2.13.0]消息盒子 2022-12-05 08:56:58 +08:00
lixiaopeng
8a01b1f71d 2.13.0 fixed conflict 2022-12-04 20:04:07 +08:00
xuxinchao
3fc46fbcfc [2.13.0]消息盒子调整UI 2022-12-03 11:37:40 +08:00
donghongyu
feeecbb564 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display
# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt
2022-12-02 19:53:12 +08:00
zhongchao
095c926fb6 [2.13.0]fix bug of netty status of view and close the spi real time 2022-12-02 19:13:34 +08:00
wangmingjun
ca959ee611 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into 'test_robotaxi-d-app-module_2130_221116_2.13.0.1'
Dev robotaxi d app module 2130 221116 2.13.0

See merge request zhjt/AndroidApp/MoGoEagleEye!379
2022-12-02 10:28:56 +00:00
wangmingjun
58fb2363f5 [2.13.0] taxi司机端 2.12.0空指针处理 2022-12-02 18:26:06 +08:00
chenfufeng
464bfe4f85 [2.13.0][Fix]解决工具弹窗闪的问题 2022-12-02 18:21:35 +08:00
wangmingjun
ba175c7290 [2.13.0] taxi/bus司机端 定位权限,长链接异常,网络异常定时提示 2022-12-02 18:13:36 +08:00
donghongyu
346bbfb0c2 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display
# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
#	foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
2022-12-02 17:35:53 +08:00
wangmingjun
10111ccb13 [2.13.0] bus任务开始前提醒删除逻辑 2022-12-02 16:29:15 +08:00
zhongchao
0476280f63 [2.13.0] remove unuse code 2022-12-02 15:11:16 +08:00
xuxinchao
ac32867b0e [2.13.0]消息盒子乘客端UI调整 2022-12-02 14:21:37 +08:00
xuxinchao
fd0df21b3d [2.13.0]消息盒子调整入口位置 2022-12-02 12:40:35 +08:00
zhongchao
e2c3771448 [2.13.0] startUp add field 2022-12-02 11:44:49 +08:00
zhongchao
60094ced77 add socket status listener and remove unfitable code 2022-12-02 11:03:37 +08:00
lianglihui
75cd5fb61d 2.13.0 apm version update / fix hdmap 采集工具崩溃 2022-12-02 10:38:42 +08:00
lixiaopeng
c3eb8d3676 2.13.0 弱势交通模型删除逻辑 2022-12-02 10:22:48 +08:00
xuxinchao
0620337a21 [2.13.0]消息盒子增加退出登录还原Tab操作记录 2022-12-02 09:56:56 +08:00
donghongyu
c0db312f04 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 2022-12-01 19:09:33 +08:00
wangmingjun
d828124176 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into 'test_robotaxi-d-app-module_2130_221116_2.13.0.1'
Dev robotaxi d app module 2130 221116 2.13.0

See merge request zhjt/AndroidApp/MoGoEagleEye!376
2022-12-01 10:32:17 +00:00
renwj
b02e34ee76 [v2.13.0][状态栏]更改顺序 2022-12-01 18:29:33 +08:00
lixiaopeng
df74947e19 2.13.0 优化obu提示 2022-12-01 18:25:55 +08:00
lixiaopeng
fcbb481e01 2.13.0 obu开关显示区域优化 2022-12-01 18:13:43 +08:00
xuxinchao
07c4d8ce7b [2.13.0]消息盒子 2022-12-01 18:10:50 +08:00
lixiaopeng
9e86296939 2.13.0 联调弱势交通 2022-12-01 17:41:14 +08:00
zhongchao
e646d4367b add config upload server 2022-12-01 17:38:16 +08:00