wangcongtao
|
cc7106ce3e
|
Merge branch 'qa' into dev_custom_map
|
2020-07-06 09:57:40 +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 |
|
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
|
e3e0ffcfc2
|
Merge branch 'qa' into dev_custom_map
|
2020-07-02 15:47:53 +08:00 |
|
wangcongtao
|
5a9ea954f3
|
opt
|
2020-07-02 15:47:06 +08:00 |
|
wangcongtao
|
2af0b64858
|
rcc
|
2020-07-02 15:41:11 +08:00 |
|
wangcongtao
|
11285db4db
|
Merge branch 'qa' into dev
|
2020-07-02 15:36:29 +08:00 |
|
tongchenfei
|
307e0aed8a
|
add log
|
2020-07-02 13:18:58 +08:00 |
|
tongchenfei
|
8ff4ab2191
|
初始化事件面板模块
|
2020-07-02 12:40:00 +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 |
|
tongchenfei
|
e5cdc1d6e6
|
opt merge
|
2020-07-01 16:08:34 +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
|
30620a74c7
|
Merge branch 'qa' into dev_custom_map
|
2020-07-01 11:34:02 +08:00 |
|
wangcongtao
|
3e19cab507
|
Merge branch 'demo/shunyi_v2v' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into demo/shunyi_v2v
|
2020-07-01 11:32:58 +08:00 |
|
wangcongtao
|
739a700303
|
opt
|
2020-07-01 11:32:52 +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 |
|
tongchenfei
|
ae7f61d310
|
1. 提升v2x版本，缩短vip变灯提示距离为100米
2. 增加obu重连机制
|
2020-06-30 22:38:33 +08:00 |
|
wangcongtao
|
c0c3a90a7d
|
Merge branch 'qa' into dev_custom_map
|
2020-06-30 17:43:45 +08:00 |
|
wangcongtao
|
79c51474a2
|
rc
|
2020-06-30 17:23:38 +08:00 |
|
wangcongtao
|
45feba7261
|
Merge branch 'qa' into dev
|
2020-06-30 16:28:09 +08:00 |
|
wangcongtao
|
b6ad2d3add
|
launch adas when acc on
|
2020-06-30 15:32:21 +08:00 |
|
wangcongtao
|
82e0970319
|
bugfix
|
2020-06-30 15:11:11 +08:00 |
|
wangcongtao
|
a14119e3d2
|
Merge branch 'qa' into demo/shunyi_v2v
|
2020-06-30 12:01:19 +08:00 |
|
wangcongtao
|
a9d1cde749
|
opt
|
2020-06-30 12:01:03 +08:00 |
|
wangcongtao
|
6d5ae4c382
|
opt
|
2020-06-30 12:00:18 +08:00 |
|
wangcongtao
|
6a23dca5d1
|
opt
|
2020-06-30 11:59:29 +08:00 |
|
wangcongtao
|
46ccbe50ea
|
rc
|
2020-06-30 10:58:23 +08:00 |
|
wangcongtao
|
0303892da6
|
rc
|
2020-06-30 10:41:53 +08:00 |
|
wangcongtao
|
2d4f1f2c2f
|
Merge branch 'qa' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa
|
2020-06-30 10:37:51 +08:00 |
|
wangcongtao
|
ac439dbb99
|
opt
|
2020-06-30 10:37:43 +08:00 |
|
lixiaopeng
|
940b60fda7
|
fixed bug
|
2020-06-29 20:00:34 +08:00 |
|
wangcongtao
|
989066952c
|
opt
|
2020-06-29 15:58:15 +08:00 |
|
wangcongtao
|
0375d7a8d8
|
opt
|
2020-06-29 15:45:36 +08:00 |
|
wangcongtao
|
63465fa6ce
|
Merge branch 'demo/shunyi_v2v' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into demo/shunyi_v2v
|
2020-06-29 14:17:42 +08:00 |
|
wangcongtao
|
ca9e207e1a
|
opt
|
2020-06-29 14:17:33 +08:00 |
|
tongchenfei
|
477ea20b74
|
Merge remote-tracking branch 'origin/demo/shunyi_v2v' into demo/shunyi_v2v
# Conflicts:
# gradle.properties
|
2020-06-29 14:15:09 +08:00 |
|
wangcongtao
|
31b530eea9
|
opt
|
2020-06-29 14:15:02 +08:00 |
|
tongchenfei
|
e54bf2c005
|
升级v2x版本
|
2020-06-29 14:13:20 +08:00 |
|
wangcongtao
|
9f8e9c0de2
|
opt
|
2020-06-29 11:11:16 +08:00 |
|