Commit Graph

3733 Commits

Author SHA1 Message Date
wangcongtao
a60e69ad64 opt 2021-01-21 19:12:24 +08:00
wangcongtao
c4fa38c55a rc 2021-01-20 14:09:00 +08:00
wangcongtao
27d568a328 opt 2021-01-20 14:08:00 +08:00
wangcongtao
32e73115c3 Merge branch 'qa_merge_shunyi_vr_map' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa_merge_shunyi_vr_map 2021-01-19 20:28:13 +08:00
wangcongtao
386e882133 opt 2021-01-19 20:26:53 +08:00
tongchenfei
d187af5d98 opt logic 2021-01-19 19:56:32 +08:00
tongchenfei
302b4c436c Merge remote-tracking branch 'origin/dev2' into dev2 2021-01-18 18:25:10 +08:00
wangcongtao
be3654f6c4 opt 2021-01-18 16:45:02 +08:00
tongchenfei
568ae741ee Merge remote-tracking branch 'origin/dev2' into dev2 2021-01-18 10:11:56 +08:00
wangcongtao
53c0a936cf ui opt:分体机部分按钮背景图替换 2021-01-18 10:11:28 +08:00
tongchenfei
10200c3df6 添加网约车小巴初步实现 2021-01-15 20:28:24 +08:00
tongchenfei
bb63c61488 Merge remote-tracking branch 'origin/dev2' into dev2 2021-01-15 10:53:34 +08:00
wangcongtao
076b126eff 网约车项目模块建造 2021-01-15 10:47:34 +08:00
tongchenfei
3e29f41d67 Merge remote-tracking branch 'origin/dev2' into dev2 2021-01-15 10:35:34 +08:00
tongchenfei
f6dc3a117d 增加TopView粘性展示 2021-01-15 10:35:26 +08:00
wangcongtao
e4719cee47 Merge branch 'qa_1.1.9' into dev2 2021-01-14 17:59:09 +08:00
wangcongtao
3e05bbe27c ui opt:分体机部分按钮背景图替换 2021-01-14 17:53:15 +08:00
wangcongtao
b00985eb82 ui opt 2021-01-14 15:59:56 +08:00
tongchenfei
a1cfe98b65 Merge remote-tracking branch 'origin/dev2' into dev2 2021-01-14 14:47:45 +08:00
tongchenfei
f63579bd11 Merge dev_mogo_httpdns
there are some conflicts:
 both modified:   foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
        both modified:   gradle.properties
        both modified:   modules/mogo-module-share/consumer-rules.pro
        both modified:   modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
2021-01-14 14:45:53 +08:00
wangcongtao
03d0aeef4f Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into dev2 2021-01-14 14:26:52 +08:00
wangcongtao
aa83ad8e8c new dev branch 2021-01-14 14:20:30 +08:00
wangcongtao
a3a22b6bf1 Merge branch 'qa_merge_shunyi_vr_map' into dev2 2021-01-14 14:17:59 +08:00
wujifei
64aad292a5 fix#防止重复调用 2021-01-14 11:19:39 +08:00
wangcongtao
081ccff243 同步顶部弹窗容器准备状态 2021-01-14 10:36:24 +08:00
wujifei
1b6acc5266 fix#防止重复调用 2021-01-13 21:55:57 +08:00
wujifei
f77b462f3f Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 2021-01-13 21:40:41 +08:00
wujifei
dd8ea0bf19 fix#防止重复调用 2021-01-13 21:40:16 +08:00
liujing
87b4ccfc6b no message 2021-01-13 21:01:24 +08:00
liujing
763eef1327 目的地停车场推荐,取消唤醒词增加 2021-01-13 20:32:44 +08:00
liujing
646dcb81a7 目的地违章停车,前往免唤醒词增加 2021-01-13 20:13:46 +08:00
董宏宇
7d49c83e19 增加保底 2021-01-13 20:10:40 +08:00
董宏宇
6c82fc9d06 Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 2021-01-13 19:52:52 +08:00
董宏宇
669dbe7436 调整了配置文件获取的时机是在ACC ON状态时候 2021-01-13 19:52:47 +08:00
wujifei
4429e41bee Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 2021-01-13 18:51:51 +08:00
wujifei
6c1322b7e1 fix#修改格式转换异常 2021-01-13 18:51:26 +08:00
wangcongtao
5cde4edadf 解决重启后语音无法免唤醒的问题 2021-01-13 18:26:09 +08:00
tongchenfei
94df8aa860 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-13 17:19:13 +08:00
liujing
7c1bfb62fb 应设计 要求,删除距离显示 2021-01-13 15:57:53 +08:00
wujifei
d798accef1 Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 2021-01-13 11:18:24 +08:00
wujifei
cf4989a6fa fix#修改格式转换异常 2021-01-13 11:17:58 +08:00
wangcongtao
c5152dedfa 解决内存泄漏问题2 2021-01-13 11:02:44 +08:00
wangcongtao
83ada494e9 Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 2021-01-13 10:25:39 +08:00
wangcongtao
a9741f0ff1 解决内存泄漏问题 2021-01-13 10:25:31 +08:00
tongchenfei
ba05ade028 将上报限制改回早高峰2次晚高峰3次,平时5次 2021-01-12 19:48:29 +08:00
tongchenfei
2e6425ec0c Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 2021-01-12 18:54:14 +08:00
tongchenfei
77a0331cc6 方便测试,修改上报限制次数为1 2021-01-12 18:54:08 +08:00
wujifei
8a305a7c39 Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 2021-01-12 16:54:20 +08:00
wujifei
ba888ee359 fix#缺陷#153 2021-01-12 16:53:54 +08:00
tongchenfei
17b9291976 Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 2021-01-12 16:48:54 +08:00