Commit Graph

242 Commits

Author SHA1 Message Date
yangyakun
c5c800beb6 [charter]
[3.2.0]
[tts 查漏补缺]
2023-05-14 23:49:54 +08:00
wangmingjun
fc49e84091 [3.2.0] bus乘客屏UI调整 2023-05-14 20:03:19 +08:00
wangmingjun
3fde1b42cd Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-12 12:50:53 +08:00
wangmingjun
a4ad075992 [3.2.0] UI调整 2023-05-12 12:50:44 +08:00
yangyakun
dfef5cba44 [charter]
[3.2.0]
[部分tts]
2023-05-12 11:47:41 +08:00
wangmingjun
62d2e6a6e7 [3.2.0] bus乘客屏视频地图切换 2023-05-10 18:34:04 +08:00
zhongchao
eecea49493 [2.15.0_merge_3.2.0] 2023-05-08 11:21:15 +08:00
zhongchao
5005745645 [2.15.0_merge_master] merge problem fix 2023-05-06 20:18:07 +08:00
zhongchao
64bcb93bff [2.15.0-merge-master] 2023-05-06 20:03:51 +08:00
yangyakun
04be64e9b9 [charter]
[3.2.0]
[日志+debugview]
2023-05-06 15:23:34 +08:00
yangyakun
629cc39705 [charter]
[3.2.0]
[轨迹]
2023-05-06 11:19:29 +08:00
wangmingjun
357b5fc877 [3.2.0] 包车司机端确认倒计时 2023-05-05 19:37:35 +08:00
yangyakun
08bbbe9eec [charter]
[3.2.0]
[add orderNo change]
2023-05-05 17:35:34 +08:00
yangyakun
2b30071f55 [charter]
[3.2.0]
[line view change]
2023-05-05 17:23:04 +08:00
wangmingjun
d98396bb69 [3.2.0] 包车司机端增加到站接口、同步报站屏信息 2023-05-05 15:49:21 +08:00
wangmingjun
7a66b05dd9 [3.2.0] charter 类魔方功能增加日志 2023-05-04 18:05:35 +08:00
yangyakun
0fe15c01f9 [charter]
[3.2.0]
[定义到站和结束订单的局域网结构]
2023-05-04 11:40:10 +08:00
yangyakun
35b276f720 [charter]
[3.2.0]
[订单信息页]
2023-04-28 18:38:40 +08:00
yangyakun
0705256eed [charter]
[3.2.0]
2023-04-27 15:28:13 +08:00
wangmingjun
77cc5e20b3 Merge branch 'dev_minibus-d_230425_3.2.0' into dev_robobus_d_3.2.0_4.14_local 2023-04-26 18:24:51 +08:00
wangmingjun
ab0ea94455 [3.2.0] 1、倒计时120s 2、类魔方功能加减速 3、三方同步opt 2023-04-26 18:23:14 +08:00
yangyakun
78b7d3eff3 [charter]
[3.2.0]
[精确计算当前位置距离站点的距离]
2023-04-26 14:36:02 +08:00
yangyakun
fcb84b69bf [charter]
[3.2.0]
[订单倒计时和到站时间分割]
2023-04-26 11:44:03 +08:00
yangyakun
1436df91f0 [charter]
[3.2.0]
[更精确的算角度]
2023-04-25 17:40:18 +08:00
yangyakun
b6f4d87ca9 [login]
[3.2.0]
[登录获取经纬度 去掉监听直接获取值]
2023-04-24 21:07:22 +08:00
yangyakun
cb3f29336d [charter]
[3.2.0]
[车门操作统一到一个地方]
2023-04-24 19:45:10 +08:00
wangmingjun
8d7dfc01e0 [3.2.0] 减速-1.0,刹停-2.0, 复位0 2023-04-24 10:41:10 +08:00
wangmingjun
6ef77e4379 Merge branch 'master' into dev_robobus_d_3.2.0_4.14_local 2023-04-23 19:33:04 +08:00
wangmingjun
cb01a2bfba [3.2.0] 包车司机端增加魔方功能 2023-04-23 19:31:04 +08:00
yangyakun
d32d904239 Merge branch 'release_robobus-d_230413_3.1.0.1'
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java
#	core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
#	gradle.properties
2023-04-23 14:28:19 +08:00
wangmingjun
56eedeb144 [3.2.0] 司机端增加魔方功能UI 2023-04-23 10:40:26 +08:00
wangmingjun
bee5ce2222 [3.2.0] 司机端增加魔方功能opt 2023-04-20 15:11:14 +08:00
donghongyu
7c9fc5fae5 Merge remote-tracking branch 'origin/dev_robobus-d_230322_3.0.0' into dev_robobus-d_230322_3.0.0 2023-04-13 13:11:53 +08:00
donghongyu
de04c9a23e 「dev_sop_2.14.4」
1、修复直播状态回调问题
2023-04-13 13:05:02 +08:00
wangmingjun
9c0ba1f3b0 [2.0.0] 修复接驳乘客屏偶现路线不更新问题 2023-04-10 15:32:04 +08:00
donghongyu
faa191d8f9 「dev_robobus-d_230322_3.0.0」
1、增加
    lintOptions {
        abortOnError false
    }
2023-04-10 14:24:03 +08:00
yangyakun
7f67ea9027 [m2]
[3.0.0]
[广告视频从json配置文件获取视频]
2023-04-07 20:59:34 +08:00
wangmingjun
918352a0b4 [包车] 包车确认路线dialog文字过长 2023-04-07 14:38:01 +08:00
wangmingjun
620344482c [shuttle] 韩语更新 2023-04-07 14:01:20 +08:00
renwj
695fd6188d [2.15.0] 整合基于ByteX开发的自研及三方插件 2023-04-06 19:45:38 +08:00
wangmingjun
21ac2f8f4a [shuttle-B1/B2] 弱网调试完成 2023-03-31 20:47:19 +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
e545d80418 Merge branch 'dev_robobus_network_weak_230323' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus_network_weak_230323 2023-03-30 18:02:15 +08:00
wangmingjun
dec5d11208 [opt] 弱网缓存处理 2023-03-30 18:02:08 +08:00
yangyakun
e6ad52324b [3.0.0]
[韩语null、去掉多余的站]
2023-03-30 14:37:00 +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
yangyakun
8cccfcbd5d Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-03-29 20:11:06 +08:00
yangyakun
60baec6a95 [m1]
[韩文兼容]
2023-03-29 20:10:54 +08:00