Commit Graph

16867 Commits

Author SHA1 Message Date
unknown
cd5aa2e2e9 Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-09-10 17:51:30 +08:00
unknown
2ebc574309 changed the mark point name 2020-09-10 17:51:16 +08:00
tongchenfei
024c387545 Merge remote-tracking branch 'origin/dev' into dev 2020-09-10 17:41:57 +08:00
tongchenfei
9c7a5db517 去掉道路事件上报时的poiType判断 2020-09-10 17:41:39 +08:00
lixiaopeng
766e84b66f opt ui 2020-09-10 17:05:51 +08:00
lixiaopeng
aaac882bf5 opt ui 2020-09-10 17:05:51 +08:00
unknown
b7dd49e7b3 fix bug and replace the png 2020-09-10 17:05:51 +08:00
tongchenfei
5b1af43808 opt 2020-09-10 17:05:51 +08:00
lixiaopeng
7496ce8abd opt ui 2020-09-10 17:03:57 +08:00
unknown
9e7259eb6b Merge branch 'dev' into demo/shunyi_v2v_merge 2020-09-10 16:56:29 +08:00
lixiaopeng
dbc9b9212d opt ui 2020-09-10 16:39:08 +08:00
wangcongtao
0a41173d07 Merge remote-tracking branch 'origin/demo/shunyi_v2v_merge' into demo/shunyi_v2v_merge
# Conflicts:
#	modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
2020-09-10 16:32:43 +08:00
wangcongtao
e91aa136c4 合并黑夜白天模式等需求 2020-09-10 16:27:01 +08:00
unknown
d99c4f08e3 Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-09-10 16:12:58 +08:00
unknown
7b50663eb7 fix bug and replace the png 2020-09-10 16:11:57 +08:00
tongchenfei
79cee5abb5 Merge remote-tracking branch 'origin/dev' into dev 2020-09-10 14:57:22 +08:00
tongchenfei
c3028e12dd opt 2020-09-10 14:57:12 +08:00
liujing
be3a0a0675 [add] M4 关闭按钮+圆角统一 2020-09-10 14:53:56 +08:00
liujing
d616cc276c Merge branch 'ui' into dev 2020-09-10 14:53:35 +08:00
liujing
7a039fd75c [add] M4 关闭按钮+圆角统一 2020-09-10 14:53:19 +08:00
wangcongtao
6d7c9e0bc7 Merge branch 'dev' into qa_light 2020-09-10 14:41:23 +08:00
tongchenfei
8a42fa2650 Merge remote-tracking branch 'origin/dev' into dev 2020-09-10 14:32:26 +08:00
tongchenfei
7b87705db8 opt 2020-09-10 14:32:12 +08:00
wangcongtao
873c469726 Merge remote-tracking branch 'origin/dev' into dev 2020-09-10 14:23:52 +08:00
wangcongtao
e66bbf304a 优化mapview初始化 2020-09-10 14:23:25 +08:00
tongchenfei
2492a22c55 Merge remote-tracking branch 'origin/dev' into dev 2020-09-10 14:12:43 +08:00
tongchenfei
fb4f9548cd opt:分享框动态配置 2020-09-10 14:12:01 +08:00
liujing
483757e7de 圆角不一致修改 2020-09-10 13:30:53 +08:00
liujing
1187107458 Merge branch 'u' into dev 2020-09-10 13:30:32 +08:00
liujing
539c1d302b 圆角不一致修改 2020-09-10 13:30:21 +08:00
liujing
86af597b9e 弹框圆角处有黑色背景修改 2020-09-10 13:02:23 +08:00
liujing
cfc9ed61a2 Merge branch 'yu' into dev 2020-09-10 13:02:05 +08:00
liujing
a3ec543a3b 弹框圆角处有黑色背景修改 2020-09-10 13:01:37 +08:00
liujing
82e975d35a 分享列表item 2020-09-10 12:52:44 +08:00
liujing
327c264e85 Merge branch 'si' into qa_light 2020-09-10 12:52:15 +08:00
liujing
e145ad9bb2 分享列表item 2020-09-10 12:51:28 +08:00
unknown
98bee0e82c Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-09-10 12:11:05 +08:00
unknown
90949b1cea fix bug of voice callBack 2020-09-10 12:10:36 +08:00
liujing
c77b2b5e10 事件面板-大小 2020-09-10 11:58:24 +08:00
liujing
b41d170665 Merge branch 'ui' into dev 2020-09-10 11:57:53 +08:00
liujing
8500490edb 事件面板-大小 2020-09-10 11:57:33 +08:00
unknown
df9c21cc1d Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-09-10 11:43:22 +08:00
unknown
5e06f3f184 fix bug 2020-09-10 11:43:11 +08:00
wangcongtao
f6ce6e4048 Merge remote-tracking branch 'origin/dev' into dev 2020-09-10 11:31:24 +08:00
wangcongtao
4335e68acc 1. 解决高德地图导航实例无法inflate的问题
2. 在主页中加载换肤模块
2020-09-10 11:31:17 +08:00
liujing
e1826206fe no message 2020-09-10 10:44:27 +08:00
liujing
685db9abf2 no message 2020-09-10 10:41:55 +08:00
wangcongtao
5e4551404c Merge remote-tracking branch 'origin/dev' into dev 2020-09-10 10:17:26 +08:00
wangcongtao
a4cd94d06b opt 2020-09-10 10:17:19 +08:00
tongchenfei
69c9f83a1c 修改皮肤库noop实现问题 2020-09-09 20:15:02 +08:00