Commit Graph

12455 Commits

Author SHA1 Message Date
董宏宇
773e3c3bfe 调整顺序 2020-07-27 10:34:50 +08:00
wangcongtao
b1bbdb2cab Merge branch 'dev' into dev_custom_map
# Conflicts:
#	gradle.properties
2020-07-27 10:19:13 +08:00
unknown
390698af84 Merge branch 'qa_byd' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_byd 2020-07-24 18:43:42 +08:00
unknown
bd2d25d105 Merge branch 'qa_byd_res' into qa_byd 2020-07-24 18:43:24 +08:00
unknown
ffe41f8bc4 replace res 2020-07-24 18:43:12 +08:00
lixiaopeng
95b111acf2 upgrade tanlu version 2020-07-24 17:06:56 +08:00
lixiaopeng
6ae39ac0ed opt 2020-07-24 16:54:38 +08:00
wangcongtao
87b3a73f71 Merge branch 'qa_byd' into dev 2020-07-24 16:49:46 +08:00
wangcongtao
84be8d1edd Merge branch 'qa_byd' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_byd 2020-07-24 16:49:11 +08:00
wangcongtao
3aeb4a6d92 bugfix: UI-867 2020-07-24 16:45:08 +08:00
董宏宇
ca7828a5d8 升级v2x版本 2020-07-24 16:23:16 +08:00
wangcongtao
18bbd1debf "新增接口" 2020-07-24 15:05:24 +08:00
unknown
52a08c99d7 Merge branch 'qa_byd_res' into qa_byd 2020-07-24 15:01:14 +08:00
unknown
94b4730666 res grand 2020-07-24 14:59:57 +08:00
董宏宇
a6dfa46710 Merge branch 'dev_1.1' into dev_1.1.2
# Conflicts:
#	gradle.properties
2020-07-24 14:55:19 +08:00
董宏宇
9355bb1989 Merge branch 'dev' into dev_1.1
# Conflicts:
#	gradle.properties
2020-07-24 14:54:38 +08:00
wangcongtao
04dae4fad7 Merge remote-tracking branch 'origin/dev_custom_map' into dev_custom_map 2020-07-24 14:38:32 +08:00
董宏宇
a28cab1e68 Merge branch 'qa_byd' into dev 2020-07-24 14:31:50 +08:00
董宏宇
3117b023ea 升级直播sdk版本 2020-07-24 14:24:05 +08:00
unknown
6c38eb8372 Merge branch 'qa_byd' into qa_byd_res 2020-07-24 14:17:36 +08:00
unknown
e2f4896c2f note the guide provider 2020-07-24 14:17:17 +08:00
wangcongtao
2b970f28be opt 2020-07-24 13:08:20 +08:00
wangcongtao
d0a539cdf7 opt 2020-07-24 12:27:30 +08:00
wangcongtao
a14681509c Merge branch 'dev' into dev_custom_map 2020-07-24 11:46:01 +08:00
wangcongtao
ee2c3b92fc Merge branch 'qa_byd' into dev 2020-07-24 11:43:42 +08:00
wangcongtao
25f8b86bc0 Merge branch 'qa_byd' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_byd 2020-07-24 11:40:03 +08:00
wangcongtao
70074c5f87 更新passport版本,分发onMapLoaded事件 2020-07-24 11:39:44 +08:00
董宏宇
5ede6e4266 Merge remote-tracking branch 'origin/qa_byd' into qa_byd 2020-07-24 11:39:02 +08:00
董宏宇
99104d4866 修复了初始化自车求助状态异常问题 2020-07-24 11:38:52 +08:00
unknown
c0784cd2a2 replace png 2020-07-24 11:17:36 +08:00
wangcongtao
310e8c2527 opt 2020-07-24 10:59:23 +08:00
lixiaopeng
125fd65ece oot 2020-07-24 10:16:36 +08:00
董宏宇
63022a3ee3 修复Dialog关闭没有移除View的bug 2020-07-23 19:52:15 +08:00
unknown
c4e993f2a6 .. 2020-07-23 19:51:02 +08:00
tongchenfei
6e1fc460b6 优化acc off后音乐浮窗显示的问题 2020-07-23 19:42:27 +08:00
unknown
d7a900c735 fix bug 2020-07-23 19:32:56 +08:00
unknown
09c3ba136f fix bug 2020-07-23 19:32:30 +08:00
unknown
f4e285323a Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-07-23 19:29:53 +08:00
unknown
5f2c45b69b merge 2020-07-23 19:29:41 +08:00
unknown
d05bc04f3e add view adjust code 2020-07-23 19:28:30 +08:00
董宏宇
3e49508330 Merge remote-tracking branch 'origin/qa_byd' into qa_byd 2020-07-23 19:14:34 +08:00
董宏宇
845e250bc7 修改取消求助的弹窗bug 2020-07-23 19:14:28 +08:00
wangcongtao
da051087a7 Merge branch 'qa_byd' into dev 2020-07-23 17:53:41 +08:00
wangcongtao
76bfac2b84 opt 2020-07-23 17:53:20 +08:00
wangcongtao
ed935d8d93 Merge branch 'qa_byd' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_byd 2020-07-23 17:52:40 +08:00
wangcongtao
e8a90a8273 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-07-23 17:29:28 +08:00
wangcongtao
31d184e613 opt 2020-07-23 17:29:09 +08:00
董宏宇
dcc4191f12 修改取消求助的弹窗 2020-07-23 17:18:47 +08:00
wangcongtao
387879e704 Merge branch 'qa_byd' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_byd 2020-07-23 17:17:46 +08:00
wangcongtao
5f2df28a46 opt 2020-07-23 17:17:31 +08:00