yangyakun
|
67e5531d80
|
Merge branch 'dev_minibus-d_230322_3.0.0' into dev_robobus-d_230413_3.1.0
# Conflicts:
# OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt
# OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/constant/URLConst.kt
# OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
# OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
# OCH/mogo-och-common-module/build.gradle
# OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
# app/config/tempConfig.json
# app/config/urlConfig.json
# core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt
# gradle.properties
|
2023-04-14 10:40:00 +08:00 |
|
wangmingjun
|
8038a94e26
|
[mini bus3.0.0] 司机端二维码合并问题处理
|
2023-04-10 17:30:41 +08:00 |
|
wangmingjun
|
1755396f72
|
[mini bus] merge 司机端二维码冲突
|
2023-04-10 16:36:11 +08:00 |
|
wangmingjun
|
9c0ba1f3b0
|
[2.0.0] 修复接驳乘客屏偶现路线不更新问题
|
2023-04-10 15:32:04 +08:00 |
|
wangmingjun
|
620344482c
|
[shuttle] 韩语更新
|
2023-04-07 14:01:20 +08:00 |
|
wangmingjun
|
fe98ec7a0f
|
Merge branch 'dev_robobus_network_weak_230323' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus_network_weak_230323
# Conflicts:
# OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt
# OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/presenter/PM2DrivingPresenter.kt
# OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
|
2023-04-06 11:00:07 +08:00 |
|
wangmingjun
|
21ac2f8f4a
|
[shuttle-B1/B2] 弱网调试完成
|
2023-03-31 20:47:19 +08:00 |
|
wangmingjun
|
4625cc45e0
|
[3.0.0] 增加log日志
|
2023-03-31 18:35:23 +08:00 |
|
wangmingjun
|
65a83154c7
|
[shuttle-B1/B2] 弱网增加登陆状态缓存
|
2023-03-31 16:55:05 +08:00 |
|
wangmingjun
|
8051629a30
|
[opt] 修改实体类造成的崩溃
|
2023-03-30 19:54:04 +08:00 |
|
wangmingjun
|
dec5d11208
|
[opt] 弱网缓存处理
|
2023-03-30 18:02:08 +08:00 |
|
wangmingjun
|
bf60ded6a5
|
Merge branch 'dev_robobus_network_weak_230323' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus_network_weak_230323
# Conflicts:
# OCH/mogo-och-common-module/build.gradle
# OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
|
2023-03-30 11:13:00 +08:00 |
|
wangmingjun
|
2c2fb65d1e
|
[opt] 司乘弱网缓存
|
2023-03-30 10:54:59 +08:00 |
|
wangmingjun
|
45079b946d
|
[3.0.0] 司机端韩语
|
2023-03-29 20:35:15 +08:00 |
|
wangmingjun
|
ca1809bed7
|
[3.0.0] 司机端二维码
|
2023-03-29 18:16:29 +08:00 |
|
yangyakun
|
dc32885197
|
[shuttle]
|
2023-03-23 17:24:42 +08:00 |
|
yangyakun
|
2b2ec07a57
|
[shuttle]
[分离shuttle]
|
2023-03-23 11:37:05 +08:00 |
|