Commit Graph

12455 Commits

Author SHA1 Message Date
unknown
e8e1042a05 Merge branch 'demo/shunyi_v2v_merge' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into demo/shunyi_v2v_merge 2020-08-25 17:28:06 +08:00
unknown
24988cce45 merge shunyi func 2020-08-25 17:27:56 +08:00
wangcongtao
af9b07da57 Merge branch 'qa_1.1.2' into dev 2020-08-25 17:02:41 +08:00
wangcongtao
29f0552d8e 1. 补充编译flavor类型 2020-08-25 16:56:33 +08:00
wangcongtao
b347e7090e theme mode 2020-08-25 16:43:41 +08:00
wangcongtao
16f0c8180b 1. 修改导航组件功能:实现按需加载
2. 1.1.3 需求研发:导航悬浮按钮、桌面卡片播报策略。
2020-08-25 14:30:56 +08:00
董宏宇
609aede0c6 合并了之前顺义新增需求 2020-08-25 11:49:36 +08:00
wangcongtao
5f08cbda9a Merge remote-tracking branch 'origin/dev' into dev 2020-08-25 10:25:57 +08:00
wangcongtao
8c7508e385 1.1.3 广告需求 2020-08-25 10:25:47 +08:00
jiaguofeng
5b75a08c44 fix log 2020-08-24 18:07:50 +08:00
jiaguofeng
61be33fcad fix scale bug 2020-08-24 17:07:32 +08:00
tongchenfei
a39599c028 去掉所有免唤醒词,只保留“上报路况”,且是在显示界面的时候生效 2020-08-24 16:48:58 +08:00
jiaguofeng
715cf5d497 fix 定位回收bug 2020-08-24 16:20:27 +08:00
jiaguofeng
64322c3b4a fix 内存性能 2020-08-24 16:06:06 +08:00
wangcongtao
46b897854f Merge branch 'dev' into dev_custom_map 2020-08-24 14:09:20 +08:00
wangcongtao
51ead6cebf Merge branch 'dev' into demo/shunyi_v2v_merge 2020-08-24 14:07:37 +08:00
liujing
b19d4e21e4 msg 2020-08-24 11:31:53 +08:00
liujing
af8b338b64 Merge branch 'ui' into qa_1.1.2 2020-08-24 11:31:17 +08:00
liujing
ae997d944b msg 2020-08-24 11:31:00 +08:00
wangcongtao
92ec5a0bfc 修改 d8xx->d80x, f8xx->f80x 2020-08-24 10:57:04 +08:00
wangcongtao
998eab6d8b 1. merge
2. bugfix
2020-08-21 21:23:51 +08:00
wangcongtao
95d282b377 1. 修改时间策略 2020-08-21 20:20:20 +08:00
wangcongtao
98445dec50 1. 整理依赖
2. 新增launcher1.0卡片刷新参数
2020-08-21 19:29:12 +08:00
wangcongtao
820e323a2e 1. 禁止分屏 2020-08-21 15:40:38 +08:00
wangcongtao
ceafa8ec70 Merge branch 'qa_1.1.2' into dev
# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
2020-08-21 15:40:35 +08:00
wangcongtao
7a4cbbf9a0 合并1.1.2需求 2020-08-21 11:00:55 +08:00
tongchenfei
19a9e52612 crash fix 2020-08-20 16:58:55 +08:00
tongchenfei
b17392ce81 Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2 2020-08-20 15:31:09 +08:00
tongchenfei
c73541dd10 添加Monitor为BaseModule 2020-08-20 15:30:50 +08:00
lixiaopeng
e6bc4a026f Merge branch 'qa_1.1.2' into dev 2020-08-20 10:24:01 +08:00
tongchenfei
545bf47fd0 opt 2020-08-20 09:57:04 +08:00
lixiaopeng
7b3c69cb1a opt 2020-08-20 09:51:29 +08:00
tongchenfei
ac72a04995 合并obu部分代码 2020-08-19 20:42:17 +08:00
董宏宇
e1bab17d19 Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2 2020-08-19 19:29:09 +08:00
董宏宇
b56a5d71e9 剧中头像 2020-08-19 19:29:00 +08:00
liujing
2b943a5ae1 Merge branch 'uii' into qa_1.1.2 2020-08-19 17:14:44 +08:00
liujing
7ef2d72f16 ui 2020-08-19 17:14:28 +08:00
lixiaopeng
58e5bb6b0d opt ui 2020-08-19 17:08:09 +08:00
tongchenfei
5af67fecf4 Merge branch 'dev' into demo/shunyi_v2v_merge 2020-08-19 16:12:59 +08:00
tongchenfei
25a982337c Merge branch 'qa_1.1.2' into dev 2020-08-19 15:47:55 +08:00
tongchenfei
c5a19ce714 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-08-19 15:47:38 +08:00
tongchenfei
65b251d020 Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2 2020-08-19 15:07:02 +08:00
tongchenfei
b83bead690 增加日志抓取功能 2020-08-19 15:06:43 +08:00
wangcongtao
806d95a93b 顺义分支和dev分支合并 2020-08-19 14:54:15 +08:00
董宏宇
a401970f29 Merge branch 'dev_1.1.2' into qa_1.1.2 2020-08-19 14:54:09 +08:00
董宏宇
fc87a71579 Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2 2020-08-19 14:53:20 +08:00
董宏宇
efa2ec578f 修改了关闭窗体后修改状态的时机 2020-08-19 14:53:12 +08:00
liujing
a32181b580 图片替换,无用代码删除 2020-08-19 14:21:28 +08:00
liujing
098072fd7d Merge branch 'ui' into qa_1.1.2 2020-08-19 14:21:12 +08:00
liujing
05285fa0b6 图片替换,无用代码删除 2020-08-19 14:21:03 +08:00