Commit Graph

244 Commits

Author SHA1 Message Date
董宏宇
ff017d4adf Merge branch 'feature/feature_show_dispatch' into feature/feature_mogo_obu
# Conflicts:
#	.idea/gradle.xml
#	.idea/misc.xml
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
#	OCH/mogo-och-taxi/src/main/res/values/strings.xml
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	config.gradle
#	foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java
#	foudations/mogo-aicloud-services-apk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
#	foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
#	foudations/mogo-commons/src/main/java/com/mogo/commons/constants/SharedPrefsConstants.java
#	gradle.properties
#	libraries/map-custom/build.gradle
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/spi/SPIRealTimeUpload.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
#	services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
#	services/mogo-service-api/src/main/java/com/mogo/service/connection/IMogoSocketManager.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoSocketManager.java
2021-08-30 11:59:44 +08:00
董宏宇
f7214481a2 增加了OBU提供自车位置的功能 2021-08-25 12:53:50 +08:00
董宏宇
152c916a8e 调整Gradle依赖关系 2021-08-25 11:09:54 +08:00
董宏宇
6cd25a6d7d 修复红绿灯的展示逻辑 2021-08-20 18:46:01 +08:00
董宏宇
707910ee73 临时关闭2D切换逻辑 2021-08-17 19:40:16 +08:00
zhongchao
ea4e380b35 add new func of ezhou airport and upgrade the aiSdkVersion to fit demo server 2021-08-05 10:50:05 +08:00
zhongchao
a700bc5541 add new func of httpdns switch city to fit socketserver 2021-07-30 17:22:37 +08:00
lixiaopeng
ed34438ca3 opt bus model 2021-07-21 10:26:47 +08:00
liujing
322228d906 add testpanel of mock 2021-07-20 13:21:30 +08:00
董宏宇
188fd1b5f8 关闭当前车模上的速度 2021-07-19 17:52:12 +08:00
lixiaopeng
b60ac6ab1e modify bus model 2021-07-19 15:24:33 +08:00
董宏宇
4cf17402f9 修复小地图以及订位置缓存和订单站点更新问题 2021-07-11 23:28:50 +08:00
jiaguofeng
e8cf4d4e33 mapsdk :1.0.0-vr-8.5.71
日志:优化锚点方向旋转相关
2021-07-11 15:19:49 +08:00
zhongchao
ff61d92a89 fix bug of delay and update map version 2021-07-09 09:25:09 +08:00
lixiaopeng
e6657f3941 opt mogo obu 2021-07-05 18:45:23 +08:00
董宏宇
f90ddc5770 使用本地数据 2021-07-02 20:40:08 +08:00
董宏宇
9bead222d2 增加注释 2021-07-02 20:39:17 +08:00
董宏宇
149974019e 修改地图配置,使用在线数据 2021-07-02 20:38:38 +08:00
董宏宇
ee37b0a129 关闭了地图修正marker角度 2021-07-02 16:02:50 +08:00
lianglihui
e0e51c6f51 网约车 清除自定义log 2021-07-01 13:39:06 +08:00
lianglihui
dc5bbb5d66 网约车 修复#845 #842 #846 #847 调试custom map 无法加载 2021-07-01 12:44:25 +08:00
liujing
b3051dd07f 定位信息缓存,解决首次启动拿不到定位问题 2021-06-30 10:45:29 +08:00
zhongchao
bbcfc07a4d fix bug of map draw line 2021-06-28 11:03:56 +08:00
zhongchao
9b47282f21 changed the cache to draw marker 2021-06-27 12:16:03 +08:00
zhongchao
512d39b258 Merge branch 'qa_hengyang_base' into dev_hengyang_base 2021-06-25 19:41:13 +08:00
董宏宇
f2589150e9 Fix first app request http dns is wrong 2021-06-24 18:02:58 +08:00
zhongchao
935f7f2d2d wait to finish 2021-06-21 16:24:10 +08:00
董宏宇
5797758332 修复首次进入VR模式效果会先从2D过度的问题 2021-06-21 14:14:10 +08:00
wujifei
9d993e5f5e fix#优化他车求助锚点显示 2021-06-21 14:12:57 +08:00
董宏宇
5a339383e9 修复首次进入VR模式效果会先从2D过度的问题 2021-06-18 20:03:31 +08:00
wujifei
327af8c6ee fix#优化他车求助锚点显示 2021-06-18 14:17:23 +08:00
zhongchao
07fca42513 merge dev2_aiSdk_datalink 2021-06-07 11:01:02 +08:00
zhongchao
89e0a4d824 open the map log 2021-06-04 17:32:30 +08:00
zhongchao
fed96047ed use local map data 2021-06-03 23:27:38 +08:00
lixiaopeng
117e7b120c opt 2021-05-31 14:47:35 +08:00
lixiaopeng
06332c9868 opt 2021-05-28 11:47:22 +08:00
zhongchao
504fc47132 changed the getSn and visual func 2021-05-27 21:13:36 +08:00
zhongchao
4010c27dbe remix the aiCloudSocketData 2021-05-25 15:55:08 +08:00
董宏宇
8e9ad6398c 完成了联想渠道鉴权 2021-05-17 20:16:15 +08:00
zhongchao
9f2eb25774 add new func of mockData 2021-05-17 16:50:17 +08:00
zhongchao
be30ac60a3 add new func of clicking static marker should visual change ,plus move to marker position 2021-05-13 15:32:47 +08:00
zhongchao
e7dc330fc8 Merge branch 'dev2_aiSdk' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev2_aiSdk 2021-05-08 16:32:18 +08:00
zhongchao
c2bbc0407f fix bug 2021-05-08 16:32:01 +08:00
lixiaopeng
1f58033c15 replace n3d 2021-05-08 16:23:08 +08:00
zhongchao
21f4aba822 merge 2021-05-07 20:33:45 +08:00
zhongchao
f3510e3570 add new func 2021-05-07 20:29:59 +08:00
董宏宇
2f1b0071c0 升级地图版本
implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.21'
2021-05-07 17:29:54 +08:00
lixiaopeng
3d004e4d99 upgrade adas version 2021-05-07 16:06:44 +08:00
liujing
097a872f31 模拟数据+gps参数 2021-04-29 18:42:20 +08:00
zhongchao
ec5fc67ab6 merge 2021-04-28 19:56:00 +08:00