Commit Graph

6230 Commits

Author SHA1 Message Date
wujifei
ee4d0f5d6c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
2020-11-27 11:38:24 +08:00
wujifei
e9e33c45c9 new# CallChatApi.getInstance().getApiProvider()添加非空判断 2020-11-27 11:37:06 +08:00
liujing
16f79844dc [add] F车机.9替换 2020-11-27 11:27:14 +08:00
liujing
ce047c1326 Merge branch 'ch' into qa_1.1.8 2020-11-27 11:26:54 +08:00
liujing
bc4e4e69e0 [add] F车机.9替换 2020-11-27 11:26:09 +08:00
liujing
633462de3a 出行动态副标题,UI微调 2020-11-27 11:04:27 +08:00
liujing
7879bee13d Merge branch 'kk' into dev 2020-11-27 11:03:54 +08:00
liujing
7f5fba2ca5 出行动态副标题,UI微调 2020-11-27 11:03:08 +08:00
liujing
5f10e88454 没有更能多记录UI 2020-11-27 10:48:16 +08:00
liujing
8d21d033eb Merge branch 'kk' into qa_1.1.8 2020-11-27 10:47:33 +08:00
liujing
81acd216a0 没有更能多记录UI 2020-11-27 10:47:21 +08:00
tongchenfei
f8c56cb375 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-11-27 10:44:56 +08:00
tongchenfei
5d94e8cdff opt ui 自车默认图标更换 2020-11-27 10:43:27 +08:00
lixiaopeng
45a3ab52a0 opt 2020-11-27 10:20:31 +08:00
wangcongtao
d41b0a8f49 bugfix 2020-11-27 10:20:31 +08:00
wangcongtao
877c863076 bugfix 2020-11-27 10:20:31 +08:00
lixiaopeng
c179018e89 opt 2020-11-27 10:19:56 +08:00
liujing
c920477081 [add] 白天模式-出行动态-右侧踩背景色 2020-11-27 10:02:44 +08:00
liujing
9d70b1ec57 Merge branch 'add' into dev 2020-11-27 10:02:24 +08:00
liujing
8e11522b5c [add] 白天模式-出行动态-右侧踩背景色 2020-11-27 10:02:10 +08:00
wangcongtao
a449bd9db4 Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8 2020-11-27 09:58:22 +08:00
wangcongtao
7d83dd58b9 bugfix 2020-11-27 09:58:14 +08:00
liujing
53cdcdf3e6 [rm] 关闭点击状态按钮 2020-11-26 20:48:17 +08:00
liujing
93c8a3b235 Merge branch 'cv' into qa_1.1.8 2020-11-26 20:47:54 +08:00
liujing
c89896a9f6 [rm] 关闭点击状态按钮 2020-11-26 20:47:23 +08:00
wangcongtao
deda295b83 Merge branch 'qa_1.1.8' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_1.1.8 2020-11-26 20:05:07 +08:00
wangcongtao
63ddd76d69 bugfix 2020-11-26 20:03:27 +08:00
liujing
de5d78e984 命名 2020-11-26 18:27:49 +08:00
liujing
1a10c45d43 Merge branch 'ch' into dev 2020-11-26 18:27:30 +08:00
liujing
c0a1cce328 命名 2020-11-26 18:25:09 +08:00
wangcongtao
586d33e327 修改桌面导航栏按钮间距、修改adas数据解析异常 2020-11-26 18:25:09 +08:00
wangcongtao
ac28b024d7 bugfix: D80XCD-1598 2020-11-26 18:25:09 +08:00
wangcongtao
9cbd9fa69b 代码优化 2020-11-26 18:25:09 +08:00
wangcongtao
a3b65964eb 解决高德地图设置自动模式后快速变到白天/夜间的问题、解决 e 系列分享隐藏 adas 的问题 2020-11-26 18:25:09 +08:00
liujing
47f2ea2d9e [add] 车友列表右侧UI 2020-11-26 18:24:00 +08:00
liujing
524de9462d Merge branch 'ch' into qa_1.1.8 2020-11-26 18:23:43 +08:00
liujing
0000714a7a [add] 车友列表右侧UI 2020-11-26 18:23:10 +08:00
liujing
ac83f76e73 [add] 点击.9资源添加F车机 2020-11-26 17:36:33 +08:00
liujing
b5b3fc8506 Merge branch 'as' into dev 2020-11-26 17:36:17 +08:00
liujing
ad8973773c [add] 点击.9资源添加F车机 2020-11-26 17:36:03 +08:00
liujing
633fc5dcff [fix]查询出行动态tts语音播报重复 2020-11-26 17:28:33 +08:00
liujing
6a90c33483 Merge branch 'nn' into qa_1.1.8 2020-11-26 17:28:15 +08:00
liujing
3eaad34ed7 [fix]查询出行动态tts语音播报重复 2020-11-26 17:27:53 +08:00
wangcongtao
aca43453bf 修改桌面导航栏按钮间距、修改adas数据解析异常 2020-11-26 17:23:13 +08:00
wangcongtao
84d1cc23c3 Merge branch 'qa_1.1.8' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_1.1.8 2020-11-26 16:39:14 +08:00
wangcongtao
ebc4ec4403 bugfix: D80XCD-1598 2020-11-26 16:38:52 +08:00
tongchenfei
5b8957e7ce 增加与服务端时间戳不一致的容错机制 2020-11-26 16:35:13 +08:00
liujing
8fadd5e4d9 周边事件子类tts播报 2020-11-26 15:44:16 +08:00
liujing
55deabb85e Merge branch 'kl' into dev 2020-11-26 15:44:01 +08:00
liujing
7e3c9a4a63 周边事件子类tts播报 2020-11-26 15:43:42 +08:00