Commit Graph

12455 Commits

Author SHA1 Message Date
董宏宇
e89706a4d7 修改了关闭窗体后修改状态的时机 2020-08-19 14:15:12 +08:00
liujing
8d52789508 服务端返回字段大小写有误 2020-08-19 12:23:47 +08:00
liujing
562623f9eb Merge branch 'ui' into qa_1.1.2 2020-08-19 12:23:31 +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
3612f2123f ui 2020-08-19 10:25:40 +08:00
liujing
060eeb1328 Merge branch 'ui' into qa_1.1.2 2020-08-19 10:25:27 +08:00
liujing
aa67ca085f ui 2020-08-19 10:25:18 +08:00
liujing
6136e323ab UI 2020-08-18 21:28:47 +08:00
liujing
9adb62e51e Merge branch 'ui' into qa_1.1.2 2020-08-18 21:28:29 +08:00
liujing
7b796c65ba UI 2020-08-18 21:28:22 +08:00
liujing
fbbd976dc8 UI 2020-08-18 20:46:26 +08:00
liujing
5dc2f249fb Merge branch 'ui' into qa_1.1.2 2020-08-18 20:46:09 +08:00
liujing
a45f82c70c UI 2020-08-18 20:45:59 +08:00
liujing
898049190e 我的分享列表刷新时机 2020-08-18 19:56:21 +08:00
liujing
19d2ad4567 Merge branch 'ui' into qa_1.1.2 2020-08-18 19:55:29 +08:00
liujing
1d7c902703 我的分享列表刷新时机 2020-08-18 19:55:24 +08:00
jiaguofeng
5d83c4a2e2 fix log print 2020-08-18 17:52:31 +08:00
jiaguofeng
d10b4dba2b fix log print 2020-08-18 17:45:03 +08:00
lixiaopeng
2b3a58361c opt ui 2020-08-18 17:25:26 +08:00
jiaguofeng
6450148f09 fix bug 2020-08-18 17:13:23 +08:00
lixiaopeng
1853f50bbc opt ui 2020-08-18 17:04:08 +08:00
liujing
07629acc3c [add] 部分UI 2020-08-18 16:44:37 +08:00
liujing
ed61bef010 Merge branch 'ui' into qa_1.1.2 2020-08-18 16:43:48 +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
jiaguofeng
8a0b1a19cb fix bug 2020-08-18 15:09:18 +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
77785b3d0f Merge branch 'qa_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 13:18:23 +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
wangcongtao
6283f79629 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-08-17 16:59:00 +08:00
wangcongtao
db0498ccb2 1. 不支持语音预激活 2020-08-17 16:58:49 +08:00
wangcongtao
7d6fe9feef 1. 优化 build.gradle 文件 2020-08-17 16:49:32 +08:00
tongchenfei
7bdd0d5525 Merge remote-tracking branch 'origin/dev' into dev 2020-08-17 16:48:13 +08:00