Commit Graph

3831 Commits

Author SHA1 Message Date
wangcongtao
980d8a408d Merge branch 'qa_1.1.7' into dev 2020-11-10 20:35:25 +08:00
wangcongtao
7137b4e365 Merge remote-tracking branch 'origin/dev' into dev 2020-11-10 20:34:47 +08:00
unknown
4bd9eb24d2 Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-11-10 19:52:31 +08:00
unknown
c9a0e0efb5 remove ndk filter in v2x module 2020-11-10 19:52:15 +08:00
liujing
f751e1a308 取消求助UI 2020-11-10 19:23:56 +08:00
unknown
c3b77087bf Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-11-10 18:10:48 +08:00
wangcongtao
1f766eb906 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	gradle.properties
#	libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
#	modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
2020-11-10 17:48:45 +08:00
unknown
a58aa2caaf add kotlin parallel and incremental,plus gradle cache 2020-11-10 17:40:24 +08:00
liujing
aca75acee7 图片拉伸问题修改 2020-11-10 17:30:29 +08:00
liujing
f19b12f06d Merge branch 'kk' into dev 2020-11-10 17:30:14 +08:00
liujing
dcb7770b7c 图片拉伸问题修改 2020-11-10 17:29:56 +08:00
liujing
7f5c114012 UI 出现动态 2020-11-10 17:21:15 +08:00
liujing
9647bc32b9 Merge branch 'ui' into qa_1.1.7 2020-11-10 17:20:55 +08:00
liujing
4748956c8f UI 出现动态 2020-11-10 17:20:46 +08:00
unknown
b85738b920 code style : reduce build compile time about 5s 2020-11-10 17:07:27 +08:00
liujing
f995c71aa5 我的分析图片资源替换 2020-11-10 16:28:12 +08:00
liujing
204ac49977 Merge branch 'ui' into qa_1.1.7 2020-11-10 16:27:45 +08:00
liujing
5170fc3712 我的分析图片资源替换 2020-11-10 16:27:24 +08:00
unknown
709bc51b54 merge conflict 2020-11-10 16:25:29 +08:00
unknown
bd285b4d23 add Matrix 2020-11-10 16:24:43 +08:00
unknown
80b66fe5f1 remove unless 2020-11-10 16:20:55 +08:00
unknown
709a25c83c remove test gradle project : Matrix 2020-11-10 16:19:42 +08:00
unknown
b2af80dce8 code style opt, reduce build time : 1m30s 2020-11-10 16:18:36 +08:00
wangcongtao
0d97ce0ad7 UI OPT: 优化目的地车友面板文字间距 2020-11-10 15:50:53 +08:00
wangcongtao
b3212b011a 修改停车车头朝向问题 2020-11-10 14:53:04 +08:00
tongchenfei
4fcf7383a3 增加疑似拥堵上报埋点 2020-11-09 23:10:35 +08:00
wangcongtao
e3aa0709e6 Merge remote-tracking branch 'origin/qa_1.1.7' into qa_1.1.7 2020-11-09 21:01:06 +08:00
wangcongtao
2509182c27 恢复刷新时间 2020-11-09 20:59:34 +08:00
unknown
8b59221f71 fix bug of invoke trafficUpload 2020-11-09 20:48:48 +08:00
lixiaopeng
1f06fafef0 opt upload strategy 2020-11-09 20:04:44 +08:00
unknown
7c9317bad4 add v2x invoke 2020-11-09 18:52:09 +08:00
unknown
029e52c167 upload traffic info 2020-11-09 18:09:54 +08:00
zhuangyan
85929afd49 Merge remote-tracking branch 'origin/dev' into dev 2020-11-09 17:44:12 +08:00
zhuangyan
b49a54003a 新增道路拥堵上报功能 2020-11-09 17:43:53 +08:00
liujing
6177bdf183 取消视频边缓存边播放 2020-11-09 15:15:38 +08:00
liujing
c5e3191b83 Merge branch 'hc' into dev 2020-11-09 15:15:14 +08:00
liujing
daad1aeb98 取消视频边缓存边播放 2020-11-09 15:14:43 +08:00
unknown
28d480d72e add TrafficModel 2020-11-09 14:54:48 +08:00
wangcongtao
8d8a1e134e Merge remote-tracking branch 'origin/qa_1.1.7' into qa_1.1.7 2020-11-09 14:44:00 +08:00
wangcongtao
fbcd51a38b 黑夜白天模式:adas、语音、桌面、高德地图同步 2020-11-09 14:43:33 +08:00
tongchenfei
5e976a2093 Merge remote-tracking branch 'origin/qa_1.1.7' into qa_1.1.7 2020-11-09 14:12:47 +08:00
tongchenfei
d783b303e2 opt query share config 2020-11-09 14:12:31 +08:00
董宏宇
17f9f82217 Merge remote-tracking branch 'origin/qa_1.1.7' into qa_1.1.7 2020-11-09 12:46:08 +08:00
董宏宇
d2856c7c48 解决
【蘑菇出行1.1.7】路况仍可以被重复点赞,且点赞语音播报不正确
http://jira.zhidaohulian.com/browse/FX-528
v2x事件弹窗点赞,点击第二次同样提示”以点赞“
http://jira.zhidaohulian.com/browse/D80XCD-1587
2020-11-09 12:46:04 +08:00
unknown
0c6d1524dc Merge branch 'qa_1.1.7' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.7 2020-11-09 12:45:11 +08:00
unknown
6c4f740502 fix bug 2020-11-09 12:44:58 +08:00
unknown
bad16a2b20 changed the wrong note 2020-11-09 11:50:51 +08:00
unknown
690fd1728c Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev 2020-11-09 11:45:27 +08:00
unknown
9d09cdb85f upload traffic road status 2020-11-09 11:45:18 +08:00
liujing
47a9f4bbd6 sn判断,说自己隐藏拨打电话按钮 2020-11-09 11:28:52 +08:00