董宏宇
|
17bb0130a7
|
修复 och_bus 渠道获取sn方式
|
2021-08-31 15:10:15 +08:00 |
|
董宏宇
|
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 |
|
lixiaopeng
|
f75e84e8d6
|
opt
|
2021-08-20 16:52:52 +08:00 |
|
lianglihui
|
51fad2d6f9
|
och_taxi 调整轮询订单状态处理逻辑
|
2021-08-02 12:21:29 +08:00 |
|
zhongchao
|
e89b315641
|
change the tiny difference of dev or qa branch
|
2021-07-31 09:13:02 +08:00 |
|
zhongchao
|
b2a98b67fb
|
rebase
|
2021-07-30 18:28:40 +08:00 |
|
董宏宇
|
78e869a3b4
|
修改小巴车 TTS 把语音播报中的【蘑菇车联】改成「’蘑菇车联‘」解决断句问题
|
2021-07-29 19:28:25 +08:00 |
|
董宏宇
|
19186cabdb
|
修改小巴车 TTS 把语音播报中的【蘑菇出行】改成【蘑菇车联】
|
2021-07-29 18:00:22 +08:00 |
|
董宏宇
|
4acb532d13
|
修改小巴车 TTS 把语音播报中的【蘑菇智途】改成【蘑菇车联】
|
2021-07-29 10:39:31 +08:00 |
|
lianglihui
|
c561d7b5ca
|
och_taxi ui还原不处理换行
|
2021-07-23 10:46:52 +08:00 |
|
lianglihui
|
831e7ec43c
|
och_taxi 升级socket长连接版本
|
2021-07-22 14:49:59 +08:00 |
|
lianglihui
|
f45316ebcc
|
och_taxi 修复没有滑动条的问题
|
2021-07-21 18:33:45 +08:00 |
|
lianglihui
|
1445cd63be
|
och_taxi 解决npe
|
2021-07-21 13:05:35 +08:00 |
|
董宏宇
|
caa0921120
|
解决收车后滑动按钮还在展示的问题
|
2021-07-19 17:35:57 +08:00 |
|
lianglihui
|
1c526562d4
|
och_bus 修改出车/收车 button 样式
|
2021-07-19 11:24:07 +08:00 |
|
lianglihui
|
638ca14553
|
Merge remote-tracking branch 'origin/qa_hengyang_base' into qa_hengyang_base
|
2021-07-19 10:59:15 +08:00 |
|
lianglihui
|
c6f0afc949
|
taxi 采用轮询方案,暂时注释长连接
|
2021-07-19 10:58:39 +08:00 |
|
lianglihui
|
604dd938c1
|
Revert "taxi 3秒轮询方案 缓解长连接异常 调整订单状态切换逻辑,完全从服务端获取"
This reverts commit eee19baf
|
2021-07-18 15:30:03 +08:00 |
|
lianglihui
|
eee19baf2d
|
taxi 3秒轮询方案 缓解长连接异常 调整订单状态切换逻辑,完全从服务端获取
|
2021-07-18 15:16:28 +08:00 |
|
lianglihui
|
c7db187928
|
taxi 3秒轮询方案 缓解长连接异常
|
2021-07-18 12:26:51 +08:00 |
|
lianglihui
|
a5e076c266
|
taxi 兼容订单状态异常
|
2021-07-17 21:38:46 +08:00 |
|
董宏宇
|
0194dc6a60
|
还原定位坐标数据获取，坐标系必须使用高精度wgs84
|
2021-07-16 23:40:25 +08:00 |
|
董宏宇
|
4a85c1f831
|
修复到站播报异常
|
2021-07-16 23:02:08 +08:00 |
|
zhongchao
|
5a2433a13d
|
..
|
2021-07-15 09:36:49 +08:00 |
|
zhongchao
|
c72e9beed7
|
fix bug of cloud data reslove
|
2021-07-14 20:55:12 +08:00 |
|
董宏宇
|
248e8b9b6a
|
修复小地图以及订位置缓存和订单站点更新问题
|
2021-07-13 17:31:46 +08:00 |
|
董宏宇
|
5ea054c81c
|
修复小地图以及订位置缓存和订单站点更新问题
|
2021-07-13 16:21:50 +08:00 |
|
董宏宇
|
c79ab5af9b
|
修复小智语音播报带数字的文案
|
2021-07-13 16:07:03 +08:00 |
|
董宏宇
|
8e71da1211
|
修复出车逻辑,会调用一下重置站点接口,来清除缓存获取最新站点信息
|
2021-07-12 18:59:20 +08:00 |
|
董宏宇
|
7ebdff8ce3
|
增加了收车重制站点功能
|
2021-07-12 11:38:35 +08:00 |
|
董宏宇
|
4cf17402f9
|
修复小地图以及订位置缓存和订单站点更新问题
|
2021-07-11 23:28:50 +08:00 |
|
lianglihui
|
54af4e5ffd
|
网约车 增加部分订单状态转换时 tts播报
|
2021-07-09 15:50:31 +08:00 |
|
lianglihui
|
b3960086e0
|
网约车 修复坐标不一致导致的距离计算和自动驾驶不准确的问题
|
2021-07-08 21:00:07 +08:00 |
|
lianglihui
|
b42d063107
|
网约车 修改剩余里程的计算逻辑
根据测试用例修改tts语音文案
|
2021-07-07 14:52:04 +08:00 |
|
lianglihui
|
18e917bd74
|
网约车 处理bugly #582025
|
2021-07-01 15:37:58 +08:00 |
|
lianglihui
|
91f831e055
|
网约车 站点名称过长的问题 产品决定延后处理
处理bugly #582025
|
2021-07-01 15:35:02 +08:00 |
|
lianglihui
|
e0e51c6f51
|
网约车 清除自定义log
|
2021-07-01 13:39:06 +08:00 |
|
董宏宇
|
16daed4fab
|
Fix customer map load bug
|
2021-07-01 13:30:49 +08:00 |
|
lianglihui
|
dc5bbb5d66
|
网约车 修复#845 #842 #846 #847 调试custom map 无法加载
|
2021-07-01 12:44:25 +08:00 |
|
lianglihui
|
9bc7a18534
|
网约车 调整 修改运营状态逻辑
打开正式环境 bugly崩溃上传
|
2021-06-29 19:07:44 +08:00 |
|
zhongchao
|
51155e7163
|
merge
|
2021-06-29 11:29:49 +08:00 |
|
lianglihui
|
5b97f18dca
|
网约车 修复编译异常
|
2021-06-28 15:45:57 +08:00 |
|
lianglihui
|
87fd832301
|
网约车
1.更新计算剩余路程
2.到站增加tts播报
|
2021-06-28 14:42:21 +08:00 |
|
lianglihui
|
e8e39e9e69
|
taxi 自动驾驶画线
|
2021-06-28 12:30:37 +08:00 |
|
lianglihui
|
604a2b78c5
|
网约车 调试代码同步
|
2021-06-28 12:11:42 +08:00 |
|
lianglihui
|
e196b639b4
|
网约车 未出车状态下 不处理订单
|
2021-06-27 18:34:01 +08:00 |
|
lixiaopeng
|
8a3ee2fa0f
|
opt
|
2021-06-27 12:52:55 +08:00 |
|
zhongchao
|
512d39b258
|
Merge branch 'qa_hengyang_base' into dev_hengyang_base
|
2021-06-25 19:41:13 +08:00 |
|
lianglihui
|
2fb900ef06
|
网约车 调试 cancel场景
|
2021-06-25 14:36:55 +08:00 |
|
lianglihui
|
d871b31954
|
网约车 Cancel Completed状态下 UI调整
|
2021-06-24 16:15:04 +08:00 |
|