yangyakun
|
f42b2e8e51
|
[charter]
[3.2.0]
[缓存fragment]
|
2023-04-28 11:46:59 +08:00 |
|
yangyakun
|
977a3c77fb
|
[charter]
[3.2.0]
|
2023-04-28 11:18:33 +08:00 |
|
yangyakun
|
f238af5729
|
[charter]
[3.2.0]
[结束订单样式修改]
|
2023-04-28 10:19:46 +08:00 |
|
yangyakun
|
34ae08c5d4
|
[charter]
[3.2.0]
[不切换背景]
|
2023-04-27 20:59:18 +08:00 |
|
yangyakun
|
5815f2e974
|
[charter]
[3.2.0]
[底部导航栏功能]
|
2023-04-27 20:56:37 +08:00 |
|
yangyakun
|
6a54b17f13
|
[charter]
[3.2.0]
[底部导航栏功能]
|
2023-04-27 18:34:31 +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
|
1795d9162d
|
[charter]
[3.2.0]
[选择线路从view拆到fragment]
|
2023-04-25 17:39:54 +08:00 |
|
yangyakun
|
f3a45a5961
|
[charter]
[3.2.0]
[枚举修改无用code]
|
2023-04-24 21:08:24 +08:00 |
|
yangyakun
|
b6f4d87ca9
|
[login]
[3.2.0]
[登录获取经纬度 去掉监听直接获取值]
|
2023-04-24 21:07:22 +08:00 |
|
yangyakun
|
23d4e82e25
|
[charter]
[3.2.0]
[抽取go和靠边停车到view中]
|
2023-04-24 20:46:05 +08:00 |
|
yangyakun
|
219ffb65b3
|
[charter]
[3.2.0]
[位置迁移]
|
2023-04-24 20:41:37 +08:00 |
|
yangyakun
|
cb3f29336d
|
[charter]
[3.2.0]
[车门操作统一到一个地方]
|
2023-04-24 19:45:10 +08:00 |
|
yangyakun
|
17f425a186
|
[bugfix]
[recycleview 居中问题]
|
2023-04-24 12:55:05 +08:00 |
|
yangyakun
|
5e66ff1e29
|
Merge branch 'dev_robobus_gradle_och_230317' into dev_mine_3.2.0_gradle
|
2023-04-24 10:55:31 +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
|
3a68e1736c
|
[3.2.0] 调整包车司机端增加魔方功能层级
|
2023-04-23 19:32:14 +08:00 |
|
wangmingjun
|
cb01a2bfba
|
[3.2.0] 包车司机端增加魔方功能
|
2023-04-23 19:31:04 +08:00 |
|
wangmingjun
|
51090f871e
|
[3.2.0] taxi司机端按钮重影问题处理
|
2023-04-23 15:58:06 +08:00 |
|
yangyakun
|
38897b664f
|
Merge branch 'release_robobus-p_230413_2.1.0.1'
|
2023-04-23 14:28:53 +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 |
|
yangyakun
|
8db14739ae
|
Merge branch 'dev_mine_3.2.0' into dev_robobus_gradle_och_230317
|
2023-04-19 11:27:33 +08:00 |
|
yangyakun
|
64e0cc8ed4
|
[公交模式乘客屏删除双屏逻辑]
|
2023-04-19 11:27:05 +08:00 |
|
wangmingjun
|
8e341a0c70
|
[3.2.0] m1 司机端增加进站按钮,倒计时向上取整
|
2023-04-18 19:45:21 +08:00 |
|
yangyakun
|
2df00c16ad
|
[gradle]
[多屏修改]
|
2023-04-18 14:14:21 +08:00 |
|
wangmingjun
|
802ba870fb
|
Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus_d_3.2.0_4.14_local
|
2023-04-18 11:26:31 +08:00 |
|
wangmingjun
|
c38f29e56f
|
[3.2.0] m1 司机端增加绑定二维码
|
2023-04-18 11:15:28 +08:00 |
|
wangmingjun
|
d0f2621773
|
Merge branch 'dev_robobus-d_230413_3.1.0' into 'dev_robobus-p_230413_2.1.0'
Dev robobus d 230413 3.1.0
See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!760
|
2023-04-17 10:34:38 +00:00 |
|
wangmingjun
|
95f81150ba
|
[3.2.0] m1 司机端确认路线改为一次确认
|
2023-04-17 16:41:37 +08:00 |
|
yangyakun
|
b7a83dbfbb
|
[bugfix]
[删掉空格]
|
2023-04-17 16:33:07 +08:00 |
|
yangyakun
|
1f1989174f
|
Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus-p_230413_2.1.0
# Conflicts:
# OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
|
2023-04-17 15:16:03 +08:00 |
|
yangyakun
|
e0cac99c4d
|
Merge remote-tracking branch 'origin/dev_robobus-d_230413_3.1.0' into dev_robobus-d_230413_3.1.0
|
2023-04-17 15:05:28 +08:00 |
|
wangmingjun
|
ae2e8fddbb
|
Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus_d_3.2.0_4.14_local
|
2023-04-17 14:33:32 +08:00 |
|
wangmingjun
|
3a4867ee7c
|
Merge branch 'dev_robobus-d_230413_3.1.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus-d_230413_3.1.0
|
2023-04-17 12:54:04 +08:00 |
|
wangmingjun
|
2fcd217c04
|
[3.1.0] m2路线id不同,清除全览轨迹
|
2023-04-17 12:53:56 +08:00 |
|
yangyakun
|
6203738612
|
[m2]
[3.1.0]
[pnc]
|
2023-04-17 12:19:10 +08:00 |
|
yangyakun
|
464ef23c54
|
[m2]
[3.1.0]
[动画展示和隐藏]
|
2023-04-17 11:23:30 +08:00 |
|
wangmingjun
|
19af6cdeee
|
[merge] merge robobus-d 3.1.0
|
2023-04-14 17:46:12 +08:00 |
|
yangyakun
|
9936fb84ac
|
[m2]
[3.1.0]
[动画展示和隐藏]
|
2023-04-14 17:23:12 +08:00 |
|
yangyakun
|
a0c1258d9f
|
Merge remote-tracking branch 'origin/dev_robobus-p_230413_2.1.0' into dev_robobus-p_230413_2.1.0
|
2023-04-14 16:01:25 +08:00 |
|
yangyakun
|
1d49120170
|
[m2]
[3.1.0]
[隐藏Ui]
|
2023-04-14 16:01:15 +08:00 |
|
wangmingjun
|
c70680db9d
|
[3.1.0] M1处理自动驾驶按钮bug
|
2023-04-14 12:02:42 +08:00 |
|