Commit Graph

2045 Commits

Author SHA1 Message Date
董宏宇
51608778ab 升级V2X
关闭了演示需求入口
2020-07-06 17:46:01 +08:00
董宏宇
7e28e936df 升级V2X
关闭了演示需求入口
2020-07-06 17:45:44 +08:00
董宏宇
708e67a7f4 升级V2X
关闭了演示需求入口
2020-07-06 17:44:59 +08:00
董宏宇
1c909bd623 Merge remote-tracking branch 'origin/dev' into dev 2020-07-06 17:35:56 +08:00
董宏宇
34299381a9 升级V2X减小了违章信息获取半径 2020-07-06 17:35:53 +08:00
董宏宇
fbd8d558cb 升级V2X减小了违章信息获取半径 2020-07-06 17:35:22 +08:00
tongchenfei
ad11ae5db1 Merge remote-tracking branch 'origin/dev' into dev 2020-07-06 17:34:16 +08:00
tongchenfei
37e45474eb 增加event panel在d82x上的空实现 2020-07-06 17:33:01 +08:00
lixiaopeng
75e321e582 upgrade tanlu version 2020-07-06 11:00:44 +08:00
tongchenfei
7ac56db507 Merge remote-tracking branch 'origin/dev' into dev 2020-07-06 10:14:40 +08:00
tongchenfei
e9597d23a0 将TopViewManager#addView()的默认LayoutParams属性改成了(MATCH_PARENT,WRAP_CONTENT) 2020-07-06 10:14:16 +08:00
wangcongtao
b57dc4bf39 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-07-06 09:57:05 +08:00
wangcongtao
e6b7fdf79d Merge branch 'qa' into dev 2020-07-06 09:56:49 +08:00
wangcongtao
22cadbc1b5 1. bugfix 2020-07-06 09:55:49 +08:00
wangcongtao
ee767b50c6 bugfix 2020-07-03 18:08:55 +08:00
tongchenfei
8b71870bae Merge remote-tracking branch 'origin/dev' into dev 2020-07-03 15:51:49 +08:00
tongchenfei
1e7c0633c3 opt 2020-07-03 15:51:27 +08:00
wangcongtao
816956b2d7 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-07-03 11:29:17 +08:00
wangcongtao
a4d1fe726e opt 2020-07-03 11:29:09 +08:00
tongchenfei
468298bb41 Merge remote-tracking branch 'origin/dev' into dev 2020-07-02 19:24:54 +08:00
tongchenfei
e5a6a8cf8d 简单增加了几个fragment 2020-07-02 19:24:38 +08:00
tongchenfei
b120719327 base 2020-07-02 17:45:49 +08:00
wangcongtao
5a9ea954f3 opt 2020-07-02 15:47:06 +08:00
wangcongtao
11285db4db Merge branch 'qa' into dev 2020-07-02 15:36:29 +08:00
lixiaopeng
ec17dc1ef6 upgrade tanlu version 2020-07-02 14:47:31 +08:00
tongchenfei
1669b8e7fa Merge remote-tracking branch 'origin/qa' into qa 2020-07-02 13:19:09 +08:00
tongchenfei
307e0aed8a add log 2020-07-02 13:18:58 +08:00
lixiaopeng
0d1f5a99c0 opt 2020-07-02 12:44:31 +08:00
tongchenfei
8ff4ab2191 初始化事件面板模块 2020-07-02 12:40:00 +08:00
lixiaopeng
0c9efb1f7c modify tanlu verison 2020-07-02 12:33:20 +08:00
tongchenfei
0957dbae67 初始化事件面板模块 2020-07-02 10:53:03 +08:00
wangcongtao
7c17bb8be4 Merge branch 'qa' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa 2020-07-02 10:51:25 +08:00
wangcongtao
a6e94ae897 opt 2020-07-02 10:51:18 +08:00
tongchenfei
09f64dbab3 Merge remote-tracking branch 'origin/qa' into qa 2020-07-02 10:21:47 +08:00
tongchenfei
34e5632182 处理酷我音乐与蓝牙音乐同时播放时,酷我音乐状态异常导致点击浮窗没反应的问题 2020-07-02 10:21:30 +08:00
wangcongtao
9ded3456ff Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-07-01 17:04:26 +08:00
wangcongtao
283fcb5735 Merge branch 'qa' into dev 2020-07-01 17:04:13 +08:00
wangcongtao
dde7367801 opt 2020-07-01 17:03:51 +08:00
tongchenfei
91c0421e96 Merge remote-tracking branch 'origin/dev' into dev 2020-07-01 16:09:23 +08:00
tongchenfei
e5cdc1d6e6 opt merge 2020-07-01 16:08:34 +08:00
wangcongtao
2e9228ccdf Merge branch 'qa' into dev 2020-07-01 15:15:11 +08:00
wangcongtao
90d5e2c4bb bugfix: E85XJD-65 2020-07-01 15:13:47 +08:00
tongchenfei
32528ff385 Merge branch 'dev_merge_extension_entrance' into dev
合并了右侧顶部的几个view,合并到了EntranceFragment中,ExtensionFragment暂时不使用了

# Conflicts:
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
2020-07-01 15:13:16 +08:00
wangcongtao
aff9c5f576 Merge branch 'qa' into dev 2020-07-01 11:21:07 +08:00
wangcongtao
c3562cb796 opt 2020-07-01 11:20:38 +08:00
wangcongtao
2f08754657 Merge branch 'qa' into dev 2020-06-30 17:41:33 +08:00
wangcongtao
79ef14643f Merge branch 'qa' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa 2020-06-30 17:26:01 +08:00
wangcongtao
47cb98e26d opt 2020-06-30 17:25:56 +08:00
lixiaopeng
2fe7ab32a4 opt 2020-06-30 17:17:59 +08:00
wangcongtao
45feba7261 Merge branch 'qa' into dev 2020-06-30 16:28:09 +08:00