Commit Graph

3749 Commits

Author SHA1 Message Date
wangcongtao
7b9daf7d58 提取资源到res目录
新增地图打开鹰眼模式接口
新增自动进入鹰眼模式逻辑
2021-02-02 17:56:39 +08:00
wangcongtao
10026ea062 Merge branch 'qa_merge_shunyi_vr_map' into dev2 2021-02-02 11:19:32 +08:00
wangcongtao
64b21da1f4 opt 2021-02-02 11:18:43 +08:00
wangcongtao
2ea8e34a8d Merge branch 'qa_merge_shunyi_vr_map' into dev2 2021-02-01 10:03:54 +08:00
wangcongtao
50c30eeea1 opt 2021-01-29 18:31:34 +08:00
wangcongtao
3f83ed844e opt 2021-01-29 18:20:36 +08:00
wangcongtao
3e8a241aaa 重新联网时刷新订单状态 2021-01-28 09:44:45 +08:00
wangcongtao
7fe3d60fa1 使用车辆定位获取车速 2021-01-27 20:26:05 +08:00
wangcongtao
e2f87ae11b Merge branch 'qa_merge_shunyi_vr_map' into dev2 2021-01-26 18:15:18 +08:00
wangcongtao
7f68d53d1f 优化 2021-01-26 18:13:31 +08:00
wangcongtao
233ba7b89f Merge branch 'qa_merge_shunyi_vr_map' into dev2
# Conflicts:
#	config.gradle
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudLocationInfo.java
#	services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
2021-01-26 09:26:48 +08:00
wangcongtao
0d0c39af67 opt 2021-01-25 18:42:18 +08:00
wangcongtao
0c77c3b98f opt 2021-01-22 23:31:17 +08:00
wangcongtao
87607058cb ui opt 2021-01-22 16:48:02 +08:00
wangcongtao
a60e69ad64 opt 2021-01-21 19:12:24 +08:00
wangcongtao
996da7802a opt 2021-01-21 16:57:44 +08:00
wangcongtao
425ddf1489 opt 2021-01-21 15:01:05 +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