Commit Graph

498 Commits

Author SHA1 Message Date
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
yangyakun
de89d77e49 [bugfix]
[角标越界问题]
2023-04-13 19:12:25 +08:00
wangmingjun
8038a94e26 [mini bus3.0.0] 司机端二维码合并问题处理 2023-04-10 17:30:41 +08:00
wangmingjun
6dab66de84 [shuttle] 韩语更新 2023-04-10 16:43:21 +08:00
wangmingjun
01cd5e4848 [3.0.0] 司机端韩语 2023-04-10 16:39:28 +08:00
wangmingjun
1755396f72 [mini bus] merge 司机端二维码冲突 2023-04-10 16:36:11 +08:00
donghongyu
faa191d8f9 「dev_robobus-d_230322_3.0.0」
1、增加
    lintOptions {
        abortOnError false
    }
2023-04-10 14:24:03 +08:00
wangmingjun
620344482c [shuttle] 韩语更新 2023-04-07 14:01:20 +08:00
wangmingjun
08337e0002 [3.0.0] 去除无用类 2023-03-31 18:18:37 +08:00
wangmingjun
45079b946d [3.0.0] 司机端韩语 2023-03-29 20:35:15 +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
wangmingjun
d313ac52b9 [shuttle/M1] 1、处理运营消息单发乘客屏bug 2、站点文案修改 2023-03-17 23:36:21 +08:00
wangmingjun
26d6f4ef62 [M1/shuttle] 定位回调使用默认频率 2023-03-14 18:57:10 +08:00
wangmingjun
b98e446bfe Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-14 14:27:38 +08:00
renwj
7e3abc88e0 [dev_arch_opt_3.0] 优化UiThreadHandler和ThreadUtils切换主线程的逻辑,避免主线程消息队列过多,造成卡顿 2023-03-14 14:14:40 +08:00
wangmingjun
c284e90469 [M2] 设置定位回调频率; 更换视频默认图 2023-03-13 15:26:20 +08:00
wangmingjun
97aca64a1d [bus/shuttle]运营消息时间展示 2023-03-10 15:32:17 +08:00
wangmingjun
88b8be2962 [M1/shuttle] 加入平行驾驶 2023-03-10 00:35:25 +08:00
wangmingjun
decf6e4ba3 [M2] 司机端转发运营消息,乘客屏展示 2023-03-09 14:32:54 +08:00
wangmingjun
641060c649 [M2] 1、图片在网络不好加载黑屏问题 2、尝试解决跳转视频一瞬黑屏 2023-03-09 13:53:24 +08:00
wangmingjun
78ad8103ce [shuttle] 1、增加接驳下发乘客屏运营消息功能 2、接驳平行驾驶显示 2023-03-08 17:39:32 +08:00
wangmingjun
fffe9d4187 [M2] 1、注释定位频率设定 2、倒计时问题 3、M2 走马灯 2023-03-08 00:32:11 +08:00
yangyakun
f5b4110904 [m1]
[1.1.2]
[下载轨迹查询登录状态、补偿5分钟语音播报]
2023-03-07 10:51:04 +08:00
wangmingjun
eba6745983 [bus] 司机度端点击效果跟之前保持一致 2023-03-06 17:29:33 +08:00
wangmingjun
91ab0d0931 [shuttle/charter/bus] 1、解决司机端底部按钮阴影问题 2、M1司机端速度监听 3、M2乘客屏地图样式更改 2023-03-06 16:35:06 +08:00
wangmingjun
ac0f902240 [shuttle] 离站播报逻辑保持跟接驳一致 2023-03-04 08:36:50 +08:00
wangmingjun
854b9af5e5 [M1] 烟台私有化 + 多语音 2023-03-03 23:59:05 +08:00
yangyakun
58acd2994b [m1]
[1.1.2]
[业务BUSINESS_STRING包裹类修改]
2023-03-03 08:42:22 +08:00
yangyakun
93932684a8 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-01 21:12:46 +08:00
lixiaopeng
31c3bf480f [dev_arch_opt_3.0] add log 2023-03-01 19:11:21 +08:00
wangmingjun
a8af73deb3 bus 编译错误 2023-02-28 14:10:36 +08:00
wangmingjun
1ea0f88c53 解决编译错误 2023-02-27 21:40:19 +08:00
wangmingjun
9f576a66bb [jinlv bus] 增加中英韩播报 2023-02-25 20:24:08 +08:00
yangyakun
645ebe1665 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	core/mogo-core-function-call/build.gradle
2023-02-24 18:51:07 +08:00
zhongchao
3c9b069f2f [2.13.0-arch-opt]track 2023-02-23 15:25:41 +08:00
xuxinchao
088be3f4fb [dev_arch_opt_3.0]录包工具三期 2023-02-22 18:44:33 +08:00
wangmingjun
115de76ec3 [M2]去掉频繁日志打印 2023-02-22 14:12:05 +08:00
yangyakun
625aa7456c [引用错误] 2023-02-22 09:51:19 +08:00
wangmingjun
9454d547b6 Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!581
2023-02-21 12:41:05 +00:00
zhongchao
68bf702467 [2.13.0-arch-opt] remove brake and turn 2023-02-21 20:11:18 +08:00
yangyakun
e8c7327ff0 [引用修改] 2023-02-21 11:40:06 +08:00
yangyakun
e5b295d95d Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-21 09:44:24 +08:00
zhongchao
06df5b98dd [2.13.0-arch-opt] update aiCloudsdk version 2023-02-20 22:16:09 +08:00
yangyakun
511ed5fa71 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-20 19:28:36 +08:00
zhongchao
312744e4ee [2.13.0-arch-opt]analytics move to foundation 2023-02-20 19:10:32 +08:00
wangmingjun
60fd951e1d Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'
[2.13.0-arch-opt]turn light bug fix and add toggle debug view trigger

See merge request zhjt/AndroidApp/MoGoEagleEye!538
2023-02-16 13:08:02 +00:00
zhongchao
0e000cf2d1 [2.13.0-arch-opt]turn light bug fix and add toggle debug view trigger 2023-02-16 21:02:10 +08:00
wangmingjun
fd7946e7ef Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!537
2023-02-16 11:56:44 +00:00
zhongchao
2b6f280ae0 [2.13.2-arch-opt] fix bug of limit 2023-02-16 19:46:12 +08:00