Commit Graph

61 Commits

Author SHA1 Message Date
wangmingjun
91a4c90eba [3.2.0] bus乘客屏recycleview 问题处理 2023-05-14 22:04:17 +08:00
wangmingjun
fc49e84091 [3.2.0] bus乘客屏UI调整 2023-05-14 20:03:19 +08:00
wangmingjun
a4ad075992 [3.2.0] UI调整 2023-05-12 12:50:44 +08:00
wangmingjun
b7ca5bc757 [3.2.0] try-catch 偶尔出现的轨迹集合清空情况 2023-05-11 20:54:43 +08:00
wangmingjun
5a98e90dd0 [3.2.0] bus/shuttle 乘客屏UI调整 2023-05-11 20:12:54 +08:00
wangmingjun
9dbf45c41a [3.2.0] bus/shuttle 乘客屏UI调整 2023-05-11 16:50:57 +08:00
yangyakun
e7836b87cd Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0 2023-05-10 19:22:43 +08:00
yangyakun
1ba3a702e6 [charter]
[3.2.0]
[适配]
2023-05-10 19:22:23 +08:00
wangmingjun
0edda6baa4 [3.2.0] shuttle b1乘客屏错误处理 2023-05-10 19:13:24 +08:00
wangmingjun
62d2e6a6e7 [3.2.0] bus乘客屏视频地图切换 2023-05-10 18:34:04 +08:00
yangyakun
30c1b606b8 [charter]
[3.2.0]
[1.15.2适配]
2023-05-10 16:57:24 +08:00
wangmingjun
9bee56d0f4 [3.2.0] bus/shuttle乘客屏状态栏, 包车司机端二维码-a环境修改 2023-05-08 17:51:48 +08:00
zhongchao
eecea49493 [2.15.0_merge_3.2.0] 2023-05-08 11:21:15 +08:00
zhongchao
64bcb93bff [2.15.0-merge-master] 2023-05-06 20:03:51 +08:00
wangmingjun
8f879a54e5 [3.2.0] shuttle乘客屏UI opt 2023-04-28 19:31:08 +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
5e66ff1e29 Merge branch 'dev_robobus_gradle_och_230317' into dev_mine_3.2.0_gradle 2023-04-24 10:55:31 +08:00
yangyakun
2df00c16ad [gradle]
[多屏修改]
2023-04-18 14:14:21 +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
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
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
yangyakun
9936fb84ac [m2]
[3.1.0]
[动画展示和隐藏]
2023-04-14 17:23:12 +08:00
yangyakun
1d49120170 [m2]
[3.1.0]
[隐藏Ui]
2023-04-14 16:01:15 +08:00
yangyakun
059271cb86 [m2]
[3.0.0]
[隐藏转向灯、添加伪圆角]
2023-04-13 19:11:58 +08:00
wangmingjun
793d960140 Merge remote-tracking branch 'origin/dev_robobus-d_230322_3.0.0' into dev_robobus-d_230322_3.0.0 2023-04-13 17:10:45 +08:00
wangmingjun
1fcfe2af60 [bus/shuttle/charter/taxi] 各端fragment初始化bug 2023-04-13 17:10:38 +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
yangyakun
0b3f264837 [3.0.0]
[m2]
[ui修改、视频变更 b2视频和b1视频]
2023-04-11 19:48:36 +08:00
yangyakun
7258c0ff07 [3.0.0]
[m2]
[ui调整]
2023-04-11 17:09:19 +08:00
xuxinchao
18cb9171b6 [dev_robobus-d_230322_3.0.0]Bus接驳乘客屏添加消息盒子 2023-04-11 16:29:20 +08:00
yangyakun
382e8a32b7 Merge remote-tracking branch 'origin/dev_robobus-d_230322_3.0.0' into dev_robobus-d_230322_3.0.0 2023-04-10 21:17:09 +08:00
yangyakun
38009b33ac [m2]
[3.0.0]
[ui调整]
2023-04-10 21:16:38 +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
yangyakun
61ee4d714a [m2]
[3.0.0]
[文案修改、页面微调]
2023-04-07 18:24:59 +08:00
yangyakun
aa7b51ca7a Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-04-07 16:30:59 +08:00
yangyakun
f689d7b0f5 [m2]
[3.0.0]
[glsurfaceview 叠加导致圆角无法使用暂时使用不使用]
2023-04-07 14:51:08 +08:00
yangyakun
6fd058457d [m2]
[3.0.0]
[间距]
2023-04-07 12:08:47 +08:00
yangyakun
47acf3e503 [m2]
[3.0.0]
[圆角修改]
2023-04-07 10:10:30 +08:00
wangmingjun
01fde7ba85 [B1/B2]乘客屏路线状态更新 2023-04-06 21:02:13 +08:00
wangmingjun
d11710ee11 [M2]乘客屏错误修复 2023-04-06 15:59:18 +08:00
yangyakun
13b2ce9da2 Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-04-06 14:53:12 +08:00
yangyakun
7d4a9c1812 [m2]
[3.0.0]
[上下添加背景]
2023-04-06 14:52:54 +08:00