Commit Graph

3075 Commits

Author SHA1 Message Date
tongchenfei
f1276dacd3 删除/build文件 2020-09-11 11:40:20 +08:00
tongchenfei
b199b39752 Merge branch 'qa_1.1.5_1' into qa_1.1.5_2
# Conflicts:
#	libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
#	libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt
#	libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
2020-09-11 11:37:57 +08:00
lixiaopeng
29b9a10f32 opt 2020-09-11 11:07:43 +08:00
tongchenfei
e97369a692 opt 2020-09-11 10:02:46 +08:00
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
7496ce8abd opt ui 2020-09-10 17:03:57 +08:00
lixiaopeng
dbc9b9212d opt ui 2020-09-10 16:39:08 +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
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
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
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
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
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
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
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
liujing
0eb83394f3 事件面板 2020-09-09 19:11:09 +08:00
tongchenfei
5cfddd73e8 Merge remote-tracking branch 'origin/dev' into dev 2020-09-09 18:51:51 +08:00
tongchenfei
d51940152c 区分拥堵策略上报需求范围,launcher不加此需求,独立app加此需求 2020-09-09 18:51:38 +08:00
lixiaopeng
2b60f7ea3b restore code 2020-09-09 17:35:27 +08:00
tongchenfei
8600e2c3ac 区分分享优化需求范围,launcher不加此需求,独立app加此需求 2020-09-09 17:30:04 +08:00
tongchenfei
77b37219e0 Merge remote-tracking branch 'origin/dev' into dev 2020-09-09 17:11:41 +08:00
unknown
08c8e3711e add global guide sp configure 2020-09-09 16:59:27 +08:00
unknown
f548b90d58 Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-09-09 16:26:04 +08:00
tongchenfei
d6f41dc2f4 区分分享框加载时机 2020-09-09 15:48:32 +08:00
tongchenfei
680157a341 Merge remote-tracking branch 'origin/dev' into dev 2020-09-09 15:42:44 +08:00
tongchenfei
7d2b01baa0 opt: 临时注释掉获取远端分享框配置的逻辑 2020-09-09 15:42:31 +08:00