yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,114 Commits 1 Branch 0 Tags
cb3f29336dba00a6a3c814427ae132d99afa96dd
Commit Graph

1089 Commits

Author SHA1 Message Date
yangyakun
5ee4f8cd0f [gradle] 
[shuttle 添加M2司机屏]
 2023-04-21 11:00:23 +08:00
yangyakun
bc272eb63a [gradle] 
[横竖屏配置]
 2023-04-20 18:40:41 +08:00
yangyakun
bb87768dcc [gradle] 
[横竖屏配置]
 2023-04-20 16:31:45 +08:00
yangyakun
4068686048 [2.15。0] 
[大理不需要公交模式]
 2023-04-20 15:04:12 +08:00
yangyakun
6a6c8b61a8 [gradle] 
[广告配置]
 2023-04-19 16:13:56 +08:00
yangyakun
668f8ec84f [gradle] 
[gradle 整理]
 2023-04-19 15:39:21 +08:00
yangyakun
cc7a5e9560 Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus_gradle_och_230317 
# Conflicts:
#	app/productFlavors/ochDriverM1.gradle
 2023-04-19 11:07:14 +08:00
wangmingjun
f2cc1d1827 [3.1.0] dali/yantai online 司机端二维码链接修复 2023-04-19 11:06:09 +08:00
yangyakun
79af3a3317 [bugfix] 
[车模被动态替换]
 2023-04-18 16:47:40 +08:00
yangyakun
2df00c16ad [gradle] 
[多屏修改]
 2023-04-18 14:14:21 +08:00
yangyakun
f50e31c9ef Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus_gradle_och_230317 2023-04-18 11:13:32 +08:00
yangyakun
1d0030f9dd [bugfix] 
[视频源修改、添加双视频]
 2023-04-17 17:22:32 +08:00
yangyakun
722ee12e2b Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus_gradle_och_230317 2023-04-14 17:40:27 +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
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
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
e17f044f14 [m2] 
[3.0.0]
[m2 车模偏移-0.5f]
 2023-04-12 20:07:48 +08:00
xuxinchao
8d5465920b [dev_robobus-d_230322_3.0.0]正式环境去除端口号 
# Conflicts:
#	app/urlConfig.json
 2023-04-12 16:55:00 +08:00
yangyakun
3869871bdc Merge branch 'dev_robobus-d_230322_3.0.0' into dev_robobus_gradle_och_230317 
# Conflicts:
#	app/build.gradle
#	app/productFlavors/fOchShuttlePassengerM2.gradle
#	app/productFlavors/flavorsFilterConfig.gradle
#	app/script/functions/och.gradle
#	app/script/vehicleFlavors/fOchShuttleM2.gradle
 2023-04-11 20:39:01 +08:00
yangyakun
0b3f264837 [3.0.0] 
[m2]
[ui修改、视频变更 b2视频和b1视频]
 2023-04-11 19:48:36 +08:00
yangyakun
f0f5e49078 [3.0.0] 
[m2]
[车模调整]
 2023-04-11 17:20:41 +08:00
yangyakun
c00c30d670 [video] 
[配置修改]
 2023-04-11 11:17:17 +08:00
wangmingjun
8038a94e26 [mini bus3.0.0] 司机端二维码合并问题处理 2023-04-10 17:30:41 +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
yangyakun
029f578c76 Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-04-07 20:59:44 +08:00
yangyakun
7f67ea9027 [m2] 
[3.0.0]
[广告视频从json配置文件获取视频]
 2023-04-07 20:59:34 +08:00
yangyakun
429de28e85 [m2] 
[3.0.0]
[shuttleM2司机屏车模修改]
 2023-04-07 19:27:52 +08:00
xuxinchao
2b584b3985 [dev_3.0.0]增加云南私服云通话长链配置、fix提升地图版本编译不通过问题 2023-03-31 20:41:07 +08:00
wangmingjun
393c77c9b6 [3.0.0] merge dev_robobus_network_weak_230323 2023-03-31 18:46:21 +08:00
yangyakun
fad8d4327c [map] 
[模型修改、高精地图版本升级]
 2023-03-30 16:34:16 +08:00
xuxinchao
5c03c0d07e [dev_robobus-d_230322_3.0.0]正式环境去除端口号 2023-03-29 18:31:18 +08:00
wangmingjun
ca1809bed7 [3.0.0] 司机端二维码 2023-03-29 18:16:29 +08:00
yangyakun
750be7b99d [gradle] 
[sweeper、bus、shuttle 分离]
 2023-03-29 12:00:00 +08:00
wangmingjun
7bbb65bf9c Merge branch 'dev_robobus-d_230322_3.0.0' into 'dev_robobus_network_weak_230323' 
Dev robobus d 230322 3.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!743
 2023-03-28 09:08:22 +00:00
donghongyu
c54cdf3b2f 「dev_robobus-d_230322_3.0.0」 
删除了usb-camera相关代码
 2023-03-28 15:46:30 +08:00
yangyakun
d35ba98076 [gradle] 
[taxi、charter 删除多配置文件]
 2023-03-27 11:39:03 +08:00
yangyakun
23f8125cb5 [gradle] 
[合并离线的信息]
 2023-03-23 20:21:39 +08:00
yangyakun
d675258433 Merge branch 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into gradle_och 2023-03-23 20:03:18 +08:00
yangyakun
3c81e145e1 [shuttle] 
[添加ndk架构]
 2023-03-23 11:41:03 +08:00
yangyakun
2b2ec07a57 [shuttle] 
[分离shuttle]
 2023-03-23 11:37:05 +08:00
wangmingjun
7cc8498704 Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' 
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!729
 2023-03-22 10:20:36 +00:00
yangyakun
691b82642d Merge branch 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into gradle_och 2023-03-22 12:21:26 +08:00
xinfengkun
1329cb4d0d 修改说明文档 2023-03-22 11:16:17 +08:00
xinfengkun
ab2d990fa4 修改合并代码出错导致 m1档位对自动驾驶有限制问题 2023-03-22 11:10:39 +08:00
yangyakun
7c54fb20ea [gradle] 
[添加role flavors]
 2023-03-21 20:55:13 +08:00