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

1128 Commits

Author SHA1 Message Date
yangyakun
9954f46c70 [charter] 
[3.2.0]
[添加saas通道]
 2023-05-25 15:17:35 +08:00
yangyakun
55ce1b812b [gradle] 
[3.2.0]
[gradle rebuild bugfix]
 2023-05-19 19:09:55 +08:00
yangyakun
8b66dfee89 [charter] 
[3.2.0]
[引用修改]
 2023-05-18 18:09:27 +08:00
wangmingjun
f79321b852 [3.2.0] 1、UI走查调整 2、-a环境大理/烟台绑定二维码url调整 2023-05-16 15:25:10 +08:00
renwj
227ce3c3ad [合并] 将分支2.15.0_merge_master的最新代码合并过来 2023-05-16 10:56:36 +08:00
wangmingjun
c0e1688958 [3.2.0] shuttle乘客屏，UI调整 2023-05-15 16:45:24 +08:00
wangmingjun
62d2e6a6e7 [3.2.0] bus乘客屏视频地图切换 2023-05-10 18:34:04 +08:00
renwj
6295fc3c57 [下载工具] 重构下载工具类;支持断点续传;网络状态监听 2023-05-10 10:45:56 +08:00
wangmingjun
9bee56d0f4 [3.2.0] bus/shuttle乘客屏状态栏， 包车司机端二维码-a环境修改 2023-05-08 17:51:48 +08:00
zhongchao
2bc64adb67 Merge branch '2.15.0_merge_master' into dev_minibus-d_230425_3.2.0 2023-05-08 15:27:54 +08:00
renwj
22cf999031 [MAP] 高精地图Marker绘制逻辑重构 2023-05-08 15:10:46 +08:00
zhongchao
48f32d0644 [3.2.0]remove gradle setting of uploadtime 2023-05-08 11:22:41 +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
yangyakun
2b30071f55 [charter] 
[3.2.0]
[line view change]
 2023-05-05 17:23:04 +08:00
wangmingjun
da3a923e65 [3.2.0]增加fuzhou flavor 2023-05-04 17:50:00 +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
35b276f720 [charter] 
[3.2.0]
[订单信息页]
 2023-04-28 18:38:40 +08:00
xinfengkun
feaed1a916 [dev_bus320] 允许网络通信使用明文网络流量 2023-04-28 17:09:41 +08:00
chenfufeng
a591dd4387 [3.2.0][opt]集成Matrix的TraceCanary模块 2023-04-27 17:50:58 +08:00
yangyakun
219ffb65b3 [charter] 
[3.2.0]
[位置迁移]
 2023-04-24 20:41:37 +08:00
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
wangmingjun
04eb36dedf [3.1.0] 福州司机端绑定二维码暂时使用 https://tech.zhidaohulian.com?pipe=asafety&sn= 2023-04-19 17:08:25 +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
wangmingjun
0d63d3bb1c Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus-d_230418_3.1.0_fuzhou 2023-04-19 14:19:26 +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
wangmingjun
6dd938e8eb [3.1.0] 福州打包 2023-04-19 10:53:24 +08:00
renwj
487c07a1be [2.15.0] 优化UiThreadHandler和ThreadUtils往主线程消息队列添加消息的方式，添加最新和排队两种方式 2023-04-19 08:57:44 +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
renwj
062d0b23d1 [2.15.0] 改文件后缀名，防止打包平台产物为多个 2023-04-13 14:14:54 +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