Commit Graph

3857 Commits

Author SHA1 Message Date
董宏宇
c597a28bf4 Merge branch 'qa_1.1.7_fix' into dev
# Conflicts:
#	modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
#	modules/mogo-module-extensions/src/main/res/values/dimens.xml
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
2020-11-13 18:25:30 +08:00
liujing
e406773162 删除无用资源 2020-11-13 18:17:42 +08:00
董宏宇
5238a03b43 删除了关闭对话框主动调用的逻辑 2020-11-13 18:15:36 +08:00
liujing
b55a3f8cec Merge branch 'de' into dev 2020-11-13 18:13:20 +08:00
liujing
6f3b4e6df3 [rm] 删除无用文件 2020-11-13 18:13:04 +08:00
unknown
d9492f221b .. 2020-11-13 17:43:58 +08:00
unknown
b0b72d5823 merge 2020-11-13 17:36:37 +08:00
unknown
cc6f07544a remix the log monitor 2020-11-13 17:31:16 +08:00
tongchenfei
0402012140 Merge remote-tracking branch 'origin/dev' into dev 2020-11-13 16:07:40 +08:00
tongchenfei
d606256e31 1. m1增加topView蒙层
2. 1.1.8 优化目的地车友位置
2020-11-13 16:05:37 +08:00
lixiaopeng
7667cb0a48 opt 2020-11-13 12:31:57 +08:00
董宏宇
ffcb1c9296 增加了数据统计
http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=42321443
2020-11-13 12:07:34 +08:00
liujing
65d0041066 Merge branch 'he' into dev 2020-11-13 11:56:42 +08:00
liujing
b9415a6b06 取消求助按钮换.9图,文字不显示修复 2020-11-13 11:56:04 +08:00
tongchenfei
9057e0cdb7 优化目的地车友位置 2020-11-13 11:34:35 +08:00
liujing
5721256e8a [add] 取消求助黑白模式.9图 2020-11-13 10:56:53 +08:00
董宏宇
468d8b7000 修复了因为用户没有点击操作导致ugc数据过多的问题 2020-11-13 10:51:30 +08:00
wangcongtao
f719b508e3 1. 修改项目对CarSeries类的依赖 2020-11-13 10:15:17 +08:00
tongchenfei
1778f80443 调整m1布局结构 2020-11-12 20:28:38 +08:00
wangcongtao
d6e8e13338 1. 去掉部分日志
2. 添加m2不依赖地图的逻辑
2020-11-12 15:22:27 +08:00
wangcongtao
8a3048741d Merge remote-tracking branch 'origin/dev' into dev 2020-11-11 16:57:28 +08:00
wangcongtao
307858f9aa 1. 解决部分模块耦合问题
2. 重新规划模块依赖关系
3. 解决主页左侧遮罩颜色问题
2020-11-11 16:57:20 +08:00
董宏宇
49914c2fc3 Merge remote-tracking branch 'origin/dev' into dev 2020-11-11 11:25:19 +08:00
董宏宇
a6cd11b067 关闭了巡航语音播报 2020-11-11 11:25:14 +08:00
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
liujing
d553cb31b3 Merge branch 'lll' into qa_1.1.7 2020-11-10 19:23:24 +08:00
liujing
8752c301ec 取消求助UI 2020-11-10 19:22:52 +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