Commit Graph

1468 Commits

Author SHA1 Message Date
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
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
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
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
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
0375d7a8d8 opt 2020-06-29 15:45:36 +08:00
wangcongtao
31b530eea9 opt 2020-06-29 14:15:02 +08:00
wangcongtao
aa34a56641 rc 2020-06-29 10:20:19 +08:00
wangcongtao
a876fef33c opt 2020-06-29 10:10:33 +08:00
wangcongtao
afd03008cd bugfix: E85XJD-50 2020-06-28 20:11:36 +08:00
tongchenfei
79f47c67a9 删除测试代码 2020-06-24 19:14:52 +08:00
tongchenfei
014af4adb5 dev分支去掉obu的依赖,代码保留,以待后用 2020-06-24 18:57:07 +08:00
tongchenfei
cd27017f6e Merge branch 'dev_obu' into dev
# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
2020-06-24 15:12:34 +08:00
lixiaopeng
308b77ac06 add accon action 2020-06-24 14:28:05 +08:00
tongchenfei
20de31120a Merge remote-tracking branch 'origin/qa' into qa 2020-06-24 14:07:14 +08:00
tongchenfei
d247c99c7f bug fix 点击上报没有语音播报,酷我音乐异常死亡后点击播放没反应 2020-06-24 14:06:58 +08:00
tongchenfei
432f53c151 sdk接入基本完成,待验证 2020-06-24 13:43:08 +08:00
wangcongtao
a2a7c69f46 opt 2020-06-24 13:42:41 +08:00
yangjingjing
babbd47562 obu数据通道基本打通,待实车验证 2020-06-23 23:56:38 +08:00
tongchenfei
0066123855 bug fix 2020-06-23 20:50:23 +08:00
tongchenfei
a96acc698c 1. 接入obu sdk
2. 进行数据转发功能开发
2020-06-23 20:22:05 +08:00
wangcongtao
90b39c717a Merge branch 'dev' into qa 2020-06-23 16:18:56 +08:00
wangcongtao
8536776bf7 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-06-23 16:18:09 +08:00
wangcongtao
d07ea4872a opt 2020-06-23 16:18:00 +08:00
董宏宇
ca367b1d31 Merge remote-tracking branch 'origin/qa' into qa 2020-06-23 15:23:39 +08:00
董宏宇
34b9447a1c 增加了判断MarkerExploreWay是否是同一个对象数据的方法 2020-06-23 15:23:36 +08:00
tongchenfei
ddfd9aba36 Merge branch 'dev' into dev_opt_drawable 2020-06-23 11:07:14 +08:00
tongchenfei
d42815c3a1 Merge branch 'qa' into dev 2020-06-23 10:35:17 +08:00
tongchenfei
b25e0840bb 资源整理 2020-06-23 10:32:06 +08:00
wangcongtao
c7b6e8d1a9 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-06-23 10:20:30 +08:00
wangcongtao
c07802f6a7 opt 2020-06-23 10:20:23 +08:00
wangcongtao
7aac623820 opt app list UI 2020-06-22 17:06:43 +08:00
tongchenfei
49986bfc24 合并完成 2020-06-22 17:04:15 +08:00
tongchenfei
0eee63cb70 优化头像获取时的占位显示 2020-06-22 16:13:03 +08:00
tongchenfei
c8fc9e7734 合并extention和entrance基本完成 2020-06-22 14:57:29 +08:00