Commit Graph

1999 Commits

Author SHA1 Message Date
liujing
b19d4e21e4 msg 2020-08-24 11:31:53 +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
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
lixiaopeng
7b3c69cb1a opt 2020-08-20 09:51:29 +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
7ef2d72f16 ui 2020-08-19 17:14:28 +08:00
lixiaopeng
58e5bb6b0d opt ui 2020-08-19 17:08:09 +08:00
tongchenfei
25a982337c Merge branch 'qa_1.1.2' into dev 2020-08-19 15:47:55 +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
董宏宇
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
05285fa0b6 图片替换,无用代码删除 2020-08-19 14:21:03 +08:00
董宏宇
e89706a4d7 修改了关闭窗体后修改状态的时机 2020-08-19 14:15:12 +08:00
liujing
8544c19342 服务端返回字段大小写有误 2020-08-19 12:23:21 +08:00
wangcongtao
7727011de1 1. 1.1.3需求策略修改。 2020-08-19 11:48:25 +08:00
liujing
aa67ca085f ui 2020-08-19 10:25:18 +08:00
liujing
7b796c65ba UI 2020-08-18 21:28:22 +08:00
liujing
a45f82c70c UI 2020-08-18 20:45:59 +08:00
liujing
1d7c902703 我的分享列表刷新时机 2020-08-18 19:55:24 +08:00
lixiaopeng
2b3a58361c opt ui 2020-08-18 17:25:26 +08:00
lixiaopeng
1853f50bbc opt ui 2020-08-18 17:04:08 +08:00
liujing
1af7263dad [add] 部分UI 2020-08-18 16:43:30 +08:00
董宏宇
14d3ee444e 增加日志 2020-08-18 15:36:52 +08:00
董宏宇
d85c6c9d26 打开了日志输出 2020-08-18 15:29:45 +08:00
lixiaopeng
1b4c625dd9 opt 2020-08-18 14:48:29 +08:00
董宏宇
50e6eb5cf8 Merge branch 'dev_1.1.2' into dev
# Conflicts:
#	modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorConst.java
#	modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java
2020-08-18 14:19:13 +08:00
董宏宇
94e8807dfd Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2 2020-08-18 14:14:36 +08:00
董宏宇
11cf188cea 修复了调用接口addPoiInfoFabulous穿参数问题 2020-08-18 14:14:17 +08:00
tongchenfei
956330bf96 Merge remote-tracking branch 'origin/qa_1.1.2' into qa_1.1.2 2020-08-18 13:13:29 +08:00
tongchenfei
7ebc0b0862 opt 2020-08-18 13:11:07 +08:00
wangcongtao
64cbbdc6ee Merge remote-tracking branch 'origin/dev' into dev 2020-08-18 10:09:28 +08:00
wangcongtao
f25ed65f6a 1. 调整tts播报策略为默认 2020-08-18 10:09:09 +08:00
tongchenfei
6ccea8cca5 opt 2020-08-18 10:08:23 +08:00
wangcongtao
75fcf33a4a Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-08-18 09:57:22 +08:00
wangcongtao
5d714a459f 1. 新增广播方式控制日志输出,便于release打包时调试
2. 优化accOff控制周边车友/事件播报:完全accOff之后才停止
2020-08-18 09:57:05 +08:00
tongchenfei
3b88859a32 Merge remote-tracking branch 'origin/dev' into dev 2020-08-18 09:49:08 +08:00
tongchenfei
21cbaeaeb1 修改事件id数据类型 2020-08-18 09:48:55 +08:00
lixiaopeng
fd069d877c opt 2020-08-17 19:22:11 +08:00
wangcongtao
f080c40958 1. bugfix: NPE 2020-08-17 17:09:18 +08:00
wangcongtao
22dd151d44 1. bugfix: NPE 2020-08-17 17:09:00 +08:00
董宏宇
f40f51516f 修复因刚才修改导致的展示异常 2020-08-17 17:04:12 +08:00