Commit Graph

16 Commits

Author SHA1 Message Date
aibingbing
09a9a8c56c [宣传视频] fix: 第5个宣传视频播放异常问题; 2023-07-04 17:19:53 +08:00
aibingbing
da00e4dce5 [Bus Passenger] feat: Bus模式-金旅星辰车-乘客屏 增加宣传视频多屏展示(目前主要为衡阳演示车); 2023-07-04 17:16:48 +08:00
yangyakun
9954f46c70 [charter]
[3.2.0]
[添加saas通道]
2023-05-25 15:17:35 +08:00
wangmingjun
87571bd501 Merge branch 'dev_robobus-d_230418_3.1.0_fuzhou' into dev_minibus-d_230425_3.2.0
# Conflicts:
#	app/build.gradle
#	app/productFlavors/flavorsFilterConfig.gradle
2023-05-04 17:22:43 +08:00
yangyakun
6a6c8b61a8 [gradle]
[广告配置]
2023-04-19 16:13:56 +08:00
wangmingjun
6dd938e8eb [3.1.0] 福州打包 2023-04-19 10:53:24 +08:00
yangyakun
1d0030f9dd [bugfix]
[视频源修改、添加双视频]
2023-04-17 17:22:32 +08:00
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
81e778aa84 [video]
[视频链接回滚]
2023-04-13 11:32:27 +08:00
yangyakun
1ff26bf25b [video]
[视频播放不能设置一个不让轮播不起来]
2023-04-13 10:20:31 +08:00
yangyakun
0d4fceaadb [shuttle]
[视频播放]
2023-04-12 22:02:33 +08:00
yangyakun
4b9dd12acc [shuttle]
[视频播放]
2023-04-12 20:51:13 +08:00
yangyakun
fb1dc67d25 [m2]
[3.0.0]
[广告视频从json配置文件获取视频]
2023-04-12 20:49:30 +08:00
yangyakun
0b3f264837 [3.0.0]
[m2]
[ui修改、视频变更 b2视频和b1视频]
2023-04-11 19:48:36 +08:00
yangyakun
c00c30d670 [video]
[配置修改]
2023-04-11 11:17:17 +08:00
yangyakun
7f67ea9027 [m2]
[3.0.0]
[广告视频从json配置文件获取视频]
2023-04-07 20:59:34 +08:00