Commit Graph

12455 Commits

Author SHA1 Message Date
wangcongtao
70db00b5b5 Merge branch 'qa' into feature/qa_f 2020-07-30 16:07:16 +08:00
wangcongtao
fc9b41b1f3 bugfix 2020-07-30 16:05:40 +08:00
unknown
8c24c0003e Merge branch 'qa_byd' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_byd 2020-07-30 16:03:28 +08:00
unknown
49fb4ce107 .. 2020-07-30 16:03:13 +08:00
jiaguofeng
c849a87324 修改缩放问题 2020-07-30 15:51:15 +08:00
lixiaopeng
6fd41b9958 opt 2020-07-30 15:50:55 +08:00
tongchenfei
15147461a8 Merge remote-tracking branch 'origin/qa_byd' into qa_byd 2020-07-30 15:49:32 +08:00
tongchenfei
68443c043f bug fix 2020-07-30 15:48:58 +08:00
lixiaopeng
aef7a4aa82 opt 2020-07-30 15:35:44 +08:00
董宏宇
1f740d264b 修改测试数据sn 2020-07-30 15:32:08 +08:00
tongchenfei
3ed51c3947 bug fix 2020-07-30 15:26:46 +08:00
董宏宇
83971d24a2 关闭了事件面板的展示 2020-07-30 15:21:00 +08:00
董宏宇
dce0487f35 Merge branch 'qa_1.1' into dev_1.1.2 2020-07-30 15:08:15 +08:00
董宏宇
fd9e96e510 增加了疲劳驾驶和道路求助的布局优化 2020-07-30 15:07:29 +08:00
董宏宇
2d731b6a99 Merge branch 'dev' into dev_1.1.2 2020-07-30 14:31:49 +08:00
董宏宇
08ca140c6f 完成了他人故障求助的展示逻辑统一 2020-07-30 14:31:12 +08:00
unknown
fc28c7bd93 Merge branch 'qa_byd' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_byd 2020-07-30 12:02:39 +08:00
unknown
11c0980d35 close the proguard for now ,because can't find netty log4j proguard class 2020-07-30 12:02:20 +08:00
wangcongtao
7355f492bf Merge branch 'dev' into dev_custom_map 2020-07-30 11:05:29 +08:00
wangcongtao
b437e2d1fd Merge branch 'qa_byd' into dev 2020-07-30 11:05:04 +08:00
wangcongtao
895ee4c1f2 Merge remote-tracking branch 'origin/qa_byd' into qa_byd 2020-07-30 10:47:51 +08:00
unknown
1b2d06e3f1 add netty proguard 2020-07-30 10:47:34 +08:00
wangcongtao
ff1b3997bc Merge remote-tracking branch 'origin/qa_byd' into qa_byd 2020-07-30 10:40:19 +08:00
wangcongtao
fc60688215 替换自车图标 2020-07-30 10:40:11 +08:00
unknown
e2ecaf0168 add proguard rules 2020-07-30 10:38:50 +08:00
wangcongtao
0bfa7ea746 Merge branch 'qa_byd' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_byd 2020-07-30 10:08:34 +08:00
董宏宇
35bcb452d9 先关闭了数据库存储 2020-07-29 20:37:53 +08:00
董宏宇
16d1e5140a Merge branch 'dev' into dev_1.1.2 2020-07-29 20:34:50 +08:00
董宏宇
e7e5c8925d 重命名视图名称 2020-07-29 20:34:22 +08:00
wangcongtao
c6c5fd544a Merge branch 'feature/qa_f' into dev 2020-07-29 20:15:40 +08:00
wangcongtao
34ffa40926 Merge branch 'qa' into feature/qa_f 2020-07-29 20:09:56 +08:00
wangcongtao
68958fc6dd 1. 解决放大、缩小地图的问题。 2020-07-29 20:09:50 +08:00
董宏宇
d3418e8681 增加了测试数据 2020-07-29 19:53:32 +08:00
董宏宇
c8ff5e7d3e 完成了疲劳驾驶的展示移植 2020-07-29 19:49:26 +08:00
wangcongtao
1fc8dd5950 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-07-29 19:21:25 +08:00
wangcongtao
df79ebc33f 解决高德地图因为10021广播关闭程序,导致桌面导航信息栏无法消失的问题。 2020-07-29 19:21:05 +08:00
wangcongtao
66c98a3094 bugfix: E85XJD-107 2020-07-29 19:09:12 +08:00
tongchenfei
0c81844df4 Merge remote-tracking branch 'origin/qa_byd' into qa_byd 2020-07-29 17:22:05 +08:00
tongchenfei
a2510d193e 修改速度阈值,从40改为90 2020-07-29 17:21:45 +08:00
董宏宇
7e2a5d73d8 Merge branch 'dev' into dev_1.1.2 2020-07-29 17:19:12 +08:00
董宏宇
28ca04dcc6 Merge branch 'qa_byd' into dev 2020-07-29 17:18:36 +08:00
董宏宇
fd189e3373 关闭了V2X测试面板 2020-07-29 17:18:04 +08:00
wangcongtao
462b17c12b bugfix: UI-884 2020-07-29 16:41:10 +08:00
liujing
f55cbcbbe9 Merge branch 'dev_1.1.2_lj' into dev_1.1.2 2020-07-29 16:26:46 +08:00
liujing
06f864e71c 空白页-去分享-分享弹框 2020-07-29 16:26:42 +08:00
tongchenfei
92720706af Merge branch 'qa_d82x' into dev
# Conflicts:
#	gradle.properties
2020-07-29 15:50:46 +08:00
tongchenfei
753381d2b4 Merge branch 'qa_d82x'
1+16已封版发布

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	gradle.properties
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
#	modules/mogo-module-search/src/main/res/values/dimens.xml
2020-07-29 14:42:13 +08:00
wangcongtao
79b962dff9 merge 2020-07-29 14:26:50 +08:00
liujing
0704e51740 Merge branch 'dev_1.1.2_lj' into dev_1.1.2 2020-07-29 12:24:01 +08:00
liujing
035f3426e1 闪出去测试数据,添加空白item 2020-07-29 12:23:55 +08:00