Commit Graph

36 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
董宏宇
caa0921120 解决收车后滑动按钮还在展示的问题 2021-07-19 17:35:57 +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
zhongchao
512d39b258 Merge branch 'qa_hengyang_base' into dev_hengyang_base 2021-06-25 19:41:13 +08:00
lianglihui
e3532f4573 taxi 自动驾驶画线 2021-06-24 12:19:02 +08:00
董宏宇
507619ce19 Fix mock gps data 2021-06-23 17:31:55 +08:00
董宏宇
f1cb99c060 Fix mock data 2021-06-23 17:08:31 +08:00
董宏宇
97175fa46c 增加了单独与工控机下发站点的功能
修复了ADAS状态回调未被注册的bug
2021-06-22 17:24:27 +08:00
董宏宇
dc09700579 增加收车tts,打开收车逻辑控制站点信息的逻辑 2021-05-14 13:18:14 +08:00
董宏宇
088de09315 暂时关闭了根据运营状态控制UI的方法 2021-05-14 12:37:09 +08:00
董宏宇
a69cdaf0c6 修复小巴车订单流转,
完成小巴车UI修复
2021-04-29 21:54:32 +08:00
董宏宇
e2b6f98bd0 修改了运营状态的判断位置 2021-04-27 19:46:23 +08:00
董宏宇
31553dbfaa 增加了对滑动按钮的显示隐藏的控制 2021-04-27 19:30:33 +08:00
董宏宇
635f032bcf 关闭了一些日志
增加了一些注释
删除了一些废弃的UI代码
2021-04-26 20:41:37 +08:00
董宏宇
27554e4ced 完成网约车,自动驾驶出租车UI改版 2021-04-07 16:27:14 +08:00
wangcongtao
a633c3cc4a 优化显示逻辑 2021-03-26 16:52:22 +08:00
tongchenfei
a0f052fd87 增加隐藏式debug入口 2021-02-05 10:04:31 +08:00
wangcongtao
7b9daf7d58 提取资源到res目录
新增地图打开鹰眼模式接口
新增自动进入鹰眼模式逻辑
2021-02-02 17:56:39 +08:00
wangcongtao
89dc62477f opt 2021-02-02 15:53:13 +08:00
wangcongtao
6ce07b5a31 UI opt 2021-02-02 14:40:39 +08:00
tongchenfei
358fe04e78 去掉showNotice的自动驾驶状态判断 2021-02-02 14:16:55 +08:00
wangcongtao
97314a67d3 opt 2021-02-01 16:56:30 +08:00
wangcongtao
e405bf4f0c test 2021-02-01 16:30:39 +08:00
wangcongtao
3f83ed844e opt 2021-01-29 18:20:36 +08:00
tongchenfei
0aee7e19fe add log 2021-01-27 20:33:41 +08:00
tongchenfei
805e18c6e3 应用启动时根据自动驾驶状态改变tvc状态 2021-01-27 11:08:19 +08:00
tongchenfei
bd57ecb74d opt och bus 2021-01-27 10:39:23 +08:00
tongchenfei
d2933a09b4 增加测试按钮 2021-01-26 20:32:48 +08:00
tongchenfei
41a1c60718 opt adas callback 2021-01-26 18:47:22 +08:00
tongchenfei
49874015aa 增加adas状态同步,增加自动驾驶异常状态处理 2021-01-26 18:26:51 +08:00
tongchenfei
f18f76d2d2 opt ui 2021-01-25 17:58:23 +08:00
tongchenfei
45bd6208df Merge remote-tracking branch 'origin/dev2' into dev2 2021-01-22 09:58:30 +08:00
tongchenfei
6952cfac94 优化基础布局 2021-01-22 09:58:22 +08:00
wangcongtao
c40126aaf2 接入基础UI 2021-01-21 16:44:04 +08:00
tongchenfei
5e1961eb33 添加BaseOchFragment 2021-01-21 15:45:34 +08:00